Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Apr 2014 12:37:58 +0000 (14:37 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Apr 2014 12:37:58 +0000 (14:37 +0200)
1  2 
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge