From: Michael Tremer <michael.tremer@ipfire.org>
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-Tag: v2.15-rc2~6^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91812c575fd2f534a38ff67300d77a94782afd74;p=ipfire-2.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
---

91812c575fd2f534a38ff67300d77a94782afd74
diff --cc doc/language_issues.tr
index d5576f3438,93166e621f..96c38538ad
--- 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