* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fcb92530e4ddd8146d0d82e380a161cc85413e4
@ 2014-03-26 22:47 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-03-26 22:47 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10282 bytes --]
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, next has been updated
via 8fcb92530e4ddd8146d0d82e380a161cc85413e4 (commit)
via 7add463e51039d0409545f7279d43a66eba1d532 (commit)
via 36d809efb637c618359f40c1ecd8d820fcb2c882 (commit)
from 513c321ebedcf0865863b95ccd453f155f7703ed (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 8fcb92530e4ddd8146d0d82e380a161cc85413e4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Mar 26 23:47:14 2014 +0100
ipsecctrl: Fix compiler warning.
commit 7add463e51039d0409545f7279d43a66eba1d532
Merge: 36d809e 513c321
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Mar 26 23:35:18 2014 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 36d809efb637c618359f40c1ecd8d820fcb2c882
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Mar 26 23:34:58 2014 +0100
media.cgi: Fix typo 'writen'.
-----------------------------------------------------------------------
Summary of changes:
doc/language_issues.de | 1 +
doc/language_issues.en | 1 +
doc/language_issues.es | 1 +
doc/language_issues.fr | 1 +
doc/language_issues.nl | 1 +
doc/language_issues.pl | 1 +
doc/language_issues.ru | 1 +
doc/language_issues.tr | 1 +
doc/language_missings | 8 ++++++++
html/cgi-bin/media.cgi | 2 +-
langs/de/cgi-bin/de.pl | 2 ++
langs/en/cgi-bin/en.pl | 2 ++
src/misc-progs/ipsecctrl.c | 16 ++++++++--------
13 files changed, 29 insertions(+), 9 deletions(-)
Difference in files:
diff --git a/doc/language_issues.de b/doc/language_issues.de
index d501b71..a7d8940 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -4,6 +4,7 @@ WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: MB written
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 494780f..26c8d32 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -4,6 +4,7 @@ WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: MB written
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
diff --git a/doc/language_issues.es b/doc/language_issues.es
index cf2fe52..ab8dea7 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -572,6 +572,7 @@ 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: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
WARNING: untranslated string: addons
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index b3d9252..7085978 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -583,6 +583,7 @@ 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: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: advproxy cache-digest
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9b20840..695bcc0 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -587,6 +587,7 @@ 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: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: advproxy cache-digest
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index cf2fe52..ab8dea7 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -572,6 +572,7 @@ 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: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
WARNING: untranslated string: addons
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 0c94fc6..f7ee844 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -576,6 +576,7 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Add a route
WARNING: untranslated string: Edit an existing route
+WARNING: untranslated string: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: advproxy cache-digest
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index c266510..f7c9402 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -637,6 +637,7 @@ 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: MB read
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: ccd err isipsecrw
diff --git a/doc/language_missings b/doc/language_missings
index 3c3d742..5530615 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -301,6 +301,8 @@
< lifetime
< mac filter
< maximum
+< MB read
+< MB written
< minimum
< minute
< most preferred
@@ -760,6 +762,8 @@
< lifetime
< mac filter
< maximum
+< MB read
+< MB written
< minimum
< minute
< most preferred
@@ -1203,6 +1207,8 @@
< lifetime
< mac filter
< maximum
+< MB read
+< MB written
< minimum
< minute
< most preferred
@@ -1637,6 +1643,8 @@
< lifetime
< mac filter
< maximum
+< MB read
+< MB written
< minimum
< minute
< month-graph
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 2aec3cc..9dea789 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -152,7 +152,7 @@ END
for(my $i = 1; $i <= $#iostat1; $i++){
if ( $i eq '1' ){
- print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
+ print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>$Lang::tr{'MB read'}</b></td><td align='center' class='boldbase'><b>$Lang::{'MB writen'}</b></td></tr>";
}else{
print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 267d175..977dbac 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -33,6 +33,8 @@
'Level7 Rule' => 'Level7-Regel',
'Level7 rule' => 'Level7-Regel',
'Local VPN IP' => 'Internes Netzwerk (GREEN)',
+'MB read' => 'MB gelesen',
+'MB written' => 'MB geschrieben',
'MTU' => 'MTU Size',
'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm',
'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 64b6d19..42dea0e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -33,6 +33,8 @@
'Level7 Rule' => 'Level7-Rule',
'Level7 rule' => 'Level7 rule',
'Local VPN IP' => 'Internal Network (GREEN):',
+'MB read' => 'MB read',
+'MB written' => 'MB written',
'MTU' => 'MTU size:',
'Number of IPs for the pie chart' => 'Number of IPs for the pie chart',
'Number of Ports for the pie chart' => 'Number of ports for the pie chart',
diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 570fdeb..eb3fc49 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -44,6 +44,14 @@ void usage() {
fprintf (stderr, "\t\tI : Print Statusinfo\n");
}
+static void ipsec_reload() {
+ /* Re-read all configuration files and secrets and
+ * reload the daemon (#10339).
+ */
+ safe_system("/usr/sbin/ipsec rereadall >/dev/null 2>&1");
+ safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
+}
+
/*
ACCEPT the ipsec protocol ah, esp & udp (for nat traversal) on the specified interface
*/
@@ -174,14 +182,6 @@ void turn_connection_off (char *name) {
ipsec_reload();
}
-void ipsec_reload() {
- /* Re-read all configuration files and secrets and
- * reload the daemon (#10339).
- */
- safe_system("/usr/sbin/ipsec rereadall >/dev/null 2>&1");
- safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
-}
-
int main(int argc, char *argv[]) {
char configtype[STRING_SIZE];
char redtype[STRING_SIZE] = "";
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-26 22:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-26 22:47 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fcb92530e4ddd8146d0d82e380a161cc85413e4 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox