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 cb987995e4a371b323e25cd4d345043969eb6a22..5ce5b5de2cbee1649c78befc01efe2dfddc67dae 100644 (file)
--- a/po/en/base.po
+++ b/po/en/base.po
@@ -244,6 +244,11 @@ msgstr ""
 msgid "Allowed range is 1 to 65535"
 msgstr "Allowed range is 1 to 65535"
 
 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."
 
 msgid "An additional network will be created if you leave this unchecked."
 msgstr "An additional network will be created if you leave this unchecked."
 


@@ -854,6 +859,9 @@ msgstr ""
 msgid "Force"
 msgstr "Force"
 
 msgid "Force"
 msgstr "Force"
 

+msgid "Force 40MHz mode"
+msgstr ""
+

 msgid "Force CCMP (AES)"
 msgstr ""
 
 msgid "Force CCMP (AES)"
 msgstr ""
 


@@ -2634,9 +2642,6 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
 msgid "Waiting for command to complete..."
 msgstr ""
 

-msgid "Waiting for router..."
-msgstr ""
-

 msgid "Warning"
 msgstr ""
 
 msgid "Warning"
 msgstr ""