From: Michael Tremer Date: Tue, 29 Apr 2014 12:37:58 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=91812c575fd2f534a38ff67300d77a94782afd74;hp=-c Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- 91812c575fd2f534a38ff67300d77a94782afd74 diff --combined doc/language_issues.es index 17920311a,32e688c77..b854a2b7a --- a/doc/language_issues.es +++ b/doc/language_issues.es @@@ -588,6 -588,7 +588,7 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent + WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes @@@ -873,7 -874,6 +874,7 @@@ WARNING: untranslated string: proxy rep WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --combined doc/language_issues.fr index 889f90344,a5a15c916..6ab29e8bb --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@@ -598,6 -598,7 +598,7 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent + WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes @@@ -880,7 -881,6 +881,7 @@@ WARNING: untranslated string: proxy rep WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --combined doc/language_issues.nl index ace5ffd7f,b64920020..1fa7b1873 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -600,6 -600,7 +600,7 @@@ WARNING: untranslated string: addon WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent + WARNING: untranslated string: atm device WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd err isipsecrw @@@ -802,7 -803,6 +803,7 @@@ WARNING: untranslated string: ovpn por WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: qos enter bandwidths +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --combined doc/language_issues.pl index 17920311a,32e688c77..b854a2b7a --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@@ -588,6 -588,7 +588,7 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent + WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes @@@ -873,7 -874,6 +874,7 @@@ WARNING: untranslated string: proxy rep WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --combined doc/language_issues.ru index 3e0748027,7c1b5f87d..405809860 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@@ -591,6 -591,7 +591,7 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent + WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes @@@ -863,7 -864,6 +864,7 @@@ WARNING: untranslated string: proxy rep WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: qos enter bandwidths +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --combined doc/language_issues.tr index d5576f343,93166e621..96c38538a --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -641,9 -641,9 +641,10 @@@ WARNING: translation string unused: xta WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs + WARNING: untranslated string: atm device WARNING: untranslated string: bytes WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: random number generator daemon WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --combined doc/language_missings index f6b033925,601c9c799..1a386c19c --- a/doc/language_missings +++ b/doc/language_missings @@@ -23,6 -23,7 +23,7 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit < ccd add @@@ -356,7 -357,6 +357,7 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths +< random number generator daemon < red1 < server restart < snat new source ip address @@@ -501,6 -501,7 +502,7 @@@ < age sminute < age ssecond < Async logging enabled + < atm device < attention < bit < ccd add @@@ -849,7 -850,6 +851,7 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths +< random number generator daemon < red1 < server restart < Set time on boot @@@ -970,6 -970,7 +972,7 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit < ccd add @@@ -1296,7 -1297,6 +1299,7 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths +< random number generator daemon < red1 < server restart < snat new source ip address @@@ -1416,6 -1416,7 +1419,7 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit < ccd add @@@ -1746,7 -1747,6 +1750,7 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths +< random number generator daemon < red1 < server restart < snat new source ip address diff --combined langs/de/cgi-bin/de.pl index 8457fff95,2dd87d224..090510fe3 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@@ -99,7 -99,6 +99,6 @@@ 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 'admin users' => 'Liste der Benutzer mit Super User Rechten', 'administrator user password' => 'Passwort für Benutzer "admin":', - 'adsl settings' => 'ADSL-Einstellungen', 'advanced' => 'Erweitert', 'advanced server' => 'Erweiterte Server-Optionen', 'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich', @@@ -366,6 -365,8 +365,8 @@@ 'are you sure' => 'Sind Sie sicher?', 'arp table entries' => 'Einträge der ARP-Tabelle', 'artist' => 'Künstler', + 'atm device' => 'Device:', + 'atm settings' => 'ATM-Einstellungen', 'attemps' => 'Versuche', 'attention' => 'ACHTUNG', 'august' => 'August', @@@ -1782,7 -1783,6 +1783,7 @@@ 'qos warning' => 'Die Regel muss wieder gespeichert werden, ansonsten wird sie verworfen!', 'quick playlist' => 'Quick Playlist', 'ram' => 'RAM-Speicher', +'random number generator daemon' => 'Random Number Generator Daemon', 'read bytes' => 'Gelesene Bytes', 'read list' => 'Liste der Leseberechtigten', 'real address' => 'Reale Addresse', diff --combined langs/en/cgi-bin/en.pl index f87f32675,67f426996..de29f34ec --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@@ -99,7 -99,6 +99,6 @@@ 'admin user password has been changed' => 'Admin user password has been changed.', 'admin users' => 'User with superuser rights', 'administrator user password' => 'Admin user password:', - 'adsl settings' => 'ADSL settings', 'advanced' => 'Advanced', 'advanced server' => 'Advanced server options', 'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses', @@@ -368,6 -367,8 +367,8 @@@ 'are you sure' => 'Are you sure?', 'arp table entries' => 'ARP Table Entries', 'artist' => 'Artist', + 'atm device' => 'Device:', + 'atm settings' => 'ATM settings', 'attemps' => 'Attempts', 'attention' => 'ATTENTION', 'august' => 'August', @@@ -1814,7 -1815,6 +1815,7 @@@ 'quick control' => 'Quick Control', 'quick playlist' => 'Quick Playlist', 'ram' => 'RAM', +'random number generator daemon' => 'Random Number Generator Daemon', 'read bytes' => 'Read Bytes', 'read list' => 'list with readonly hosts', 'real address' => 'Real Address',