Import translations. DO NOT MERGE

Change-Id: Ica141533e5f8c8791b55304152524e4c26fc673b

2 files changed, 44 insertions, 22 deletions

diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 4f699a5..93a8596 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"Passord"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykk på knappen"</item>
     <item msgid="1624323946324499595">"Personlig kode fra motpart"</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Start telling"</item>
     <item msgid="2502754479975776899">"Navn på app"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"Passord"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -167,12 +177,6 @@
     <item msgid="5923246669412752932">"MSCHAP2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-  <string-array name="wifi_network_setup">
-    <item msgid="3318069057130819160">"Av"</item>
-    <item msgid="3564693183575724416">"Knapp for autokonfig."</item>
-    <item msgid="7468724146672456026">"Pers. kode fra tilg.punkt"</item>
-    <item msgid="7364462169350112617">"Pers. kode fra enheten"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisk"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2539fc0..d10312f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -504,6 +504,10 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
+    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
@@ -511,12 +515,30 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Skriv inn personlig kode fra tilgangspunktet"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-konfigurasjon"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Skriv inn personlig kode <xliff:g id="WPS_PIN">%1$s</xliff:g> i tilgangspunktet"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS pågår allerede, og kan ta noen titalls sekunder å fullføre"</string>
-    <string name="wifi_wps_failed" msgid="1034868466481449492">"Kunne ikke starte WPS. Prøv på nytt."</string>
+    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
+    <skip />
+    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
+    <skip />
+    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
+    <skip />
+    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
+    <skip />
+    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
+    <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID for nettverket"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
@@ -541,22 +563,18 @@
     <string name="wifi_disabled_help" msgid="5416325603334140666">"Nettverket ble unngått på grunn av dårlig forbindelse. Slå av denne funksjonen under Innstillinger &gt; Wi-Fi, under menyvalget Avansert."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
-    <string name="wifi_wps_available_first_item" msgid="3538912605343585226">"Beskyttet nettverk tilgjengelig"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (beskyttet nettverk tilgjengelig)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kunne ikke slette nettverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"En annen beskyttet Wi-Fi økt ble oppdaget. Prøv på nytt om noen minutter."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansert Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angi operasjonens frekvensområde"</string>