Language changes for new layout

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7d4546dbe931ba85c532dd37697c97d89279eac1..3aa49c607a606f96e1f91cc9e1004f24f54b0175 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -73,12 +73,12 @@
 'activate user' => 'Activate user',
 'active' => 'Active',
 'add' => 'Add',
 'activate user' => 'Activate user',
 'active' => 'Active',
 'add' => 'Add',

-'add a host' => 'Add a host:',
+'add a host' => 'Add a host',

 'add a new rule' => 'Add a new rule:',
 'add cron' => 'add cronjob',
 'add device' => 'Add device',
 'add network' => 'Add network',
 'add a new rule' => 'Add a new rule:',
 'add cron' => 'add cronjob',
 'add device' => 'Add device',
 'add network' => 'Add network',

-'add new alias' => 'Add a new alias:',
+'add new alias' => 'Add a new alias',

 'add new lease' => 'Add a new fixed lease',
 'add new ovpn' => 'OpenVPN Settings:',
 'add printer' => 'Add printer',
 'add new lease' => 'Add a new fixed lease',
 'add new ovpn' => 'OpenVPN Settings:',
 'add printer' => 'Add printer',


@@ -89,6 +89,7 @@
 'add xtaccess' => 'Add External Access',
 'add-route' => 'Additional push route',
 'added from dhcp lease list' => 'Added from DHCP lease list',
 'add xtaccess' => 'Add External Access',
 'add-route' => 'Additional push route',
 'added from dhcp lease list' => 'Added from DHCP lease list',

+'addons' => 'Addons',

 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
 'administrator user password' => 'Admin user password:',
 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
 'administrator user password' => 'Admin user password:',


@@ -358,7 +359,7 @@
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
 'are you sure' => 'Are you sure?',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
 'are you sure' => 'Are you sure?',

-'arp table entries' => 'ARP Table Entries:',
+'arp table entries' => 'ARP Table Entries',

 'artist' => 'Artist',
 'attemps' => 'Attempts',
 'attention' => 'ATTENTION',
 'artist' => 'Artist',
 'attemps' => 'Attempts',
 'attention' => 'ATTENTION',


@@ -560,7 +561,7 @@
 'connection' => 'Connection',
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
 'connection' => 'Connection',
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',

-'connection status and controlc' => 'Connection status and control:',
+'connection status and controlc' => 'Connection status and control',

 'connection tracking' => 'iptables Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connection tracking' => 'iptables Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',


@@ -600,13 +601,13 @@
 'crl' => 'Certificate Revocation List',
 'cron server' => 'CRON Server',
 'current' => 'Current',
 'crl' => 'Certificate Revocation List',
 'cron server' => 'CRON Server',
 'current' => 'Current',

-'current aliases' => 'Current aliases:',
+'current aliases' => 'Current aliases',

 'current class' => 'Current class',
 'current devices' => 'Current devices',
 'current dhcp leases on blue' => 'Current DHCP leases on BLUE',
 'current dynamic leases' => 'Current dynamic leases',
 'current fixed leases' => 'Current fixed leases',
 'current class' => 'Current class',
 'current devices' => 'Current devices',
 'current dhcp leases on blue' => 'Current DHCP leases on BLUE',
 'current dynamic leases' => 'Current dynamic leases',
 'current fixed leases' => 'Current fixed leases',

-'current hosts' => 'Current hosts:',
+'current hosts' => 'Current hosts',

 'current media' => 'Current media',
 'current ovpn' => 'Active OVPN-Connection:',
 'current playlist' => 'Current Playlist',
 'current media' => 'Current media',
 'current ovpn' => 'Active OVPN-Connection:',
 'current playlist' => 'Current Playlist',


@@ -742,10 +743,10 @@
 'dns server' => 'DNS Server',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'DNS forwarding',
 'dns server' => 'DNS Server',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'DNS forwarding',

-'dnsforward add a new entry' => 'Add a new entry:',
+'dnsforward add a new entry' => 'Add a new entry',

 'dnsforward configuration' => 'DNS forward configuration',
 'dnsforward configuration' => 'DNS forward configuration',

-'dnsforward edit an entry' => 'Edit an existing entry:',
-'dnsforward entries' => 'Current entries:',
+'dnsforward edit an entry' => 'Edit an existing entry',
+'dnsforward entries' => 'Current entries',

 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',


@@ -845,7 +846,7 @@
 'err rs 8 untar' => 'Error untarring archive',
 'error config' => 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !',
 'error external access' => 'Could not open /var/ipfire/xtaccess/config (external acccess could not be granted)!',
 'err rs 8 untar' => 'Error untarring archive',
 'error config' => 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !',
 'error external access' => 'Could not open /var/ipfire/xtaccess/config (external acccess could not be granted)!',

-'error messages' => 'Error messages:',
+'error messages' => 'Error messages',

 'esp encryption' => 'ESP Encryption:',
 'esp grouptype' => 'ESP Grouptype:',
 'esp integrity' => 'ESP Integrity:',
 'esp encryption' => 'ESP Encryption:',
 'esp grouptype' => 'ESP Grouptype:',
 'esp integrity' => 'ESP Integrity:',


@@ -987,7 +988,7 @@
 'fwdfw log' => 'Log',
 'fwdfw log rule' => 'Log rule',
 'fwdfw man port' => 'Port(s):',
 'fwdfw log' => 'Log',
 'fwdfw log rule' => 'Log rule',
 'fwdfw man port' => 'Port(s):',

-'fwdfw menu' => 'Firewall Rules',
+'fwdfw menu' => 'Firewall',

 'fwdfw movedown' => 'Move down',
 'fwdfw moveup' => 'Move up',
 'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.',
 'fwdfw movedown' => 'Move down',
 'fwdfw moveup' => 'Move up',
 'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.',


@@ -1029,13 +1030,12 @@
 'fwdfw wd_tue' => 'Tue',
 'fwdfw wd_wed' => 'Wed',
 'fwdfw xt access' => 'Input',
 'fwdfw wd_tue' => 'Tue',
 'fwdfw wd_wed' => 'Wed',
 'fwdfw xt access' => 'Input',

-'fwhost addgrp' => 'Add new network/host group:',
+'fwhost addgrp' => 'Add new network/host group',

 'fwhost addgrpname' => 'Group name:',
 'fwhost addgrpname' => 'Group name:',

-'fwhost addhost' => 'Add new host:',
-'fwhost addnet' => 'Add new network:',
-'fwhost addrule' => 'Add/edit rule:',
-'fwhost addservice' => 'Add service:',
-'fwhost addservicegrp' => 'Add new service group:',
+'fwhost addhost' => 'Add new host',
+'fwhost addnet' => 'Add new network',
+'fwhost addservice' => 'Add service',
+'fwhost addservicegrp' => 'Add new service group',

 'fwhost any' => 'Any',
 'fwhost attention' => 'ATTENTION',
 'fwhost back' => 'Back',
 'fwhost any' => 'Any',
 'fwhost attention' => 'ATTENTION',
 'fwhost back' => 'Back',


@@ -1044,11 +1044,11 @@
 'fwhost ccdnet' => 'OpenVPN networks:',
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',
 'fwhost ccdnet' => 'OpenVPN networks:',
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',

-'fwhost cust addr' => 'Hosts:',
-'fwhost cust grp' => 'Network/Host Groups:',
-'fwhost cust net' => 'Networks:',
-'fwhost cust service' => 'Services:',
-'fwhost cust srvgrp' => 'Service Groups:',
+'fwhost cust addr' => 'Hosts',
+'fwhost cust grp' => 'Network/Host Groups',
+'fwhost cust net' => 'Networks',
+'fwhost cust service' => 'Services',
+'fwhost cust srvgrp' => 'Service Groups',

 'fwhost deleted' => 'Deleted',
 'fwhost empty' => 'No rules defined',
 'fwhost err addr' => 'Invalid IP address or subnet',
 'fwhost deleted' => 'Deleted',
 'fwhost empty' => 'No rules defined',
 'fwhost err addr' => 'Invalid IP address or subnet',


@@ -1340,7 +1340,7 @@
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',

-'log' => 'Log:',
+'log' => 'Log',

 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',
 'log lines per page' => 'Lines per page',
 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',
 'log lines per page' => 'Lines per page',


@@ -1501,7 +1501,7 @@
 'network red' => 'Network (external)',
 'network removed' => 'Custom network removed',
 'network status information' => 'Network Status Information',
 'network red' => 'Network (external)',
 'network removed' => 'Custom network removed',
 'network status information' => 'Network Status Information',

-'network time' => 'Use a network time server:',
+'network time' => 'Use a network time server',

 'network time from' => 'Obtain time from a network time server',
 'network traffic graphs' => 'Network traffic graphs',
 'network traffic graphs external' => 'Net-Traffic graphs (external)',
 'network time from' => 'Obtain time from a network time server',
 'network traffic graphs' => 'Network traffic graphs',
 'network traffic graphs external' => 'Net-Traffic graphs (external)',


@@ -1827,7 +1827,7 @@
 'root user password' => 'Root password',
 'route subnet is invalid' => 'Additional push route subnet is invalid',
 'router ip' => 'Router IP address:',
 'root user password' => 'Root password',
 'route subnet is invalid' => 'Additional push route subnet is invalid',
 'router ip' => 'Router IP address:',

-'routing table entries' => 'Routing Table Entries:',
+'routing table entries' => 'Routing Table Entries',

 'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
 'rules already up to date' => 'Rules already up to date',
 'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
 'rules already up to date' => 'Rules already up to date',


@@ -1939,6 +1939,7 @@
 'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
 'srcprt within existing' => 'Source port is within an already defined port range.',
 'ssdmz pinholes' => 'DMZ Pinholes',
 'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
 'srcprt within existing' => 'Source port is within an already defined port range.',
 'ssdmz pinholes' => 'DMZ Pinholes',

+'ssh' => 'SSH',

 'ssh access' => 'SSH Access',
 'ssh access tip' => 'IPFire SSH is not using default port 222!',
 'ssh fingerprint' => 'Fingerprint',
 'ssh access' => 'SSH Access',
 'ssh access tip' => 'IPFire SSH is not using default port 222!',
 'ssh fingerprint' => 'Fingerprint',


@@ -2104,7 +2105,7 @@
 'trafficorange' => 'DMZ',
 'trafficout' => 'Output',
 'trafficred' => 'Internet',
 'trafficorange' => 'DMZ',
 'trafficout' => 'Output',
 'trafficred' => 'Internet',

-'traffics' => 'Utilization-overview:',
+'traffics' => 'Utilization-overview',

 'trafficsum' => 'Totals',
 'trafficto' => 'To',
 'transfer limits' => 'Transfer limits',
 'trafficsum' => 'Totals',
 'trafficto' => 'To',
 'transfer limits' => 'Transfer limits',