summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorVinicius Coque <vinicius.coque@bluepex.com>2010-04-28 15:13:19 -0300
committerVinicius Coque <vinicius.coque@bluepex.com>2010-04-28 15:13:19 -0300
commit8492fd308406d7b620082f98c288642f7669a124 (patch)
treeb0910d5fd5add5ced06a209e59c1f46d1502443f /usr
parent1409c8d1dd36fbac8d64c7c3ddf0507c2db53bd5 (diff)
parentd238d43021ee359739ef87c9a5ce72df1d192c38 (diff)
downloadpfsense-8492fd308406d7b620082f98c288642f7669a124.zip
pfsense-8492fd308406d7b620082f98c288642f7669a124.tar.gz
Merge branch 'gettext' of rcs.pfsense.org:pfsense/bluepex-clone into gettext
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/system_advanced_network.php3
-rwxr-xr-xusr/local/www/system_usermanager_settings_test.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index a544fbe..c2eec06 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -224,8 +224,7 @@ function enable_change(enable_over) {
<td width="78%" class="vtable">
<input name="polling_enable" type="checkbox" id="polling_enable" value="yes" <?php if ($pconfig['polling_enable']) echo "checked"; ?>>
<strong><?=gettext("Enable device polling"); ?></strong><br>
- <?=gettext("Device polling is a technique that lets the system periodically poll network devices for new data instead of relying on interrupts. This prevents your webConfigurator, SSH, etc. from being inaccessible due to interrupt floods when under extreme load. Generally this is not recommended.
- Not all NICs support polling; see the $g['product_name'] homepage for a list of supported cards."); ?>
+ <?printf("Device polling is a technique that lets the system periodically poll network devices for new data instead of relying on interrupts. This prevents your webConfigurator, SSH, etc. from being inaccessible due to interrupt floods when under extreme load. Generally this is not recommended. Not all NICs support polling; see the %s homepage for a list of supported cards.", $g['product_name']); ?>
</td>
</tr>
<tr>
diff --git a/usr/local/www/system_usermanager_settings_test.php b/usr/local/www/system_usermanager_settings_test.php
index dc461d8..4a437b7 100755
--- a/usr/local/www/system_usermanager_settings_test.php
+++ b/usr/local/www/system_usermanager_settings_test.php
@@ -87,7 +87,7 @@ if (!$authcfg) {
if(ldap_test_bind($authcfg)) {
echo "<td><font color=green>OK</td></tr>";
- echo "<tr><td>" . gettext("Attempting to fetch Organizational Units from") . " " . {$ldapserver} . "</td><td>";
+ echo "<tr><td>" . gettext("Attempting to fetch Organizational Units from") . " " . $ldapserver . "</td><td>";
$ous = ldap_get_user_ous(true, $authcfg);
if(count($ous)>1) {
echo "<td><font color=green>OK</td></tr>";
OpenPOWER on IntegriCloud