From 0cc6ff05f81bea1f25022c90fb739336feef7bbf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 16 Dec 2017 20:45:26 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     |  1 +
 src/main/res/values-de/strings.xml     |  3 ++-
 src/main/res/values-it/strings.xml     |  4 ++++
 src/main/res/values-nb-rNO/strings.xml | 21 +++++++++++++++++++++
 src/main/res/values-nl/strings.xml     |  1 +
 src/main/res/values-ro-rRO/strings.xml |  1 +
 6 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 7f7cbfca9..eae77fb04 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Споделяне в разговора</string>
   <string name="title_activity_start_conversation">Започване на разговор</string>
   <string name="title_activity_choose_contact">Изберете контакт</string>
+  <string name="title_activity_share_via_account">Споделяне чрез профил</string>
   <string name="title_activity_block_list">Списък с блокирани</string>
   <string name="just_now">току-що</string>
   <string name="minute_ago">преди 1 минута</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e3edd2699..7a1fa24b6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Mit Unterhaltung teilen</string>
   <string name="title_activity_start_conversation">Unterhaltung beginnen</string>
   <string name="title_activity_choose_contact">Kontakt auswählen</string>
+  <string name="title_activity_share_via_account">Teilen über Konto</string>
   <string name="title_activity_block_list">Sperrliste</string>
   <string name="just_now">gerade</string>
   <string name="minute_ago">vor einer Minute</string>
@@ -63,7 +64,7 @@
   <string name="send_never">Nie mehr nachfragen</string>
   <string name="problem_connecting_to_account">Es gibt Probleme beim Verbindungsaufbau mit einem Konto</string>
   <string name="problem_connecting_to_accounts">Es gibt Probleme beim Verbindungsaufbau mit mehreren Konten</string>
-  <string name="touch_to_fix">Hier antippen, um Ihre Konten zu verwalten</string>
+  <string name="touch_to_fix">Hier antippen, um deine Konten zu verwalten</string>
   <string name="attach_file">Datei anfügen</string>
   <string name="not_in_roster">Der Kontakt ist nicht in deiner Kontaktliste. Möchtest du ihn hinzufügen?</string>
   <string name="add_contact">Kontakt hinzufügen</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index d584716f4..861b038dc 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Condividi con Conversation</string>
   <string name="title_activity_start_conversation">Inizia una conversazione</string>
   <string name="title_activity_choose_contact">Scegli un contatto</string>
+  <string name="title_activity_share_via_account">Condividi via account</string>
   <string name="title_activity_block_list">Lista nera</string>
   <string name="just_now">adesso</string>
   <string name="minute_ago">1 min fa</string>
@@ -29,6 +30,7 @@
   <string name="message_decrypting">Decifrazione messaggio. Attendere prego...</string>
   <string name="pgp_message">Messaggio cifrato con OpenPGP</string>
   <string name="nick_in_use">Nome utente già in uso</string>
+  <string name="invalid_muc_nick">Nickname non valido</string>
   <string name="admin">Amministratore</string>
   <string name="owner">Proprietario</string>
   <string name="moderator">Moderatore</string>
@@ -244,6 +246,8 @@
   <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
   <string name="add_back">Aggiungi anche tu</string>
   <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string>
+  <string name="contacts_have_read_up_to_this_point">%s ha letto fino a questo punto</string>
+  <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d altri hanno letto fino a questo punto</string>
   <string name="publish">Pubblica</string>
   <string name="touch_to_choose_picture">Tocca l’avatar per selezionare l’immagine dalla galleria</string>
   <string name="publishing">Pubblicazione…</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index e5222adf0..6b4dc1a78 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -5,6 +5,7 @@
   <string name="action_accounts">Kontobehandling</string>
   <string name="action_end_conversation">Avslutt denne samtalen</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
+  <string name="action_muc_details">Gruppesludringsdetaljer</string>
   <string name="action_secure">Sikret samtale</string>
   <string name="action_add_account">Legg til samtale</string>
   <string name="action_edit_contact">Rediger navn</string>
@@ -18,6 +19,8 @@
   <string name="title_activity_settings">Innstillinger</string>
   <string name="title_activity_sharewith">Del med Conversation</string>
   <string name="title_activity_start_conversation">Start samtale</string>
+  <string name="title_activity_choose_contact">Velg kontakt</string>
+  <string name="title_activity_share_via_account">Del via konto</string>
   <string name="title_activity_block_list">Blokkeringsliste</string>
   <string name="just_now">akkurat nå</string>
   <string name="minute_ago">1 minutt siden</string>
@@ -27,6 +30,7 @@
   <string name="message_decrypting">Dekrypterer melding mens du venter.</string>
   <string name="pgp_message">OpenPGP-kryptert melding</string>
   <string name="nick_in_use">Kallenavn allerede i bruk</string>
+  <string name="invalid_muc_nick">Ugyldig kallenavn</string>
   <string name="admin">Admin</string>
   <string name="owner">Eier</string>
   <string name="moderator">Moderator</string>
@@ -42,6 +46,8 @@
   <string name="register_account">Registrer ny konto på tjeneren</string>
   <string name="change_password_on_server">Endre passord på tjeneren</string>
   <string name="share_with">Del med...</string>
+  <string name="start_conversation">Start samtale</string>
+  <string name="invite_contact">Inviter kontakt</string>
   <string name="contacts">Kontakter</string>
   <string name="cancel">Avbryt</string>
   <string name="set">Sett</string>
@@ -213,8 +219,14 @@
   <string name="done">Ferdig</string>
   <string name="verify">Bekreft</string>
   <string name="decrypt">Dekrypter</string>
+  <string name="conferences">Gruppesludringer</string>
   <string name="search">Søk</string>
+  <string name="create_contact">Opprett kontakt</string>
+  <string name="dialog_title_create_contact">Opprett kontakt</string>
   <string name="enter_contact">Angi kontakt</string>
+  <string name="join_conference">Ta del i gruppesludring</string>
+  <string name="dialog_title_join_conference">Ta del i gruppesludring</string>
+  <string name="delete_contact">Slett kontakt</string>
   <string name="view_contact_details">Vis kontaktdetaljer</string>
   <string name="block_contact">Blokker kontakt</string>
   <string name="unblock_contact">Avblokker kontakt</string>
@@ -222,10 +234,14 @@
   <string name="select">Velg</string>
   <string name="contact_already_exists">Kontakten finnes allerede</string>
   <string name="join">Ta del i</string>
+  <string name="conference_address">Gruppesludringsadresse</string>
   <string name="conference_address_example">rom@konferanse.eksempel.no/kallenavn</string>
   <string name="save_as_bookmark">Lagre som bokmerke</string>
   <string name="delete_bookmark">Slett bokmerke</string>
   <string name="bookmark_already_exists">Dette bokmerket finnes allerede</string>
+  <string name="action_edit_subject">Endre gruppesludringsemne</string>
+  <string name="edit_subject_hint">Emnet for denne gruppesludringen</string>
+  <string name="joining_conference">Tar del i gruppesludring…</string>
   <string name="leave">Forlat</string>
   <string name="contact_added_you">Kontakt la deg til i sin liste</string>
   <string name="add_back">Gjengjeld tjenesten</string>
@@ -275,6 +291,7 @@
   <string name="pref_use_indicate_received_summary">Mottatte meldinger vil bli avmerket i grønt hvis støttet</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Fargelegg send-knapp for å indikere kontakt-status</string>
   <string name="pref_expert_options_other">Annet</string>
+  <string name="pref_conference_name">Gruppesludringsnavn</string>
   <string name="toast_message_otr_fingerprint">OTR-fingeravtrykk kopiert til utklippstavle!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-fingeravtrykk kopiert til utklippstavle!</string>
   <string name="using_account">bruker konto %s</string>
@@ -542,8 +559,12 @@
   <string name="show_password">Vis passord</string>
   <string name="registration_please_wait">Registrering mislyktes: Prøv igjen senere</string>
   <string name="registration_password_too_weak">Registrering mislyktes: Passordet er for svakt</string>
+  <string name="create_conference">Opprett gruppesludring</string>
+  <string name="dialog_title_create_conference">Opprett gruppesludring</string>
+  <string name="join_or_create_conference">Ta del i eller opprett gruppesludring</string>
   <string name="conference_subject">Tema</string>
   <string name="choose_participants">Velg deltagere</string>
+  <string name="creating_conference">Opprett gruppesludring…</string>
   <string name="invite_again">Inviter igjen</string>
   <string name="gp_short">Kort</string>
   <string name="gp_medium">Middels</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 4687f33fe..6eeb3f9c2 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Delen in gesprek</string>
   <string name="title_activity_start_conversation">Gesprek starten</string>
   <string name="title_activity_choose_contact">Contact kiezen</string>
+  <string name="title_activity_share_via_account">Delen via account</string>
   <string name="title_activity_block_list">Geblokkeerde contacten</string>
   <string name="just_now">zojuist</string>
   <string name="minute_ago">1 min. geleden</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 39df89f97..c4066faee 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -20,6 +20,7 @@
   <string name="title_activity_sharewith">Distribuie către Conversations</string>
   <string name="title_activity_start_conversation">Pornește o conversație</string>
   <string name="title_activity_choose_contact">Alege contact</string>
+  <string name="title_activity_share_via_account">Partajează cu cont</string>
   <string name="title_activity_block_list">Listă contacte blocate</string>
   <string name="just_now">în acest moment</string>
   <string name="minute_ago">acum un minut</string>