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 76988c142d927837915fe6c0844c7b86302b9676 (commit) via 67fd2a703ddad53ad8045ecd9a03abe0aefbcc23 (commit) from c5259fab54427a6e39279aa6661db14f26974b94 (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 76988c142d927837915fe6c0844c7b86302b9676 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 30 12:29:12 2013 +0200

Fix broken language strings.

commit 67fd2a703ddad53ad8045ecd9a03abe0aefbcc23 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 30 12:28:34 2013 +0200

Fix spacing in new uptime bar.

-----------------------------------------------------------------------

Summary of changes: doc/language_issues.de | 9 ++-- doc/language_issues.en | 6 +-- doc/language_issues.es | 19 +++++++- doc/language_issues.fr | 19 +++++++- doc/language_issues.nl | 19 +++++++- doc/language_issues.pl | 19 +++++++- doc/language_issues.ru | 19 +++++++- doc/language_missings | 68 ++++++++++++++++++++++++++++ html/html/themes/ipfire/include/functions.pl | 2 +- html/html/themes/maniac/include/functions.pl | 2 +- langs/de/cgi-bin/de.pl | 14 +++--- langs/en/cgi-bin/en.pl | 18 ++++---- 12 files changed, 178 insertions(+), 36 deletions(-)

Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index e3c8842..9179964 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -368,8 +368,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -437,9 +435,8 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr to delete WARNING: translation string unused: updxlrtr unknown -WARNING: translation string unused: updxlrtr update information -WARNING: translation string unused: updxlrtr update notification WARNING: translation string unused: upload file WARNING: translation string unused: upload static key WARNING: translation string unused: upload successful @@ -448,6 +445,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text @@ -483,4 +481,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr configuration WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.en b/doc/language_issues.en index 6c1fc21..0b27a19 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -468,9 +466,8 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr to delete WARNING: translation string unused: updxlrtr unknown -WARNING: translation string unused: updxlrtr update information -WARNING: translation string unused: updxlrtr update notification WARNING: translation string unused: upload fcdsl.o WARNING: translation string unused: upload file WARNING: translation string unused: upload static key @@ -480,6 +477,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text diff --git a/doc/language_issues.es b/doc/language_issues.es index 2468981..9bdd62f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,18 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 70dbdc1..dfb6551 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -395,8 +395,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -601,7 +604,19 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by WARNING: untranslated string: upload new ruleset +WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block WARNING: untranslated string: visit us at diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f17d07d..caf1286 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new @@ -517,3 +520,15 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2468981..9bdd62f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,18 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d59f4f6..3d9fe2d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -389,8 +389,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -500,6 +498,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -580,6 +583,18 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_missings b/doc/language_missings index ac650b3..6f0f3a6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -14,6 +14,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -104,7 +109,19 @@ < snort working < static routes < system information +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by < upload new ruleset +< uptime +< uptime load average < urlfilter file ext block < urlfilter mode block < visit us at @@ -138,6 +155,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < Async logging enabled < attention < ccd add @@ -244,6 +266,18 @@ < Set time on boot < static routes < system information +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -255,6 +289,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -336,6 +375,18 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -348,6 +399,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -433,6 +489,18 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange < week-graph diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index d4f8bf7..086ff18 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -348,7 +348,7 @@ END </div> <br class="clear" /> <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 2a40be2..e072d3b 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -345,7 +345,7 @@ END </div> <br class="clear" /> <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 00053b0..e513fb5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -6,11 +6,6 @@ 'Add Port Rule' => 'Port-Regel hinzufÃŒgen', 'Add Rule' => 'Regel hinzufÃŒgen', 'Add a route' => 'Eine Route hinzufÃŒgen', -'age smin' => 'Min.', -'age ssec' => 'Sek.', -'age second' => 'Sekunde', -'age seconds' => 'Sekunden', -'age shour' => 'Std.', 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs', 'Choose Rule' => 'WÀhlen Sie <u>eine</u> der untenstehenden Regeln aus.', 'Class' => 'Klasse', @@ -328,6 +323,11 @@ 'advproxy web browser' => 'Web-Browser', 'advproxy wednesday' => 'Mit', 'again' => 'Wiederholung:', +'age second' => 'Sekunde', +'age seconds' => 'Sekunden', +'age shour' => 'Std.', +'age sminute' => 'Min.', +'age ssecond' => 'Sek.', 'aktiv' => 'aktiv', 'album' => 'Album', 'alcatelusb help' => 'Um das Speedtouch-USB-Modem zu verwenden, mÃŒssen Sie die Firmware in Ihre IPFire Box hochladen. Bitte laden Sie das <b>Embedded Firmware</b> Paket von speedtouch.com herunter, entpacken es und laden dann die passende Datei fÃŒr Ihr Modem hoch: KQD6_3.xxx fÃŒr Revisionsnummern <4 oder ZZZL_3.xxx fÃŒr Rev.=4 mittels des unten angegebenen Formulars.', @@ -1903,9 +1903,9 @@ 'updxlrtr save and restart' => 'Speichern und neu starten', 'updxlrtr settings' => 'Einstellungen', 'updxlrtr source' => 'Quelle', -'updxlrtr sources' => 'Quellen', 'updxlrtr source checkup' => 'QuellenprÃŒfung', 'updxlrtr source checkup schedule' => 'Zeitplanung der QuellenprÃŒfung', +'updxlrtr sources' => 'Quellen', 'updxlrtr standard view' => 'Standard-Ansicht', 'updxlrtr statistics' => 'Statistik', 'updxlrtr statistics by source' => 'Statistik pro Quelle', @@ -1940,8 +1940,8 @@ 'upstream proxy host:port' => 'Vorgelagerter Proxy (hostname:port)', 'upstream username' => 'Proxy-Benutzername:', 'uptime' => 'Betriebszeit', -'uptime load average' => 'Ø Systemlast', 'uptime and users' => 'Uptime und Benutzer:', +'uptime load average' => 'Systemlast', 'url filter' => 'URL-Filter', 'urlfilter access' => 'Zugriff', 'urlfilter activity detection' => 'AktivitÀtserkennung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5431e64..e915696 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -6,11 +6,6 @@ 'Add Port Rule' => 'Add port rule', 'Add Rule' => 'Add rule', 'Add a route' => 'Add a route', -'age smin' => 'min', -'age ssec' => 'sec', -'age second' => 'second', -'age seconds' => 'seconds', -'age shour' => 'h', 'Async logging enabled' => 'Enable asynchronous writing of the syslog file', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', 'Class' => 'Class', @@ -329,6 +324,11 @@ 'advproxy web browser' => 'Web browser', 'advproxy wednesday' => 'Wed', 'again' => 'Again:', +'age second' => 'second', +'age seconds' => 'seconds', +'age shour' => 'h', +'age sminute' => 'min', +'age ssecond' => 'sec', 'aktiv' => 'Active', 'album' => 'Album', 'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPFire box. Please download the <b>Embedded Firmware</b> package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', @@ -976,7 +976,7 @@ 'hostname not set' => 'Hostname not set.', 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', -'hour' => 'Hour', +'hour' => 'hour', 'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', @@ -1938,9 +1938,9 @@ 'updxlrtr save and restart' => 'Save and Restart', 'updxlrtr settings' => 'Settings', 'updxlrtr source' => 'Source', -'updxlrtr sources' => 'Sources', 'updxlrtr source checkup' => 'Source checkup', 'updxlrtr source checkup schedule' => 'Source checkup schedule', +'updxlrtr sources' => 'Sources', 'updxlrtr standard view' => 'Standard view', 'updxlrtr statistics' => 'Statistics', 'updxlrtr statistics by source' => 'Statistics by source', @@ -1951,8 +1951,8 @@ 'updxlrtr total files' => 'Total files in cache', 'updxlrtr total used' => 'Total used', 'updxlrtr unknown' => 'Unknown', -'updxlrtr used by' => 'Used by', 'updxlrtr update accelerator' => 'Update Accelerator', +'updxlrtr used by' => 'Used by', 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator', 'updxlrtr week' => 'one week', 'updxlrtr weekly' => 'weekly', @@ -1976,8 +1976,8 @@ 'upstream proxy host:port' => 'Upstream proxy (host:port)', 'upstream username' => 'Upstream username:', 'uptime' => 'Uptime', -'uptime load average' => 'Ø Load average', 'uptime and users' => 'Uptime and users:', +'uptime load average' => 'Load average', 'url filter' => 'Content Filter', 'urlfilter access' => 'Access', 'urlfilter activity detection' => 'Activity detection',

hooks/post-receive -- IPFire 2.x development tree