X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=langs%2Fen%2Fcgi-bin%2Fen.pl;h=3ac238857f957fa5f4bc52978e6417a69b4b1137;hp=9e97dcd6ae2e3d60ef1135a4695ce1caf17d3535;hb=62f1526aab63d038e3d2c164ed36a480c1917451;hpb=d3cfd0db355b1cceea7e1cf70801318d0ded9364

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9e97dcd6ae..3ac238857f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -25,6 +25,9 @@
 'ConnSched time' => 'Time:',
 'ConnSched up' => 'Up',
 'ConnSched weekdays' => 'Days of the week:',
+'core notice 1' => '<strong>Notice:</strong> There is an core-update from',
+'core notice 2' => 'to',
+'core notice 3' => 'available.',
 'Enter TOS' => 'Activate or Deactivate TOS-Bits <br /> and then press <i>Save</i>.',
 'Existing Files' => 'Files in database',
 'HDD temperature' => 'HDD temperature',
@@ -666,7 +669,9 @@
 'dns title' => 'Domain Name System',
 'dns header' => 'assign DNS server addresses only for DHCP on red0',
 'dns saved' => 'Successfully saved!',
-'dns saved txt' => 'The two entered DNS server addresses has been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
+'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
+'dns address deleted' => 'Successfully deleted!',
+'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
@@ -675,8 +680,7 @@
 'dns new 0' => 'New <strong>primary</strong> DNS server IP:',
 'dns new 1' => 'New <strong>secondary</strong> DNS server IP:',
 'dns address recon' => 'Trying to reconnect!',
-'dns reconnection' => 'Reconnection',
-'dns address done' => 'The DNS-Server addresses are going to be saved.',
+'dns address done' => 'The DNS-Server address settings are going to be saved.',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
 'dod' => 'Dial on Demand',
 'dod for dns' => 'Dial on Demand for DNS:',
@@ -895,8 +899,9 @@
 'ids logs' => 'IDS Logs',
 'ids preprocessor' => 'IDS preprocessor',
 'ids rules license' => 'To utilize Sourcefire VRT Certified Rules, you need to register on',
-'ids rules license2' => 'Acknowledge the license, receive your password by email, and connect to the site. Go to',
-'ids rules license3' => 'press the \'Get Code\' button at the bottom and copy the 40 character Oink Code into the field below.',
+'ids rules license1' => '.',
+'ids rules license2' => 'Acknowledge the license, activate your account by visiting the url you got via mail. Then go to',
+'ids rules license3' => 'press the "Generate code"-button and copy the 40 character Oinkcode into the field below.',
 'ids rules update' => 'Snort rules update',
 'iface' => 'Iface',
 'ignore filter' => 'Ignore filter',
@@ -1083,12 +1088,14 @@
 'mac address error not valid' => 'MAC addresse not valid!',
 'mac address error not 00' => 'MAC addresse has to start with 00!',
 'mac address saved' => 'Successfully saved!',
-'mac address saved txt' => 'The MAC address has been successfully saved, but changes will take effect after reboot or reconnection.',
+'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
+'mac address deleted' => 'Successfully deleted!',
+'mac address deleted txt' => 'The MAC address has been successfully deleted, but changes will only take effect after <strong>reboot</strong>.',
 'mac address recon' => 'Trying to reconnect!',
-'mac address done' => 'The MAC address will be saved.',
+'mac address done' => 'The MAC address settings are going to be saved.',
 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
-'mac new' => 'new MAC addresse:',
-'mac reconnection' => 'Reconnection',
+'mac new' => 'new MAC address:',
+'mac2 new' => 'new MAC address 2 (vdsl-iptv):',
 'magic packet send to:' => 'Magic packet send to:',
 'mailmethod' => 'Mailmethod',
 'mailprogramm' => 'Mailprogramm',
@@ -1314,8 +1321,9 @@
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire available addons' => 'Available Addons:',
 'pakfire configuration' => 'Pakfire Configuration',
-'pakfire core update auto' => 'Install Core Update automaticly?',
+'pakfire core update auto' => 'Install core and addon updates automatically:',
 'pakfire core update level' => 'Core-Update-Level',
+'pakfire health check' => 'Check if mirror is reachable(ping)',
 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
 'pakfire install package' => 'You want to install the following packages: ',
 'pakfire installed addons' => 'Installed Addons:',
@@ -1324,11 +1332,11 @@
 'pakfire last serverlist update' => 'Last server list update made',
 'pakfire last update' => 'Last Update made',
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
-'pakfire register' => 'Register at master server:',
+'pakfire register' => 'Register at pakfire-server:',
 'pakfire system state' => 'System Status',
 'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
-'pakfire update daily' => 'Run automatic Update daily:',
+'pakfire update daily' => 'Search for updates daily:',
 'pakfire updates' => 'Available Update:',
 'pakfire working' => 'Pakfire ist working ... Please wait until everything is done successfull.',
 'pap or chap' => 'PAP or CHAP',
@@ -1398,6 +1406,7 @@
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos graphs' => 'Qos Graphs',
+'qos warning' => 'The rule <strong>must</strong> be saved, otherwise it will be discarded!',
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
@@ -1405,9 +1414,13 @@
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
+'reboot ask' => 'Reboot?',
+'reboot sure' => 'Are you sure that you want to reboot?',
+'reboot question' => 'Extra query for restart and shutdown',
 'reboot schedule' => 'Schedule IPFire reboots',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
+'reconnect' => 'Reconnect',
 'reconnection' => 'Reconnection',
 'red' => 'Internet',
 'references' => 'References',
@@ -1517,6 +1530,8 @@
 'show root certificate' => 'Show Root Certificate',
 'show share options' => 'show shares options',
 'shutdown' => 'Shutdown',
+'shutdown ask' => 'Shutdown?',
+'shutdown sure' => 'Are you sure that you want to shutdown?',
 'shutdown control' => 'Shutdown control',
 'shutdown2' => 'Shutdown:',
 'shutting down' => 'Shutting down',
@@ -1526,6 +1541,8 @@
 'sitekeyfile' => 'Sitekeyfile',
 'size' => 'Size',
 'smart information' => 'SMART information',
+'smartwarn1' => 'Device:',
+'smartwarn2' => 'report S.M.A.R.T. error',
 'smbreload' => 'Samba Dienste durchstarten',
 'smbrestart' => 'restart Samba',
 'smbstart' => 'Samba Dienste starten',