luci-0.10: merge trunk

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

diff --git a/po/en/base.po b/po/en/base.po
index 430c3c6..4b8f65e 100644 (file)
--- a/po/en/base.po
+++ b/po/en/base.po
@@ -997,9 +997,6 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
-msgid "IPv4 Firewall"
-msgstr ""
-
 msgid "IPv4 WAN Status"
 msgstr ""
 
@@ -1009,9 +1006,6 @@ msgstr ""
 msgid "IPv6"
 msgstr "IPv6"
 
-msgid "IPv6 Firewall"
-msgstr ""
-
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1125,9 +1119,6 @@ msgstr ""
 msgid "Java Script required!"
 msgstr ""
 
-msgid "Join Network"
-msgstr "Join Network"
-
 msgid "Join Network: Settings"
 msgstr ""
 
@@ -1397,12 +1388,6 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Mounted file systems"
 
-msgid "Move down"
-msgstr ""
-
-msgid "Move up"
-msgstr ""
-
 msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
@@ -1881,9 +1866,6 @@ msgstr "Save"
 msgid "Save & Apply"
 msgstr "Save & Apply"
 
-msgid "Save & Apply"
-msgstr ""
-
 msgid "Scan"
 msgstr "Scan"
 
@@ -1968,9 +1950,6 @@ msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
-msgid "Sort"
-msgstr ""
-
 msgid "Source"
 msgstr "Source"
 
@@ -2028,9 +2007,6 @@ msgstr "Stop"
 msgid "Strict order"
 msgstr "Strict order"
 
-msgid "Submit"
-msgstr "Submit"
-
 msgid "Swap Entry"
 msgstr ""
 
@@ -2728,6 +2704,9 @@ msgstr "« Back"
 #~ msgid "Join (Client)"
 #~ msgstr "Join (Client)"
 
+#~ msgid "Join Network"
+#~ msgstr "Join Network"
+
 #~ msgid "Leases"
 #~ msgstr "Leases"
 
@@ -2929,5 +2908,8 @@ msgstr "« Back"
 #~ msgid "Statistics"
 #~ msgstr "Statistics"
 
+#~ msgid "Submit"
+#~ msgstr "Submit"
+
 #~ msgid "zone"
 #~ msgstr "Zone"