Merge branch 'develop' into release-1.5.4

[pub/Android/ownCloud.git] / res / values-nb-rNO / strings.xml

diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index f7c70fd..471b431 100644 (file)
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -10,7 +10,6 @@
   <string name="prefs_accounts">Kontoer</string>
   <string name="prefs_instant_upload_summary">Last opp bilder tatt med kamera øyeblikkelig</string>
   <string name="prefs_help">Hjelp</string>
   <string name="prefs_accounts">Kontoer</string>
   <string name="prefs_instant_upload_summary">Last opp bilder tatt med kamera øyeblikkelig</string>
   <string name="prefs_help">Hjelp</string>

-  <string name="auth_host_url">Server-adresse</string>

   <string name="auth_username">Brukernavn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>
   <string name="auth_username">Brukernavn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>


@@ -36,6 +35,7 @@
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Lagre og avslutt</string>
   <string name="common_error">Feil</string>
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Lagre og avslutt</string>
   <string name="common_error">Feil</string>

+  <string name="common_error_unknown">Ukjent feil</string>

   <string name="about_title">Om</string>
   <string name="change_password">Endre passord</string>
   <string name="delete_account">Slett konto</string>
   <string name="about_title">Om</string>
   <string name="change_password">Endre passord</string>
   <string name="delete_account">Slett konto</string>