Import translations. DO NOT MERGE

Change-Id: I784ea3784067393b951c50a50938b9140a36f236

2 files changed, 19 insertions, 16 deletions

diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 9885db0..4f699a5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Kobler fra ..."</item>
     <item msgid="1634960474403853625">"Frakoblet"</item>
     <item msgid="746097431216080650">"Mislyktes"</item>
+    <item msgid="6367044185730295334">"Blokkert"</item>
+    <item msgid="503942654197908005">"Unngår dårlig tilkobling midlertidig"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Kobler fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
     <item msgid="197508606402264311">"Frakoblet"</item>
     <item msgid="8578370891960825148">"Mislyktes"</item>
+    <item msgid="5660739516542454527">"Blokkert"</item>
+    <item msgid="1805837518286731242">"Unngår dårlig tilkobling midlertidig"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -110,11 +114,7 @@
     <!-- 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) -->
-  <string-array name="wifi_eap_method">
-    <item msgid="1160193392455075561">"PEAP"</item>
-    <item msgid="7981731051382306293">"TLS"</item>
-    <item msgid="2892994535305020162">"TTLS"</item>
-  </string-array>
+    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykk på knappen"</item>
     <item msgid="1624323946324499595">"Personlig kode fra motpart"</item>
@@ -159,11 +159,7 @@
     <item msgid="3703676222230317933">"Start telling"</item>
     <item msgid="2502754479975776899">"Navn på app"</item>
   </string-array>
-  <string-array name="wifi_eap_entries">
-    <item msgid="8615575908717909498">"PEAP"</item>
-    <item msgid="8667872640594311615">"TLS"</item>
-    <item msgid="7182812872984827322">"TTLS"</item>
-  </string-array>
+    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3384695..2539fc0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -547,8 +547,14 @@
     <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_forget" msgid="8168174695608386644">"Slett"</string>
+    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
+    <skip />
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
+    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
+    <skip />
     <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>
@@ -1442,7 +1448,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Skriv inn passordet for å dekryptere lagring"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv på nytt."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Tjenesten er opptatt. Prøv på nytt."</string>
     <string name="delete" msgid="4219243412325163003">"Slett"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1558,12 +1563,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Lagre"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Koble til"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"Rediger VPN-nettverk"</string>
-    <string name="vpn_connect_to" msgid="7328758950427515753">"Koble til <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Rediger VPN-profil"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Koble til <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"Legg til VPN-nettverk"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger nettverk"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slett nettverk"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Legg til VPN-profil"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Slett profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Finner ingen nettverkstilkobling. Prøv på nytt senere."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Et sertifikat mangler. Rediger profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Bruker"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiver"</string>