X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=i18n%2Fenglish%2Fluasrc%2Fi18n%2Fadmin-core.en.lua;h=64729f8fc8db8e44a68d9d8c0cd5e844fd06c704;hp=c260b59b4b310c480a6522a8515fe2be965ec985;hb=d9d66f4c2851fb976d12ce1f8c5d25d30da27dfd;hpb=fade8edd2dfe39ae579256d04220aba9da2ff074

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index c260b59b4b..64729f8fc8 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -8,7 +8,7 @@ c_contributors = 'Contributing Developers'
 c_thanksto = 'Thanks To'
 a_i_i_hello = 'Hello!'
 a_i_i_admin1 = 'This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.'
-a_i_i_admin2 = '<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze.'
+a_i_i_admin2 = '<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.'
 a_i_i_admin3 = 'On the following pages you can adjust all important settings of your router.'
 a_i_i_admin4 = 'Notice: In <abbr title="Lua Configuration Interface">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.'
 a_i_i_admin5 = 'As we are always want to improve this interface we are looking forward to your feedback and suggestions.'
@@ -34,7 +34,7 @@ routes_metric = 'Metric'
 a_s_desc = 'Here you can configure the basic aspects of your device like its hostname or the timezone.'
 a_s_packages = 'Software'
 a_s_changepw = 'Admin Password'
-a_s_p_ipkg = 'IPKG-Configuration'
+a_s_p_ipkg = 'OPKG-Configuration'
 a_s_sshkeys = '<abbr title="Secure Shell">SSH</abbr>-Keys'
 a_s_fstab = 'Mount Points'
 a_s_flash = 'Flash Firmware'
@@ -59,18 +59,18 @@ a_s_changepw_nomatch = 'Error: Passwords do not match'
 a_s_sshkeys1 = 'Here you can paste public <abbr title="Secure Shell">SSH</abbr>-Keys (one per line) for <abbr title="Secure Shell">SSH</abbr> public-key authentication.'
 a_s_fstab_mountpoints = 'Mount Points'
 a_s_fstab_mountpoints1 = 'Mount Points define at which point a memory device will be attached to the filesystem'
-a_s_fstab_active = 'Mounted file systems&quot;'
-a_s_fstab_used = 'Used&quot;'
-a_s_fstab_avail = 'Available&quot;'
+a_s_fstab_active = 'Mounted file systems'
+a_s_fstab_used = 'Used'
+a_s_fstab_avail = 'Available'
 a_s_fstab_mountpoint = 'Mount Point'
 a_s_fstab_device1 = 'The device file of the memory or partition (<abbr title="for example">e.g.</abbr> <code>/dev/sda1</code>)'
 a_s_fstab_fs1 = 'The filesystem that was used to format the memory (<abbr title="for example">e.g.</abbr> <samp><abbr title="Third Extended Filesystem">ext3</abbr></samp>)'
 a_s_fstab_swap1 = 'If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title="Random Access Memory">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title="Random Access Memory">RAM</abbr>.'
 a_s_flash_flashed = 'Firmware successfully flashed. Rebooting device...'
 a_s_flash_flasherr = 'Failed to flash'
-a_s_flash_fwimage = 'Firmwareimage'
+a_s_flash_fwimage = 'Firmware image'
 a_s_flash_received = 'Image received. About to start flashing process. DO NOT POWER OFF THE DEVICE!'
-a_s_flash_inprogress = 'Now writing firmware. Depending on your hardware this can take up to 20 minutes or more. Please check your device from time to time to see whether the writing process has completed.'
+a_s_flash_inprogress = 'Writing firmware...'
 a_s_flash_fwupgrade = 'Flash Firmware'
 a_s_flash_keepcfg = 'Keep configuration files'
 a_s_flash_notimplemented = 'Sorry, this function is not (yet) available for your platform.'
@@ -162,8 +162,15 @@ dhcp_dnsmasq_ednspacket_max = '<abbr title="maximal">max.</abbr> <abbr title="Ex
 dhcp_dnsmasq_dhcpleasemax = '<abbr title="maximal">max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Leases'
 dhcp_dnsmasq_addnhosts = 'additional hostfile'
 dhcp_dnsmasq_queryport = 'query port'
+dhcp_dnsmasq_enabletftp = 'Enable TFTP-Server'
+dhcp_dnsmasq_tftproot = 'TFTP-Server Root'
+dhcp_dnsmasq_dhcpboot = 'Network Boot Image'
 a_n_switch = 'Switch'
+a_n_conntrack = 'Active Connections'
+a_n_conntrack_desc = 'This page gives an overview over currently active network connections.'
 a_n_routes = 'Routes'
+a_n_routes4 = 'IPv4 Routes'
+a_n_routes6 = 'IPv6 Routes'
 a_network1 = 'In this area you find all network-related settings.'
 a_network2 = 'On most routers the network switch can be freely configured and splitted up into several <abbr title="Virtual Local Area Network">VLAN</abbr>s.'
 a_network3 = 'Interfaces and <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> / <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.'
@@ -190,15 +197,40 @@ dhcp_timeremain = 'Leasetime remaining'
 dhcp_leases_active = 'Active Leases'
 a_n_ptp = 'Point-to-Point Connections'
 a_n_ptp1 = 'Point-to-Point connections with <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> or <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr> are often used to connect a device over <abbr title="Digital Subscriber Line">DSL</abbr> or similar technologies to an internet access point.'
+network_interface_prereq = 'You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support'
+network_interface_prereq_mini = 'You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support'
 network_interface_server = '<abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Server'
 network_interface_demand = 'Automatic Disconnect'
 network_interface_demand_desc = 'Time (in seconds) after which an unused connection will be closed'
 network_interface_keepalive = 'Keep-Alive'
 network_interface_keepalive_desc = 'Number of failed connection tests to initiate automatic reconnect'
+network_interface_device = 'Modem device'
+network_interface_device_desc = 'The device node of your modem, e.g. /dev/ttyUSB0'
+network_interface_defaultroute = 'Replace default route'
+network_interface_defaultroute_desc = 'Let pppd replace the current default route to use the PPP interface after successful connect'
+network_interface_peerdns = 'Use peer DNS'
+network_interface_peerdns_desc = 'Configure the local DNS server to use the name servers adverticed by the PPP peer'
+network_interface_ipv6 = 'Enable IPv6 on PPP link'
+network_interface_connect = 'Connect script'
+network_interface_connect_desc = 'Let pppd run this script after establishing the PPP link'
+network_interface_disconnect = 'Disconnect script'
+network_interface_disconnect_desc = 'Let pppd run this script before tearing down the PPP link'
+network_interface_pppd_options = 'Additional pppd options'
+network_interface_pppd_options_desc = 'Specify additional command line arguments for pppd here'
+network_interface_apn = 'Access point (APN)'
+network_interface_pincode = 'PIN code'
+network_interface_pincode_desc = 'Make sure that you provide the correct pin code here or you might lock your sim card!'
+network_interface_service = 'Service type'
+network_interface_maxwait = 'Setup wait time'
+network_interface_maxwait_desc = 'Seconds to wait for the modem to become ready before attempting to connect'
 a_n_r_routes1 = 'Routes specify over which interface and gateway a certain host or network can be reached.'
 a_n_routes_static = 'Static Routes'
+a_n_routes_static4 = 'Static IPv4 Routes'
+a_n_routes_static6 = 'Static IPv6 Routes'
 a_n_routes_kernel4 = 'Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes'
-a_n_r_target1 = 'host-<abbr title="Internet Protocol Address">IP</abbr> or network'
+a_n_routes_kernel6 = 'Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes'
+a_n_r_target1 = 'Host-<abbr title="Internet Protocol Address">IP</abbr> or Network'
+a_n_r_target6 = '<abbr title="Internet Protocol Version 6">IPv6</abbr>-Address or Network (CIDR)'
 a_n_r_netmask1 = 'if target is a network'
 m_n_inet = 'Internet Connection'
 m_n_local = 'Local Network'