luci-0.11: merge outstanding trunk changes

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

diff --git a/po/ca/base.po b/po/ca/base.po
index 74c52effbec96a5e1c477cb1f5d62e65dd02a77f..16d494d0b9e4f9d10411145ccfbf2e7dbf8606c6 100644 (file)
--- a/po/ca/base.po
+++ b/po/ca/base.po
@@ -245,6 +245,11 @@ msgstr ""
 msgid "Allowed range is 1 to 65535"
 msgstr "El rang permès és entre 1 i 65535"
 
 msgid "Allowed range is 1 to 65535"
 msgstr "El rang permès és entre 1 i 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 "Es crearà una xarxa addicional si deixes això sense marcar."
 
 msgid "An additional network will be created if you leave this unchecked."
 msgstr "Es crearà una xarxa addicional si deixes això sense marcar."
 


@@ -841,6 +846,9 @@ msgstr ""
 msgid "Force"
 msgstr "Força"
 
 msgid "Force"
 msgstr "Força"
 

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

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


@@ -2631,9 +2639,6 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
 msgid "Waiting for command to complete..."
 msgstr ""
 

-msgid "Waiting for router..."
-msgstr "Esperant un encaminador..."
-

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


@@ -2815,6 +2820,9 @@ msgstr "Sí"
 msgid "« Back"
 msgstr "« Endarrere"
 
 msgid "« Back"
 msgstr "« Endarrere"
 

+#~ msgid "Waiting for router..."
+#~ msgstr "Esperant un encaminador..."
+

 #~ msgid "Active Leases"
 #~ msgstr "Leases Actius"
 
 #~ msgid "Active Leases"
 #~ msgstr "Leases Actius"