From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 9 Jan 2014 15:29:36 +0000 (+0100)
Subject: language changes second part
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=a9344b774b54495dcdd811f5854a0f2f640bb06c

language changes second part
---

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3aa49c607..d7c038736 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -742,7 +742,7 @@
 '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 server' => 'DNS Server',
 'dns title' => 'Domain Name System',
-'dnsforward' => 'DNS forwarding',
+'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Add a new entry',
 'dnsforward configuration' => 'DNS forward configuration',
 'dnsforward edit an entry' => 'Edit an existing entry',
@@ -1148,7 +1148,7 @@
 'hangup' => 'Disconnect',
 'hangup string' => 'Hangup:',
 'harddisk temperature' => 'Harddisk temperature',
-'harddisk temperature graphs' => 'hdd temperature graphs',
+'harddisk temperature graphs' => 'HDD temperature graphs',
 'hardware graphs' => 'Hardware Graphs',
 'hdd temperature in' => 'Harddisk temperature in',
 'help' => 'Help',
@@ -1379,11 +1379,11 @@
 'mac address error not valid' => 'MAC addresse not valid!',
 'mac address header' => 'MAC address on red0',
 'mac address in use' => 'MAC address already in use',
-'mac address menu' => 'Assign MAC-address',
+'mac address menu' => 'Assign MAC-Address',
 'mac address recon' => 'Trying to reconnect!',
 'mac address saved' => 'Successfully saved!',
 'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
-'mac address title' => 'Medium Access Control Address',
+'mac address title' => 'Assign MAC Address',
 '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 address:',
 'mac1 new' => 'new MAC address 1 (vdsl-inet):',
@@ -1425,10 +1425,10 @@
 'mbmon volt' => 'Voltage',
 'meaning' => 'meaning',
 'media' => 'Media',
-'media information' => 'media information',
+'media information' => 'Media information',
 'medium' => 'Medium',
 'memory' => 'Memory',
-'memory information' => 'memory information',
+'memory information' => 'Memory information',
 'memory usage per' => 'Memory Usage per',
 'messages logging' => 'Logsettings for /var/log/messages',
 'method' => 'Method:',
@@ -1537,7 +1537,7 @@
 'notice' => 'Notice',
 'november' => 'November',
 'ntp common settings' => 'Common settings',
-'ntp configuration' => 'NTP configuration',
+'ntp configuration' => 'NTP Configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',
 'ntp sync' => 'Synchronization',
@@ -1971,10 +1971,10 @@
 'start ovpn server' => 'Start OpenVPN Server',
 'state or province' => 'State or Province',
 'static ip' => 'Static IP',
-'static routes' => 'Static routes',
+'static routes' => 'Static Routes',
 'status' => 'Status',
 'status information' => 'Status information',
-'status ovpn' => '4. OpenVPN Status / Configuration:',
+'status ovpn' => 'OpenVPN',
 'std classes' => 'Standardclasses',
 'stop' => 'Stop',
 'stop ovpn server' => 'Stop OpenVPN Server',
@@ -1993,7 +1993,7 @@
 'swap usage per' => 'Swap usage per',
 'system' => 'System',
 'system graphs' => 'System Graphs',
-'system information' => 'System information',
+'system information' => 'System Information',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'System Logs',
 'system status information' => 'System Status Information',
@@ -2234,7 +2234,7 @@
 'uptime' => 'Uptime',
 'uptime and users' => 'Uptime and users:',
 'uptime load average' => 'Load average',
-'url filter' => 'Content Filter',
+'url filter' => 'URL Filter',
 'urlfilter access' => 'Access',
 'urlfilter activity detection' => 'Activity detection',
 'urlfilter add new time constraint rule' => 'Add new time constraint rule',
@@ -2470,7 +2470,7 @@
 'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
 'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
 'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
-'vpn configuration main' => 'VPN configuration - Main',
+'vpn configuration main' => 'VPN Configuration',
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',