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=004ee4f5fd423c42c832d527e72a817d66ee8faf;hp=bef35206453d81a9ab9fbf0416c4e23313bc36a5;hb=3bd59c342151edf45ce9b34ac431484232b8272b;hpb=c661488323a297cf001d4c63e8efd266c7a5c9ba

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bef3520645..004ee4f5fd 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,7 +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 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:',
@@ -1083,11 +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 new' => 'new MAC address:',
+'mac2 new' => 'new MAC address 2 (vdsl-iptv):',
 'magic packet send to:' => 'Magic packet send to:',
 'mailmethod' => 'Mailmethod',
 'mailprogramm' => 'Mailprogramm',
@@ -1315,6 +1323,7 @@
 'pakfire configuration' => 'Pakfire Configuration',
 '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:',
@@ -1340,7 +1349,7 @@
 'passwords do not match' => 'Passwords do not match.',
 'passwords must be at least 6 characters in length' => 'Passwords must be at least 6 characters in length',
 'path to directory' => 'path to share',
-'pc' => 'Workstatipon',
+'pc' => 'Workstation',
 'pc add' => 'add workstation',
 'pdc options' => 'PDC Options',
 'percentage' => 'Percentage',
@@ -1532,10 +1541,12 @@
 'sitekeyfile' => 'Sitekeyfile',
 'size' => 'Size',
 'smart information' => 'SMART information',
-'smbreload' => 'Samba Dienste durchstarten',
+'smartwarn1' => 'Device:',
+'smartwarn2' => 'reports S.M.A.R.T. error',
+'smbreload' => 'reload Samba',
 'smbrestart' => 'restart Samba',
-'smbstart' => 'Samba Dienste starten',
-'smbstop' => 'Samba Dienste beenden',
+'smbstart' => 'Start Samba',
+'smbstop' => 'Stop Samba',
 'smtphost' => 'Smtp Host',
 'smtpport' => 'Smtp Port',
 'snort hits' => 'Total of number of Intrusion rules activated for',