aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-nb-rNO/strings.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-23 13:17:45 +0100
committerlookshe <github@lookshe.org>2016-03-23 13:17:45 +0100
commitf3bebf59278f835ba928a498e76b76f7f65ee95a (patch)
tree9ea9731e67e39ae601d8e3805d9193533f8159f1 /src/main/res/values-nb-rNO/strings.xml
parent4085f2a80e00e24a73206389cb1e8f30385e9952 (diff)
parent977ffc5f483e955857da1d56ce0a1c857d471175 (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values-nb-rNO/strings.xml')
-rw-r--r--src/main/res/values-nb-rNO/strings.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 623013e1..bfa58aae 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -101,6 +101,7 @@
<string name="pref_xmpp_resource_summary">Navnet denne klienten identifiserer seg med</string>
<string name="pref_accept_files">Godta filer</string>
<string name="pref_accept_files_summary">Automatisk godkjenning av filer mindre enn...</string>
+ <string name="pref_accept_files_size_summary">Automatisk godkjenning av filer mindre enn...</string>
<string name="pref_notification_settings">Varslingsinnstillinger</string>
<string name="pref_notifications">Varslinger</string>
<string name="pref_notifications_summary">Varsle når en ny melding ankommer</string>
@@ -272,7 +273,6 @@
<string name="sure_delete_fingerprint">Bekreft fjerning av fingeravtrykk.</string>
<string name="ignore">Ignorer</string>
<string name="without_mutual_presence_updates"><b>Advarsel:</b> Å sende dette uten at tilstandsoppdateringer er i overenstemmelse kan forårsake uventede problemer.\n\n<small>Gå til kontaktdetaljer for å bekrefte dine tilstedeværelsesabonnementer.</small></string>
- <string name="pref_encryption_settings">Krypteringsinnstillinger</string>
<string name="pref_force_encryption">Krev ende-til-ende-kryptering</string>
<string name="pref_force_encryption_summary">Alltid send meldinger kryptert (bortsett fra konferanser)</string>
<string name="pref_dont_save_encrypted">Ikke lagre krypterte meldinger</string>
@@ -477,11 +477,14 @@
<string name="recently_used">Senest brukt</string>
<string name="choose_quick_action">Velg hurtighendelse</string>
<string name="search_for_contacts_or_groups">Søk etter kontakter eller grupper</string>
+ <!--%s = bare jid, %d = count of online resources-->
+ <string name="dlg_msg_details_msg_status_failed">Feilet</string>
<string name="send_private_message">Send privat melding</string>
<string name="user_has_left_conference">%s har forlatt konferansen!</string>
<string name="username">Brukernavn</string>
<string name="username_hint">Brukernavn</string>
<string name="invalid_username">Dette er ikke et gyldig brukernavn</string>
+ <string name="conference_name">Konferanse-rom</string>
<string name="download_failed_server_not_found">Nedlasting feilet: Fant ikke tjener</string>
<string name="download_failed_file_not_found">Nedlasting feilet: Fant ikke fila</string>
<string name="download_failed_could_not_connect">Nedlasting feilet: Kunne ikke koble til tjeneren</string>