diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-06-25 07:13:31 -0700 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-06-25 07:13:31 -0700 |
| commit | 75e4ad1b3ea46288e35c57729dfc8b0b196e8a1e (patch) | |
| tree | 54c2017cf11299635c46b6d31f81354cf2c13be5 | |
| parent | fc0716803f19c55b2ac499e6e3c80339a0acee62 (diff) | |
| parent | 6796a93b93544d650ba95e4da601d64e3f7fb299 (diff) | |
| download | pfsense-packages-75e4ad1b3ea46288e35c57729dfc8b0b196e8a1e.tar.gz pfsense-packages-75e4ad1b3ea46288e35c57729dfc8b0b196e8a1e.tar.bz2 pfsense-packages-75e4ad1b3ea46288e35c57729dfc8b0b196e8a1e.zip | |
Merge pull request #261 from phil-davis/master
thanks!
| -rwxr-xr-x | config/dansguardian/dansguardian_about.php | 8 | ||||
| -rwxr-xr-x | config/pf-blocker/pfblocker.xml | 4 | ||||
| -rw-r--r-- | config/squid-reverse/squid.inc | 3 | ||||
| -rw-r--r-- | config/squid3/squid.xml | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/config/dansguardian/dansguardian_about.php b/config/dansguardian/dansguardian_about.php index 49359472..e678ede7 100755 --- a/config/dansguardian/dansguardian_about.php +++ b/config/dansguardian/dansguardian_about.php @@ -1,6 +1,6 @@ <?php /* - mailscanner_about.php + dansguardian_about.php part of pfSense (http://www.pfsense.com/) Copyright (C) 2011 Marcello Coutinho <marcellocoutinho@gmail.com> All rights reserved. @@ -96,9 +96,9 @@ include("head.inc"); <td width="78%" class="vtable"><?=gettext("Package Created by <a target=_new href='http://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Donatios ");?></td> - <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br> - If you want that your donation goes to this package developer, make a note on donation forwarding it to me.<br><br>");?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("Donations ");?></td> + <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to the pfSense project</a>.<br><br> + If you want your donation to go to this package developer, make a note on the donation forwarding it to me.<br><br>");?></td> </tr> </table> diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml index 650f2909..b4da539c 100755 --- a/config/pf-blocker/pfblocker.xml +++ b/config/pf-blocker/pfblocker.xml @@ -230,8 +230,8 @@ <fielddescr>Donation</fielddescr> <fieldname>donation</fieldname> <type>checkbox</type> - <description><![CDATA[If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br> - If you want that your donation goes to these package developers, make a note on donation forwarding it to us.<br>]]></description> + <description><![CDATA[If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to the pfSense project</a>.<br> + If you want your donation to go to these package developers, make a note on the donation forwarding it to us.<br>]]></description> </field> </fields> <custom_php_install_command> diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc index 9bedac86..c1a29ae6 100644 --- a/config/squid-reverse/squid.inc +++ b/config/squid-reverse/squid.inc @@ -747,7 +747,6 @@ function squid_resync_general() { $pidfile = "{$g['varrun_path']}/squid.pid"; $language = ($settings['error_language'] ? $settings['error_language'] : 'en'); - $errordir = SQUID_CONFBASE . '/errors/' . $language; $icondir = SQUID_CONFBASE . '/icons'; $hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost'); $email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost'); @@ -763,7 +762,7 @@ icp_port $icp_port pid_filename $pidfile cache_effective_user proxy cache_effective_group proxy -error_default_language $errordir +error_default_language $language icon_directory $icondir visible_hostname $hostname cache_mgr $email diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml index f82cf81a..ea13625e 100644 --- a/config/squid3/squid.xml +++ b/config/squid3/squid.xml @@ -249,7 +249,7 @@ <fieldname>error_language</fieldname> <description>Select the language in which the proxy server will display error messages to users.</description> <type>select</type> - <default_value>English</default_value> + <default_value>en</default_value> </field> <field> <fielddescr>Disable X-Forward</fielddescr> |