diff options
-rwxr-xr-x | usr/local/www/pkg_mgr.php | 2 | ||||
-rwxr-xr-x | usr/local/www/pkg_mgr_installed.php | 8 | ||||
-rwxr-xr-x | usr/local/www/system.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_firewall.php | 4 | ||||
-rw-r--r-- | usr/local/www/system_advanced_misc.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_network.php | 4 | ||||
-rwxr-xr-x | usr/local/www/system_firmware.php | 4 | ||||
-rwxr-xr-x | usr/local/www/system_firmware_check.php | 8 | ||||
-rwxr-xr-x | usr/local/www/system_routes.php | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index c28cefc..1d93e9c 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -185,7 +185,7 @@ include("head.inc"); <br/> <?=$index['version'] ?> <br/> - <?=gettext("platform:") . $index['required_version'] ?> + <?=gettext("platform") .": ". $index['required_version'] ?> <br/> <?=$index['maximum_version'] ?> </td> diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index ba1269f..c80dc33 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -99,14 +99,14 @@ include("head.inc"); // we're running a newer version of the package if(strcmp($pkg['version'], $latest_package) > 0) { $tdclass = "listbggrey"; - $pkgver = gettext("Available: ") . $latest_package . "<br/>"; - $pkgver .= gettext("Installed: ") . $pkg['version']; + $pkgver = gettext("Available") .": ". $latest_package . "<br/>"; + $pkgver .= gettext("Installed") .": ". $pkg['version']; } // we're running an older version of the package if(strcmp($pkg['version'], $latest_package) < 0) { $tdclass = "listbg"; - $pkgver = "<font color='#ffffff'>" . gettext("Available: ") . $latest_package . "<br/>"; - $pkgver .= gettext("Installed: ") . $pkg['version']; + $pkgver = "<font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "<br/>"; + $pkgver .= gettext("Installed") .": ". $pkg['version']; } // we're running the current version if(!strcmp($pkg['version'], $latest_package)) { diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 92e836d..0398924 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -67,7 +67,7 @@ if (!$pconfig['timezone']) if (!$pconfig['timeservers']) $pconfig['timeservers'] = "pool.ntp.org"; -$changedesc = gettext("System: "); +$changedesc = gettext("System") . ": "; $changecount = 0; function is_timezone($elt) { diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index f772d44..a4c17e7 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -197,7 +197,7 @@ function update_description(itemnum) { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE:");?> </strong> + <strong><?=gettext("NOTE");?>: </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only.");?> <br/> @@ -274,7 +274,7 @@ function update_description(itemnum) { <br/> <strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong> <br/> - <span class="vexpl"><?=gettext("Note: Leave this blank for the default. On your system the default size is:");?> <?= pfsense_default_state_size() ?></span> + <span class="vexpl"><?=gettext("Note: Leave this blank for the default. On your system the default size is");?>: <?= pfsense_default_state_size() ?></span> </td> </tr> <tr> diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index ffff650..df1683c 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -144,7 +144,7 @@ include("head.inc"); <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE:"); ?> </strong> + <strong><?=gettext("NOTE"); ?>: </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 21c3c58..a544fbe 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -180,7 +180,7 @@ function enable_change(enable_over) { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE:"); ?> </strong> + <strong><?=gettext("NOTE"); ?>: </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> @@ -209,7 +209,7 @@ function enable_change(enable_over) { routing infrastructures. If enabled, don't forget to add a firewall rule to permit IPv6 packets."); ?><br/> <br/> - <?=gettext("IP address :"); ?> + <?=gettext("IP address"); ?> : <input name="ipv6nat_ipaddr" type="text" class="formfld unknown" id="ipv6nat_ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipv6nat_ipaddr']);?>" /> </td> </tr> diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index e60c1bd..cfd6fb0 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -271,7 +271,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) <?php if(!file_exists("/boot/kernel/pfsense_kernel.txt")) { if($g['platform'] == "pfSense") { - echo gettext("Please select kernel type: "); + echo gettext("Please select kernel type") , ": "; echo "<select name='kerneltype'>"; echo "<option value='SMP'>" . gettext("Multiprocessor kernel") . "</option>"; echo "<option value='single'>". gettext("Uniprocessor kernel") . "</option>"; @@ -296,7 +296,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning:");?><br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning");?>:<br> </strong></span><?=gettext("DO NOT abort the firmware upgrade once it has started. The firewall will reboot automatically after storing the new firmware. The configuration will be maintained.");?></span></td> diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index 6361ecd..9eabe26 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -154,10 +154,10 @@ if ($needs_system_upgrade == false) { echo "\n<script>$('invokeupgrade').style.visibility = 'visible';</script>"; $txt = gettext("A new version is now available") . "\\n\\n"; -$txt .= gettext("Current version:") . $current_installed_version . "\\n"; -$txt .= " " . gettext("Built On:") ." ". $current_installed_buildtime . "\\n"; -$txt .= " " . gettext("New version:") ." ". $remote_version . "\\n\\n"; -$txt .= " " . gettext("Update source:") ." ". $updater_url . "\\n"; +$txt .= gettext("Current version") .": ". $current_installed_version . "\\n"; +$txt .= " " . gettext("Built On") .": ". $current_installed_buildtime . "\\n"; +$txt .= " " . gettext("New version") .": ". $remote_version . "\\n\\n"; +$txt .= " " . gettext("Update source") .": ". $updater_url . "\\n"; update_output_window($txt); ?> </form> diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 221582e..e31438d 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -52,7 +52,7 @@ if (!is_array($config['gateways']['gateway_item'])) $a_routes = &$config['staticroutes']['route']; $a_gateways = &$config['gateways']['gateway_item']; -$changedesc = gettext("Static Routes: "); +$changedesc = gettext("Static Routes") . ": "; if ($_POST) { |