diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-02 16:25:17 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-02 16:25:17 -0300 |
| commit | 37261752cb3db01135ffb3668337c6b5c1d09e26 (patch) | |
| tree | 2a861b8e2b3a9a2d655256af05d8231996a4d99a /usr/local/www/firewall_nat_edit.php | |
| parent | 34f79120e45e1bd0e867a92c8dfe90e8f9fcd5cd (diff) | |
| download | pfsense-37261752cb3db01135ffb3668337c6b5c1d09e26.zip pfsense-37261752cb3db01135ffb3668337c6b5c1d09e26.tar.gz | |
Revert "Implemment gettext()"
This reverts commit 1baff2e5d32ebb5a71b07f38d9f97e3c4788e3be.
Lot of syntax errors
Conflicts:
usr/local/www/firewall_nat_edit.php
Diffstat (limited to 'usr/local/www/firewall_nat_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_nat_edit.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index b15a3ea..48a1686 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -515,6 +515,7 @@ include("fbegin.inc"); ?> <option value="single" <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>><?=gettext("Single host or alias"); ?></option> <option value="network" <?php if (!$sel) echo "selected"; ?>><?=gettext("Network"); ?></option> <?php if(have_ruleint_access("pptp")): ?> +<<<<<<< HEAD <option value="pptp" <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>><?=gettext("PPTP clients"); ?></option> <?php endif; ?> <?php if(have_ruleint_access("pppoe")): ?> @@ -522,6 +523,15 @@ include("fbegin.inc"); ?> <?php endif; ?> <?php if(have_ruleint_access("l2tp")): ?> <option value="l2tp" <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>><?=gettext("L2TP clients"); ?></option> +======= + <option value="pptp" <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>>PPTP <?=gettext("clients"); ?></option> + <?php endif; ?> + <?php if(have_ruleint_access("pppoe")): ?> + <option value="pppoe" <?php if ($pconfig['src'] == "pppoe") { echo "selected"; } ?>>PPPoE <?=gettext("clients"); ?></option> + <?php endif; ?> + <?php if(have_ruleint_access("l2tp")): ?> + <option value="l2tp" <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>>L2TP <?=gettext("clients"); ?></option> +>>>>>>> parent of 1baff2e... Implemment gettext() <?php endif; ?> <?php foreach ($ifdisp as $ifent => $ifdesc): ?> |
