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

[people/teissler/ipfire-2.x.git] / langs / en / cgi-bin / en.pl

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f87f32675c93e02160f23bffd734e1617c5e18eb..de29f34ec48c4a6c6ce1f5c2a303f97ddb291827 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -99,7 +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 @@
 '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',