luci-0.11: merge outstanding trunk changes

[project/luci.git] / po / en / base.po

diff --git a/po/en/base.po b/po/en/base.po
index e62fac9dd5f8bfcb1f370427f8316b5ce50a9cfd..5ce5b5de2cbee1649c78befc01efe2dfddc67dae 100644 (file)
--- a/po/en/base.po
+++ b/po/en/base.po
@@ -105,10 +105,10 @@ msgstr ""
 
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
-"Domain Name System\">EDNS0</abbr> paket size"
+"Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
-"Domain Name System\">EDNS0</abbr> paket size"
+"Domain Name System\">EDNS0</abbr> packet size"
 
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
@@ -173,8 +173,11 @@ msgstr "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgid "Active Connections"
 msgstr "Active Connections"
 
-msgid "Active Leases"
-msgstr "Active Leases"
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
 
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
@@ -241,6 +244,11 @@ msgstr ""
 msgid "Allowed range is 1 to 65535"
 msgstr "Allowed range is 1 to 65535"
 
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
 msgid "An additional network will be created if you leave this unchecked."
 msgstr "An additional network will be created if you leave this unchecked."
 
@@ -250,6 +258,9 @@ msgstr "Antenna 1"
 msgid "Antenna 2"
 msgstr "Antenna 2"
 
+msgid "Antenna Configuration"
+msgstr ""
+
 msgid "Any zone"
 msgstr "Any zone"
 
@@ -529,12 +540,18 @@ msgstr "DHCP client"
 msgid "DHCP-Options"
 msgstr "DHCP-Options"
 
+msgid "DHCPv6 Leases"
+msgstr ""
+
 msgid "DNS"
 msgstr "DNS"
 
 msgid "DNS forwardings"
 msgstr "DNS forwardings"
 
+msgid "DUID"
+msgstr ""
+
 msgid "Debug"
 msgstr "Debug"
 
@@ -715,13 +732,13 @@ msgstr ""
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-msgid "Enable TFTP server"
+msgid "Enable NTP client"
 msgstr ""
 
-msgid "Enable VLAN functionality"
+msgid "Enable TFTP server"
 msgstr ""
 
-msgid "Enable builtin NTP server"
+msgid "Enable VLAN functionality"
 msgstr ""
 
 msgid "Enable learning and aging"
@@ -842,6 +859,9 @@ msgstr ""
 msgid "Force"
 msgstr "Force"
 
+msgid "Force 40MHz mode"
+msgstr ""
+
 msgid "Force CCMP (AES)"
 msgstr ""
 
@@ -881,6 +901,9 @@ msgstr "Frequency Hopping"
 msgid "GHz"
 msgstr ""
 
+msgid "GPRS only"
+msgstr ""
+
 msgid "Gateway"
 msgstr ""
 
@@ -1022,6 +1045,9 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
+msgid "IPv6-Address"
+msgstr ""
+
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
@@ -1717,6 +1743,9 @@ msgstr ""
 msgid "Port %d is untagged in multiple VLANs!"
 msgstr ""
 
+msgid "Port status:"
+msgstr ""
+
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -1749,6 +1778,9 @@ msgstr ""
 msgid "Protocol support is not installed"
 msgstr ""
 
+msgid "Provide NTP server"
+msgstr ""
+
 msgid "Provide new network"
 msgstr ""
 
@@ -2449,6 +2481,9 @@ msgstr "Type"
 msgid "UDP:"
 msgstr ""
 
+msgid "UMTS only"
+msgstr ""
+
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
@@ -2607,9 +2642,6 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-msgid "Waiting for router..."
-msgstr ""
-
 msgid "Warning"
 msgstr ""
 
@@ -2677,6 +2709,9 @@ msgstr ""
 msgid "auto"
 msgstr "auto"
 
+msgid "baseT"
+msgstr ""
+
 msgid "bridged"
 msgstr ""
 
@@ -2708,6 +2743,12 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
 msgid "help"
 msgstr "help"
 
@@ -2735,6 +2776,9 @@ msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgid "no"
 msgstr ""
 
+msgid "no link"
+msgstr ""
+
 msgid "none"
 msgstr "none"
 
@@ -2774,6 +2818,9 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"
 
+#~ msgid "Active Leases"
+#~ msgstr "Active Leases"
+
 #~ msgid "Bit Rate"
 #~ msgstr "Bit Rate"
 
@@ -3334,10 +3381,10 @@ msgstr "« Back"
 
 #~ msgid ""
 #~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
-#~ "for Domain Name System\">EDNS0</abbr> paket size"
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
 #~ msgstr ""
 #~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
-#~ "for Domain Name System\">EDNS0</abbr> paket size"
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
 
 #~ msgid "AP-Isolation"
 #~ msgstr "AP-Isolation"