This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via b8ec7b86ac29707a024c93958137e04c2f870e9a (commit)
via 62ff8d9627a6dfe242b9b628df05a5eaeea88e47 (commit)
from 48fde0b6f999e12d916127d413357720ac5bd670 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8ec7b86ac29707a024c93958137e04c2f870e9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 9 15:14:25 2014 +0200
firewall-policy: Remove empty line.
commit 62ff8d9627a6dfe242b9b628df05a5eaeea88e47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 9 15:11:41 2014 +0200
Fix missing Connection Scheduler strings.
-----------------------------------------------------------------------
Summary of changes:
config/firewall/firewall-policy | 1 -
doc/language_issues.es | 4 ++++
doc/language_issues.fr | 4 ++++
doc/language_issues.nl | 4 ++++
doc/language_issues.pl | 4 ++++
doc/language_issues.ru | 4 ++++
doc/language_issues.tr | 4 ++++
doc/language_missings | 16 ++++++++++++++++
html/cgi-bin/connscheduler.cgi | 8 ++++----
langs/de/cgi-bin/de.pl | 4 ++++
langs/en/cgi-bin/en.pl | 4 ++++
11 files changed, 52 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
index 16e98a5..96b9b2f 100755
--- a/config/firewall/firewall-policy
+++ b/config/firewall/firewall-policy
@@ -110,7 +110,6 @@ case "${POLICY}" in
;;
*)
-
# Access from GREEN is granted to everywhere
if [ "${IFACE}" = "${GREEN_DEV}" ]; then
# internet via green
diff --git a/doc/language_issues.es b/doc/language_issues.es
index ab8dea7..c6e9735 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -572,6 +572,10 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 7085978..16db153 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -583,6 +583,10 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 695bcc0..4502f3b 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -587,6 +587,10 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ab8dea7..c6e9735 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -572,6 +572,10 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index f7ee844..fb99069 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -575,6 +575,10 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Add a route
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: Edit an existing route
WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6edc5f6..78cf291 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -638,6 +638,10 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: ConnSched dial
+WARNING: untranslated string: ConnSched hangup
+WARNING: untranslated string: ConnSched reboot
+WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: count
diff --git a/doc/language_missings b/doc/language_missings
index 5530615..9521467 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -65,6 +65,10 @@
< ccd routes
< ccd subnet
< ccd used
+< ConnSched dial
+< ConnSched hangup
+< ConnSched reboot
+< ConnSched shutdown
< count
< countries
< countrycode
@@ -527,6 +531,10 @@
< ccd routes
< ccd subnet
< ccd used
+< ConnSched dial
+< ConnSched hangup
+< ConnSched reboot
+< ConnSched shutdown
< count
< countries
< countrycode
@@ -980,6 +988,10 @@
< ccd routes
< ccd subnet
< ccd used
+< ConnSched dial
+< ConnSched hangup
+< ConnSched reboot
+< ConnSched shutdown
< count
< countries
< countrycode
@@ -1410,6 +1422,10 @@
< ccd routes
< ccd subnet
< ccd used
+< ConnSched dial
+< ConnSched hangup
+< ConnSched reboot
+< ConnSched shutdown
< count
< countries
< countrycode
diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi
index f4fc5ef..c3bd0bc 100644
--- a/html/cgi-bin/connscheduler.cgi
+++ b/html/cgi-bin/connscheduler.cgi
@@ -311,10 +311,10 @@ print <<END
<tr><td width='15%' class='base'>$Lang::tr{'ConnSched action'}</td><td>
<input type='radio' value='CONNECT' name='ACTION_ACTION' $checked_connect /> <select name='ACTION_CONNECT'>
<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'ConnSched reconnect'}</option>
-<option value='dial' $selected{'dial'}>$Lang::tr{'dial'}</option>
-<option value='hangup' $selected{'hangup'}>$Lang::tr{'hangup'}</option>
-<option value='reboot' $selected{'reboot'}>$Lang::tr{'reboot'}</option>
-<option value='shutdown' $selected{'shutdown'}>$Lang::tr{'shutdown'}</option>
+<option value='dial' $selected{'dial'}>$Lang::tr{'ConnSched dial'}</option>
+<option value='hangup' $selected{'hangup'}>$Lang::tr{'ConnSched hangup'}</option>
+<option value='reboot' $selected{'reboot'}>$Lang::tr{'ConnSched reboot'}</option>
+<option value='shutdown' $selected{'shutdown'}>$Lang::tr{'ConnSched shutdown'}</option>
<option value='ipsecstart' $selected{'ipsecstart'}>$Lang::tr{'ConnSched ipsecstart'}</option>
<option value='ipsecstop' $selected{'ipsecstop'}>$Lang::tr{'ConnSched ipsecstop'}</option>
</select></td></tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 977dbac..cc56718 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -15,13 +15,17 @@
'ConnSched add action' => 'Aktion hinzufügen',
'ConnSched change profile title' => 'Wechsle zu Profil:',
'ConnSched days' => 'Tage:',
+'ConnSched dial' => 'Verbinden',
'ConnSched down' => 'Runter',
+'ConnSched hangup' => 'Trennen',
'ConnSched ipsecstart' => 'IPSec (neu)starten',
'ConnSched ipsecstop' => 'IPSec stop',
+'ConnSched reboot' => 'Neustarten',
'ConnSched reconnect' => 'Neu verbinden',
'ConnSched scheduled actions' => 'Geplante Aktionen',
'ConnSched scheduler' => 'Scheduler',
'ConnSched select profile' => 'Wähle Profil',
+'ConnSched shutdown' => 'Herunterfahren',
'ConnSched time' => 'Zeit:',
'ConnSched up' => 'Hoch',
'ConnSched weekdays' => 'Wochentage:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 42dea0e..ff5c90a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -15,13 +15,17 @@
'ConnSched add action' => 'Add action',
'ConnSched change profile title' => 'Change to profile:',
'ConnSched days' => 'Days:',
+'ConnSched dial' => 'Connect',
'ConnSched down' => 'Down',
+'ConnSched hangup' => 'Disconnect',
'ConnSched ipsecstart' => 'IPSec (re)start',
'ConnSched ipsecstop' => 'IPSec stop',
+'ConnSched reboot' => 'Reboot',
'ConnSched reconnect' => 'Reconnect',
'ConnSched scheduled actions' => 'Scheduled actions',
'ConnSched scheduler' => 'Scheduler',
'ConnSched select profile' => 'Select profile',
+'ConnSched shutdown' => 'Shutdown',
'ConnSched time' => 'Time:',
'ConnSched up' => 'Up',
'ConnSched weekdays' => 'Days of the week:',
hooks/post-receive
--
IPFire 2.x development tree