luci-0.11: merge outstanding trunk changes

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

diff --git a/po/no/base.po b/po/no/base.po
index e992280ae45f6c2bf9371715a7ba5abbfabd69f9..c606fb7f3e8b0e8bbfbe3f968e503503af332aa7 100644 (file)
--- a/po/no/base.po
+++ b/po/no/base.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "PO-Revision-Date: 2011-06-14 15:40+0200\n"
 "Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
@@ -242,6 +242,11 @@ msgstr "Tillat oppstrøms svar i 127.0.0.0/8 nettet, f.eks for RBL tjenester"
 msgid "Allowed range is 1 to 65535"
 msgstr ""
 
+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 "Et nytt nettverk vil bli opprettet hvis du tar bort haken."
 
@@ -724,15 +729,15 @@ msgstr ""
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Aktiver Jumbo Frames gjennomgang"
 
+msgid "Enable NTP client"
+msgstr ""
+
 msgid "Enable TFTP server"
 msgstr "Aktiver TFTP server"
 
 msgid "Enable VLAN functionality"
 msgstr "Aktiver VLAN funksjonalitet"
 
-msgid "Enable builtin NTP server"
-msgstr ""
-
 msgid "Enable learning and aging"
 msgstr "Aktiver 'læring' og 'aldring'"
 
@@ -851,6 +856,9 @@ msgstr ""
 msgid "Force"
 msgstr "Tving"
 
+msgid "Force 40MHz mode"
+msgstr ""
+
 msgid "Force CCMP (AES)"
 msgstr ""
 
@@ -1778,6 +1786,9 @@ msgstr ""
 msgid "Protocol support is not installed"
 msgstr ""
 
+msgid "Provide NTP server"
+msgstr ""
+
 msgid "Provide new network"
 msgstr "Lag nytt nettverk"
 
@@ -2664,9 +2675,6 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-msgid "Waiting for router..."
-msgstr "Venter på ruter..."
-
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -2846,6 +2854,9 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Tilbake"
 
+#~ msgid "Waiting for router..."
+#~ msgstr "Venter på ruter..."
+
 #~ msgid "Active Leases"
 #~ msgstr "Aktive Leier"