From a018935b2337f885324d36acb36b2d2a58beb037 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 8 Jun 2016 20:17:10 +0200
Subject: pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     |  3 +-
 src/main/res/values-ca/strings.xml     |  2 --
 src/main/res/values-cs/strings.xml     |  3 +-
 src/main/res/values-de/strings.xml     |  9 +++---
 src/main/res/values-el/strings.xml     |  2 --
 src/main/res/values-es/strings.xml     | 15 +++++-----
 src/main/res/values-eu/strings.xml     | 17 +++++++++--
 src/main/res/values-fr/strings.xml     | 11 +++++--
 src/main/res/values-gl/strings.xml     |  2 --
 src/main/res/values-id/strings.xml     |  2 --
 src/main/res/values-it/strings.xml     | 52 ++++++++++++++++++++++++++++++++--
 src/main/res/values-iw/strings.xml     |  2 --
 src/main/res/values-ja/strings.xml     |  3 +-
 src/main/res/values-ko/strings.xml     |  2 --
 src/main/res/values-nb-rNO/strings.xml |  2 --
 src/main/res/values-nl/strings.xml     |  3 +-
 src/main/res/values-pl/strings.xml     |  2 --
 src/main/res/values-pt-rBR/strings.xml |  2 --
 src/main/res/values-pt/strings.xml     |  2 --
 src/main/res/values-ro-rRO/strings.xml |  3 +-
 src/main/res/values-ru/strings.xml     |  2 --
 src/main/res/values-sk/strings.xml     |  2 --
 src/main/res/values-sr/strings.xml     |  5 ++--
 src/main/res/values-sv/strings.xml     |  2 --
 src/main/res/values-tr-rTR/strings.xml |  3 +-
 src/main/res/values-vi/strings.xml     |  2 --
 src/main/res/values-zh-rCN/strings.xml |  2 --
 src/main/res/values-zh-rTW/strings.xml |  2 --
 28 files changed, 93 insertions(+), 66 deletions(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index be5b0116..faef03e2 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Мигане на индикаторния светодиод при получаване на ново съобщение</string>
   <string name="pref_sound">Тон на звънене</string>
   <string name="pref_sound_summary">Изпълнение на звук при получаване на ново съобщение</string>
-  <string name="pref_notification_grace_period">Продължителност на отсрочване на известията</string>
-  <string name="pref_notification_grace_period_summary">Изключва известията за кратко, след като бъде получено копие на съобщение</string>
   <string name="pref_advanced_options">Разширени</string>
   <string name="pref_never_send_crash">Никога да не се изпращат доклади за сривове</string>
   <string name="pref_never_send_crash_summary">Изпращайки проследявания на стека, Вие помагате за непрекъснатото развитие на Conversations</string>
@@ -615,4 +613,5 @@
   <string name="conference_subject">Тема</string>
   <string name="choose_participants">Изберете участниците</string>
   <string name="creating_conference">Създаване на беседа…</string>
+  <string name="invite_again">Канене отново</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 57787843..ac515d9e 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -96,8 +96,6 @@
   <string name="pref_notifications">Notificacions</string>
   <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
   <string name="pref_vibrate">Vibra</string>
-  <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
-  <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
   <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
   <string name="pref_never_send_crash_summary">Enviant traces d\'execució d\'ajudes al futur desenvolupament del Conversations.</string>
   <string name="pref_confirm_messages">Confirmant missatges</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 27ffea6a..0812afda 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Blikat při přijetí nové zprávy</string>
   <string name="pref_sound">Tón upozornění</string>
   <string name="pref_sound_summary">Přehrát zvuk při přijetí nové zprávy</string>
-  <string name="pref_notification_grace_period">Četnost upozornění</string>
-  <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
   <string name="pref_advanced_options">Rozšířené</string>
   <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
   <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
@@ -618,4 +616,5 @@
   <string name="conference_subject">Předmět</string>
   <string name="choose_participants">Vybrat účastníky</string>
   <string name="creating_conference">Vytváření konference...</string>
+  <string name="invite_again">Pozvat znovu</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 335c09fb..5cb467b7 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Blinke bei Erhalt einer neuen Nachricht</string>
   <string name="pref_sound">Benachrichtigungston</string>
   <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
-  <string name="pref_notification_grace_period">Gnadenfrist</string>
-  <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
   <string name="pref_advanced_options">Erweitert</string>
   <string name="pref_never_send_crash">Niemals Absturzberichte senden</string>
   <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
@@ -250,7 +248,7 @@
   <string name="you">Du</string>
   <string name="action_edit_subject">Thema dieser Konferenz bearbeiten</string>
   <string name="edit_subject_hint">Thema dieser Konferenz</string>
-  <string name="joining_conference">Konferenz wird betreten…</string>
+  <string name="joining_conference">Konferenz wird beigetreten…</string>
   <string name="leave">Verlassen</string>
   <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
   <string name="add_back">Auch hinzufügen</string>
@@ -591,7 +589,7 @@
   <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string>
   <string name="share_uri_with">Teile URI mit…</string>
   <string name="welcome_text">XMPP ist ein providerunabhängiges Protokoll. Du kannst diesen Klienten mit einem beliebigen XMPP-Server deiner Wahl nutzen.\nWir haben jedoch eine einfache Möglichkeit geschaffen, ein Konto auf conversations.im zu erstellen; ein Provider, der speziell für den Einsatz mit Conversations geeignet ist.</string>
-  <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.\nWenn du conversations.im als Anbieter wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string>
+  <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string>
   <string name="your_full_jid_will_be">Deine vollständige Jabber ID lautet: %s</string>
   <string name="create_account">Konto erstellen</string>
   <string name="use_own_provider">Nutze eigenen Provider</string>
@@ -611,8 +609,9 @@
   <string name="show_password">Passwort anzeigen</string>
   <string name="registration_please_wait">Fehlgeschlagen: Bitte später versuchen.</string>
   <string name="create_conference">Konferenz erstellen</string>
-  <string name="join_or_create_conference">Konferenz betreten oder erstellen</string>
+  <string name="join_or_create_conference">Konferenz beitreten oder erstellen</string>
   <string name="conference_subject">Thema</string>
   <string name="choose_participants">Mitglieder wählen</string>
   <string name="creating_conference">Erstelle Konferenz…</string>
+  <string name="invite_again">Erneut einladen</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index ad22c451..6377ac12 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -96,8 +96,6 @@
   <string name="pref_notifications">Ειδοποιήσεις</string>
   <string name="pref_notifications_summary">Ειδοποίηση όταν λαμβάνεται ένα νέο μήνυμα</string>
   <string name="pref_vibrate">Δόνηση</string>
-  <string name="pref_notification_grace_period">Περίοδος χάριτος ειδοποιήσεων</string>
-  <string name="pref_notification_grace_period_summary">Απενεργοποίηση ειδοποιήσεων για λίγο χρόνο μετά από τη λήψη ακριβούς αντιγράφου</string>
   <string name="pref_never_send_crash">Να μην αποστέλλονται αναφορές λαθών</string>
   <string name="pref_never_send_crash_summary">Στέλνοντας ίχνη στοίβας βοηθάτε την συνεχόμενη ανάπτυξη του Conversations</string>
   <string name="pref_confirm_messages">Επιβεβαίωση μηνυμάτων</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 70ac3633..6f6c6dab 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -47,7 +47,7 @@
   <string name="change_password_on_server">Cambiar contraseña en servidor</string>
   <string name="share_with">Compartir con...</string>
   <string name="start_conversation">Comenzar conversación</string>
-  <string name="invite_contact">Invitar contacto</string>
+  <string name="invite_contact">Invitar a contacto</string>
   <string name="contacts">Contactos</string>
   <string name="cancel">Cancelar</string>
   <string name="set">Establecer</string>
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">La luz parpadea cuando llega un nuevo mensaje</string>
   <string name="pref_sound">Tono</string>
   <string name="pref_sound_summary">Reproduce tono con la notificación</string>
-  <string name="pref_notification_grace_period">Notificaciones Carbons</string>
-  <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
   <string name="pref_advanced_options">Avanzado</string>
   <string name="pref_never_send_crash">Nunca informar de errores</string>
   <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
@@ -229,11 +227,11 @@
   <string name="done">Hecho</string>
   <string name="verify">Verificar</string>
   <string name="decrypt">Descifrar</string>
-  <string name="conferences">Conversación Grupo</string>
+  <string name="conferences">Conversaciones en grupo</string>
   <string name="search">Buscar</string>
   <string name="create_contact">Crear Contacto</string>
   <string name="enter_contact">Introducir contacto</string>
-  <string name="join_conference">Unirse a Conversación en grupo</string>
+  <string name="join_conference">Unirse a conversación en grupo</string>
   <string name="delete_contact">Eliminar Contacto</string>
   <string name="view_contact_details">Ver detalles del contacto</string>
   <string name="block_contact">Bloquear contacto</string>
@@ -308,7 +306,7 @@
   <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
   <string name="pref_expert_options_other">Otros</string>
-  <string name="pref_conference_name">Nombre conversación grupo</string>
+  <string name="pref_conference_name">Nombre en conversaciones en grupo</string>
   <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string>
   <string name="pref_autojoin">Unirse a conversaciones en grupo automáticamente</string>
   <string name="pref_autojoin_summary">Respetar la opción de unirse automáticamente de los marcadores de las conversaciones en grupo</string>
@@ -378,7 +376,7 @@
   <string name="pref_show_dynamic_tags">Mostrar etiquetas</string>
   <string name="pref_show_dynamic_tags_summary">Mostrar información en forma de etiquetas debajo de los contactos</string>
   <string name="enable_notifications">Habilitar notificaciones</string>
-  <string name="conference_with">Crear conversación en grupo</string>
+  <string name="conference_with">Crear conversación en grupo con...</string>
   <string name="no_conference_server_found">No se ha encontrado el servidor para crear la conversación</string>
   <string name="conference_creation_failed">¡La creación de la conversación ha fallado!</string>
   <string name="secret_accepted">¡Secreto aceptado!</string>
@@ -421,7 +419,7 @@
   <string name="member">Miembro</string>
   <string name="advanced_mode">Modo avanzado</string>
   <string name="grant_membership">Convertir en miembro</string>
-  <string name="remove_membership">Revocar membresía</string>
+  <string name="remove_membership">Revocar privilegios de miembro</string>
   <string name="grant_admin_privileges">Conceder privilegios de administrador</string>
   <string name="remove_admin_privileges">Revocar privilegios de administrador</string>
   <string name="remove_from_room">Expulsar de la conversación</string>
@@ -615,4 +613,5 @@
   <string name="conference_subject">Asunto</string>
   <string name="choose_participants">Elige a los participantes</string>
   <string name="creating_conference">Creando conversación...</string>
+  <string name="invite_again">Invitar de nuevo</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 1e2ad86a..0d51e77a 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
   <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
+  <string name="send_message_to_x">%s(r)i mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
   <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_omemo_x509_message">v\\OMEMOz enkriptatutako mezua bidali</string>
@@ -115,8 +116,6 @@
   <string name="pref_led_summary">Mezu berri bat heltzerakoan jakinarazpenen argia keinu egin</string>
   <string name="pref_sound">Dei-tonua</string>
   <string name="pref_sound_summary">Mezu berri bat heltzerakoan dei-tonua jo</string>
-  <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
-  <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
   <string name="pref_advanced_options">Aurreratua</string>
   <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
   <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
@@ -248,6 +247,7 @@
   <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
   <string name="you">Zu</string>
   <string name="action_edit_subject">Konferentziaren gaia editatu</string>
+  <string name="edit_subject_hint">Konferentzia honen gaia</string>
   <string name="joining_conference">Konferentziara batzen...</string>
   <string name="leave">Alde egin</string>
   <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
@@ -414,6 +414,7 @@
   <string name="disable_all_accounts">Kontu guztiak ezgaitu</string>
   <string name="perform_action_with">Ekintza honekin egin</string>
   <string name="no_affiliation">Afiliaziorik ez</string>
+  <string name="no_role">Lineaz kanpo</string>
   <string name="outcast">Baztertutakoa</string>
   <string name="member">Kidea</string>
   <string name="advanced_mode">Modu aurreratua</string>
@@ -508,6 +509,7 @@
   <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
   <string name="account_status_tor_unavailable">Tor sarea ez dago eskuragarri</string>
   <string name="account_status_bind_failure">Estekatzeak hust egin du</string>
+  <string name="account_status_host_unknown">Ostalari ezezaguna</string>
   <string name="server_info_broken">Hondatuta</string>
   <string name="pref_presence_settings">Presentzia</string>
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
@@ -586,6 +588,9 @@
   <string name="security_error_invalid_file_access">Segurtasun akatsa: fitxategi sarrera baliogabea</string>
   <string name="no_application_to_share_uri">Ez da aplikaziorik aurkitu URIa partekatzeko</string>
   <string name="share_uri_with">URIa honekin partekatu...</string>
+  <string name="welcome_text">XMPP hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein XMPP zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako conversations.im-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu.</string>
+  <string name="magic_create_text">conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nconversations.im hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez.</string>
+  <string name="your_full_jid_will_be">Zure Jabber ID osoa %s izango da</string>
   <string name="create_account">Kontua sortu</string>
   <string name="use_own_provider">Nire hornitzale propioa erabili</string>
   <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
@@ -601,4 +606,12 @@
   <string name="presence_dnd">Lanpetuta</string>
   <string name="secure_password_generated">Pasahitz seguru bat sortu da</string>
   <string name="device_does_not_support_battery_op">Zure gailuak ez du bateria optimizatzeko aukerarik ematen</string>
+  <string name="show_password">Pasahitza erakutsi</string>
+  <string name="registration_please_wait">Erregistroak huts egin du: saiatu berriz beranduago</string>
+  <string name="create_conference">Konferentzia sortu</string>
+  <string name="join_or_create_conference">Konferentzia batera batu edo sortu</string>
+  <string name="conference_subject">Gaia</string>
+  <string name="choose_participants">Parte hartzaileak hautatu</string>
+  <string name="creating_conference">Konferentzia sortzen…</string>
+  <string name="invite_again">Berriz gonbidatu</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index c9849b29..5b464a2e 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Fermer cette conversation ensuite</string>
   <string name="choose_presence">Choisir la dispo. donnée au contact</string>
   <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
+  <string name="send_message_to_x">Envoyer un message à %s</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
   <string name="send_omemo_message">Envoyer un message chiffré avec OMEMO</string>
   <string name="send_omemo_x509_message">Envoyer un message chiffré avec \\OMEMO</string>
@@ -115,8 +116,6 @@
   <string name="pref_led_summary">Faire clignoter la LED lors de la réception d\'un message</string>
   <string name="pref_sound">Sonnerie</string>
   <string name="pref_sound_summary">Jouer un son lors de la réception d\'un message</string>
-  <string name="pref_notification_grace_period">Période sans notification</string>
-  <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
   <string name="pref_advanced_options">Avancé</string>
   <string name="pref_never_send_crash">Ne pas envoyer de rapports d\'erreurs</string>
   <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez le développement de Conversations.</string>
@@ -248,6 +247,7 @@
   <string name="bookmark_already_exists">Le favori existe déjà</string>
   <string name="you">Vous</string>
   <string name="action_edit_subject">Modifier le sujet de la conférence</string>
+  <string name="edit_subject_hint">Sujet de cette conférence</string>
   <string name="joining_conference">Connexion à la conférence...</string>
   <string name="leave">Partir</string>
   <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
@@ -607,4 +607,11 @@
   <string name="secure_password_generated">Un mot de passe fort a été généré</string>
   <string name="device_does_not_support_battery_op">Les optimisations de batterie ne peuvent pas être désactivées sur votre appareil</string>
   <string name="show_password">Afficher le mot de passe</string>
+  <string name="registration_please_wait">L\'enregistrement a échoué: Réessayer plus tard</string>
+  <string name="create_conference">Créer une conférence</string>
+  <string name="join_or_create_conference">Rejoindre ou créer une conférence</string>
+  <string name="conference_subject">Objet</string>
+  <string name="choose_participants">Choisir les participants</string>
+  <string name="creating_conference">Création de la conférence...</string>
+  <string name="invite_again">Inviter à nouveau</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index cdab2e03..fdf4b36e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -61,8 +61,6 @@
   <string name="pref_notifications">Notificacións</string>
   <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
   <string name="pref_vibrate">Tremer</string>
-  <string name="pref_notification_grace_period">Notificacións Carbons</string>
-  <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
   <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
   <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
   <string name="openpgp_error">OpenKeychain reportou un erro</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 218f4dc2..239b62ac 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -101,8 +101,6 @@
   <string name="pref_notifications">Notifikasi</string>
   <string name="pref_notifications_summary">Notifikasikan jika pesan baru tiba</string>
   <string name="pref_vibrate">Getar</string>
-  <string name="pref_notification_grace_period">Tenggang waktu pemberitahuan</string>
-  <string name="pref_notification_grace_period_summary">Nonaktifkan pemberitahuan untuk waktu yang singkat setelah salinan diterima</string>
   <string name="pref_advanced_options">Lanjutan</string>
   <string name="pref_never_send_crash">Jangan kirim laporan kerusakan</string>
   <string name="pref_never_send_crash_summary">Dengan mengirimkan kesalahan Anda membantu pengembangan Aplikasi Conversations</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index b77da3aa..bcaba68e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">Invio fallito</string>
   <string name="send_rejected">rifiutato</string>
   <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
+  <string name="preparing_images">Preparazione immagini per la trasmissione</string>
+  <string name="sharing_files_please_wait">Condivisione file. Attendere prego...</string>
   <string name="action_clear_history">Pulisci la cronologia</string>
   <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
   <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
@@ -78,6 +80,7 @@
   <string name="also_end_conversation">Termina questa conversazione successivamente</string>
   <string name="choose_presence">Choose presence to contact</string>
   <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
+  <string name="send_message_to_x">Invia messaggio a %s</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_omemo_message">Invia messaggio cifrato OMEMO</string>
   <string name="send_omemo_x509_message">Invia messaggio cifrato v\\OMEMO</string>
@@ -101,12 +104,18 @@
   <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
   <string name="pref_accept_files">Accetta i file</string>
   <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string>
+  <string name="pref_attachments">Allegati</string>
+  <string name="pref_return_to_previous">Condivisione rapida</string>
+  <string name="pref_return_to_previous_summary">Torna subito all\'attività precedente invece di aprire la conversazione dopo avere condiviso qualcosa</string>
   <string name="pref_notification_settings">Notifiche</string>
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
   <string name="pref_vibrate">Vibra</string>
-  <string name="pref_notification_grace_period">Periodo tra notifiche</string>
-  <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
+  <string name="pref_vibrate_summary">Vibra quando arriva un nuovo messaggio</string>
+  <string name="pref_led">Notifica LED</string>
+  <string name="pref_led_summary">Luce di notifica lampeggiante quando arriva un nuovo messaggio</string>
+  <string name="pref_sound">Suono di notifica</string>
+  <string name="pref_sound_summary">Esegui un suono quando arriva un nuovo messaggio</string>
   <string name="pref_advanced_options">Avanzate</string>
   <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
   <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations</string>
@@ -156,6 +165,8 @@
   <string name="mgmt_account_disable">Disabilita temporaneamente</string>
   <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
   <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
+  <string name="openpgp_has_been_published">La chiave pubblica OpenPGP è stata pubblicata.</string>
+  <string name="republish_pgp_keys">Ricorda di ripubblicare le tue chiavi pubbliche OpenPGP!</string>
   <string name="mgmt_account_enable">Abilita utente</string>
   <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
   <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
@@ -236,6 +247,7 @@
   <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
   <string name="you">Tu</string>
   <string name="action_edit_subject">Modifica soggetto conferenza</string>
+  <string name="edit_subject_hint">Il soggetto di questa conferenza</string>
   <string name="joining_conference">Entro in conferenza...</string>
   <string name="leave">Abbandona</string>
   <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
@@ -309,6 +321,7 @@
   <string name="checking_x">Controllo %s su host HTTP</string>
   <string name="not_connected_try_again">Non sei connesso. Riprova più tardi</string>
   <string name="check_x_filesize">Controllo dimensione %s</string>
+  <string name="check_x_filesize_on_host">Controlla %1$s dimensione su %2$s</string>
   <string name="message_options">Opzioni del messaggio</string>
   <string name="copy_text">Copia testo</string>
   <string name="copy_original_url">Copia URL originale</string>
@@ -347,6 +360,7 @@
   <string name="choose_file">Scegli file</string>
   <string name="receiving_x_file">Ricezione di %1$s file (%2$d%% completato)</string>
   <string name="download_x_file">Scarica %s</string>
+  <string name="delete_x_file">Elimina %s</string>
   <string name="file">file</string>
   <string name="open_x_file">Apri %s</string>
   <string name="sending_file">invio (%1$d%% completato)</string>
@@ -400,6 +414,7 @@
   <string name="disable_all_accounts">Disabilita tutti gli utenti</string>
   <string name="perform_action_with">Perform action with</string>
   <string name="no_affiliation">No affiliazione</string>
+  <string name="no_role">Offline</string>
   <string name="outcast">Emarginato</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modalità avanzata</string>
@@ -493,6 +508,7 @@
   <string name="pref_use_white_background">Usa sfondo bianco</string>
   <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string>
   <string name="account_status_tor_unavailable">Rete Tor non disponibile</string>
+  <string name="account_status_host_unknown">Host sconosciuto</string>
   <string name="server_info_broken">Rotto</string>
   <string name="pref_presence_settings">Presenza</string>
   <string name="pref_away_when_screen_off">\"Non disponibile\" a schermo spento</string>
@@ -512,6 +528,7 @@
   <string name="fetching_mam_prefs">Raccolta preferenze di archiviazione. Attendere prego...</string>
   <string name="unable_to_fetch_mam_prefs">Impossibile raccogliere le preferenze di archiviazione</string>
   <string name="captcha_required">Captcha richiest</string>
+  <string name="captcha_hint">Inserisci il testo dell\'immagine soprastante</string>
   <string name="certificate_chain_is_not_trusted">Catena di certificati non affidabile</string>
   <string name="jid_does_not_match_certificate">L\'ID Jabber non corrisponde al certificato</string>
   <string name="action_renew_certificate">Rinnova certificato</string>
@@ -534,6 +551,8 @@
   <string name="load_more_messages">Carica altri messaggi</string>
   <string name="shared_file_with_x">Condividi file con %s</string>
   <string name="shared_image_with_x">Immagine condivisa con %s</string>
+  <string name="shared_images_with_x">Immagini condivise con %s</string>
+  <string name="shared_text_with_x">Testo condiviso con %s</string>
   <string name="no_storage_permission">Conversations necessita di accesso alla memoria esterna</string>
   <string name="sync_with_contacts">Sincronizza con i contatti</string>
   <string name="sync_with_contacts_long">Conversations vuole confrontare il tuo roster XMPP con i tuoi contatti per mostrare i loro nomi ed avatar.\n\nConversations leggerà solamente i contatti e li confronterà localmente senza caricarli sul server.\n\nTi verrà ora chiesto il permesso di accedere ai tuoi contatti.</string>
@@ -565,4 +584,33 @@
   <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa conferenza.</string>
   <string name="select_image_and_crop">Seleziona immagine e ritagliala</string>
   <string name="this_account_is_disabled">Hai disabilitato questo account</string>
+  <string name="security_error_invalid_file_access">Errore di sicurezza: accesso file non valido</string>
+  <string name="no_application_to_share_uri">Nessuna applicazione trovata per condividere l\'URI</string>
+  <string name="share_uri_with">Condividi l\'URI con...</string>
+  <string name="welcome_text">XMPP è un protocollo che non dipende da un provider. Puoi usare questo client con qualsiasi server XMPP scelto.\nTuttavia per comodità abbiamo semplificato la creazione di un account su conversations.im; un provider particolarmente adatto all\'uso con Conversations.</string>
+  <string name="magic_create_text">Ti guideremo nel processo di creazione di un account su conversations.im.\nQuando scegli conversations.im come provider potrai comunicare con utenti di altri provider dando il tuo ID Jabber completo.</string>
+  <string name="your_full_jid_will_be">Il tuo ID Jabber completo sarà: %s</string>
+  <string name="create_account">Crea account</string>
+  <string name="use_own_provider">Usa un altro provider</string>
+  <string name="pick_your_username">Scegli il tuo nome utente</string>
+  <string name="pref_manually_change_presence">Cambia la presenza manualmente</string>
+  <string name="pref_manually_change_presence_summary">Tocca il tuo avatar per cambiare la presenza</string>
+  <string name="change_presence">Cambia la presenza</string>
+  <string name="status_message">Messaggio di stato</string>
+  <string name="all_accounts_on_this_device">Imposta per tutti gli account del dispositivo</string>
+  <string name="presence_chat">Libero di chattare</string>
+  <string name="presence_online">Online</string>
+  <string name="presence_away">Assente</string>
+  <string name="presence_xa">Non disponibile</string>
+  <string name="presence_dnd">Occupato</string>
+  <string name="secure_password_generated">È stata generata una password sicura</string>
+  <string name="device_does_not_support_battery_op">Il tuo dispositivo non supporta l\'esclusione per l\'ottimizzazione della batteria</string>
+  <string name="show_password">Mostra la password</string>
+  <string name="registration_please_wait">Registrazione fallita: riprova più tardi</string>
+  <string name="create_conference">Crea conferenza</string>
+  <string name="join_or_create_conference">Entra o crea una conferenza</string>
+  <string name="conference_subject">Soggetto</string>
+  <string name="choose_participants">Scegli i partecipanti</string>
+  <string name="creating_conference">Creazione conferenza...</string>
+  <string name="invite_again">Invita di nuovo</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index a3eca4e6..e6145dc5 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -102,8 +102,6 @@
   <string name="pref_notifications">התראות</string>
   <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
   <string name="pref_vibrate">הרטט</string>
-  <string name="pref_notification_grace_period">משך תקופת ארכה</string>
-  <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת Carbon Copy מתקבלת</string>
   <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
   <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
   <string name="pref_confirm_messages">אשר הודעות</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 2f865239..3cafe88a 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">新しいメッセージが届いたときに通知ライトを点滅します</string>
   <string name="pref_sound">着信音</string>
   <string name="pref_sound_summary">新しいメッセージが届いたときにサウンドを再生します</string>
-  <string name="pref_notification_grace_period">通知猶予期間</string>
-  <string name="pref_notification_grace_period_summary">カーボンコピーを受信した後、短時間、通知を無効にします</string>
   <string name="pref_advanced_options">詳細</string>
   <string name="pref_never_send_crash">クラッシュレポートを送信しない</string>
   <string name="pref_never_send_crash_summary">スタックトレースを送信することで、あなたは Conversations の継続的な開発を支援しています</string>
@@ -612,4 +610,5 @@
   <string name="conference_subject">主題</string>
   <string name="choose_participants">参加者を選択</string>
   <string name="creating_conference">会議の作成中…</string>
+  <string name="invite_again">もう一度招待</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index f675059f..8b6b9ef6 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -104,8 +104,6 @@
   <string name="pref_notifications">알림 </string>
   <string name="pref_notifications_summary">새 메세지 도착시 알림 </string>
   <string name="pref_vibrate">진동 </string>
-  <string name="pref_notification_grace_period">알림 유예 </string>
-  <string name="pref_notification_grace_period_summary">Carbon Copy 수신 후에 잠시동안 알림 해제</string>
   <string name="pref_never_send_crash">충돌 보고서 보내지 않음 </string>
   <string name="pref_never_send_crash_summary">Stack trace 정보를 보냄으로서 Conversations의 개발에 기여할 수 있습니다 </string>
   <string name="pref_confirm_messages">메세지 확인 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 0eefc052..ce6597b3 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -104,8 +104,6 @@
   <string name="pref_notifications">Varslinger</string>
   <string name="pref_notifications_summary">Varsle når en ny melding ankommer</string>
   <string name="pref_vibrate">Vibrer</string>
-  <string name="pref_notification_grace_period">Stilleperiode</string>
-  <string name="pref_notification_grace_period_summary">Deaktiver varslinger for en kort periode etter at en kopi er mottatt</string>
   <string name="pref_never_send_crash">Aldri send feilrettingsrapporter</string>
   <string name="pref_never_send_crash_summary">Ved å sende inn stabelsporinger hjelper du den pågående utviklingen av Conversations</string>
   <string name="pref_confirm_messages">Bekreft meldinger</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 8b186a22..14088282 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Meldingslicht knipperen wanneer een nieuw bericht ontvangen wordt</string>
   <string name="pref_sound">Beltoon</string>
   <string name="pref_sound_summary">Geluid afspelen wanneer een nieuw bericht ontvangen wordt</string>
-  <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
-  <string name="pref_notification_grace_period_summary">Schakel meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
   <string name="pref_advanced_options">Geavanceerd</string>
   <string name="pref_never_send_crash">Verstuur nooit crashrapportages</string>
   <string name="pref_never_send_crash_summary">Door crashrapportages te versturen help je de ontwikkeling van Conversations</string>
@@ -615,4 +613,5 @@
   <string name="conference_subject">Onderwerp</string>
   <string name="choose_participants">Kies deelnemers</string>
   <string name="creating_conference">Aanmaken van groepsgesprek…</string>
+  <string name="invite_again">Opnieuw uitnodigen</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index dbabd34a..d958b912 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -115,8 +115,6 @@
   <string name="pref_led_summary">Migaj lampką powiadamiającą gdy nadejdzie wiadomość</string>
   <string name="pref_sound">Dzwonek</string>
   <string name="pref_sound_summary">Odtwórz dźwięk gdy nadejdzie wiadomość</string>
-  <string name="pref_notification_grace_period">Opóźnienie powiadomień</string>
-  <string name="pref_notification_grace_period_summary">Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości</string>
   <string name="pref_advanced_options">Zaawansowane</string>
   <string name="pref_never_send_crash">Nie wysyłaj raportów awarii</string>
   <string name="pref_never_send_crash_summary">Wysyłając ślady stosu pomagasz rozwijać Conversations</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 4fe169c0..f49300a2 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -115,8 +115,6 @@
   <string name="pref_led_summary">Pisca a luz de notificação ao receber uma nova mensagem.</string>
   <string name="pref_sound">Toque</string>
   <string name="pref_sound_summary">Toca um som ao receber uma nova mensagem.</string>
-  <string name="pref_notification_grace_period">Tempo de espera da notificação</string>
-  <string name="pref_notification_grace_period_summary">Desativa as notificações por um curto período após uma cópia da mensagem ser recebida.</string>
   <string name="pref_advanced_options">Avançado</string>
   <string name="pref_never_send_crash">Nunca enviar relatórios de erros</string>
   <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está colaborando com o desenvolvimento do Conversations.</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 223d6ae7..4596dcb1 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -115,8 +115,6 @@
   <string name="pref_led_summary">Piscar luz de notificação quando uma nova mensagem for recebida</string>
   <string name="pref_sound">Tom de toque</string>
   <string name="pref_sound_summary">Tocar som quando uma nova mensagem for recebida</string>
-  <string name="pref_notification_grace_period">Período de carência da notificação</string>
-  <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após a copia oculta ser recebida</string>
   <string name="pref_advanced_options">Avançadas</string>
   <string name="pref_never_send_crash">Nunca enviar relatórios de falhas</string>
   <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está a ajudar ao desenvolvimento contínuo de Conversations</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 3e988ae0..8d21ccda 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Clipeste lumina de notificare atunci cand un nou mesaj este primit</string>
   <string name="pref_sound">Ton de apel</string>
   <string name="pref_sound_summary">Notificare sonora atunci cand un nou mesaj este primit</string>
-  <string name="pref_notification_grace_period">Perioada de gratie notificari </string>
-  <string name="pref_notification_grace_period_summary">Opreste notificari pentru o scurta perioada dupa ce o copie a mesajului a fost primita</string>
   <string name="pref_advanced_options">Optiuni avansate</string>
   <string name="pref_never_send_crash">Nu trimite rapoarte de erori</string>
   <string name="pref_never_send_crash_summary">Trimitand date ajuti la dezvoltarea aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
@@ -619,4 +617,5 @@ Emitent</string>
   <string name="conference_subject">Subiect</string>
   <string name="choose_participants">Alege participanti</string>
   <string name="creating_conference">Se creeaza conferinta...</string>
+  <string name="invite_again">Trimite din nou invitatia</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 7c7889f5..37abc6df 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -105,8 +105,6 @@
   <string name="pref_notifications">Уведомление</string>
   <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
   <string name="pref_vibrate">Вибрация</string>
-  <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
-  <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
   <string name="pref_advanced_options">Дополнительно</string>
   <string name="pref_never_send_crash">Отчеты об ошибках</string>
   <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 2bea5a90..c21e2a73 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -99,8 +99,6 @@
   <string name="pref_notifications">Upozornenia</string>
   <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string>
   <string name="pref_vibrate">Vibrovať</string>
-  <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string>
-  <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string>
   <string name="pref_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string>
   <string name="pref_never_send_crash_summary">Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations</string>
   <string name="pref_confirm_messages">Potvrdzovať správy</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 6dc6942b..868a2099 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -47,7 +47,7 @@
   <string name="change_password_on_server">Промени лозинку на серверу</string>
   <string name="share_with">Подели помоћу…</string>
   <string name="start_conversation">Почни преписку</string>
-  <string name="invite_contact">Позови контакта</string>
+  <string name="invite_contact">Пошаљи позивницу контакту</string>
   <string name="contacts">Контакти</string>
   <string name="cancel">Одустани</string>
   <string name="set">Постави</string>
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Трептање ЛЕД светла кад стигне нова порука</string>
   <string name="pref_sound">Звук</string>
   <string name="pref_sound_summary">Пуштање звука кад стигне нова порука</string>
-  <string name="pref_notification_grace_period">Период одгоде обавештења</string>
-  <string name="pref_notification_grace_period_summary">Искључи обавештења на кратко по примању карбон копије</string>
   <string name="pref_advanced_options">Напредно</string>
   <string name="pref_never_send_crash">Никад не шаљи извештаје о паду</string>
   <string name="pref_never_send_crash_summary">Слањем контратрага помажете текући развој Конверзације</string>
@@ -617,4 +615,5 @@
   <string name="conference_subject">Предмет</string>
   <string name="choose_participants">Додај учеснике</string>
   <string name="creating_conference">Правим групно ћаскање…</string>
+  <string name="invite_again">Пошаљи поново</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d58ad27e..8e50d17f 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Blinka med notifieringsljuset när ett meddelande tagits emot</string>
   <string name="pref_sound">Meddelandesignal</string>
   <string name="pref_sound_summary">Spela ljud när meddelande tagits emot</string>
-  <string name="pref_notification_grace_period">Notifieringsfrist</string>
-  <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
   <string name="pref_advanced_options">Avancerat</string>
   <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
   <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 30e9049d..852f7f73 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -116,8 +116,6 @@
   <string name="pref_led_summary">Yeni bir ileti geldiğinde bildirim ışığı yanıp sönsün</string>
   <string name="pref_sound">Zil sesi</string>
   <string name="pref_sound_summary">Yeni bir ileti geldiğinde sesli bildir</string>
-  <string name="pref_notification_grace_period">Bildirim mühleti</string>
-  <string name="pref_notification_grace_period_summary">Karbon kopya alındıktan sonra kısa bir süre için bildirimleri kapa</string>
   <string name="pref_advanced_options">Gelişmiş</string>
   <string name="pref_never_send_crash">Asla çöküş raporu gönderme</string>
   <string name="pref_never_send_crash_summary">Çöküş raporu göndermeniz Conversations\n’ın geliştirilmesine katkıda bulunacaktır.</string>
@@ -612,4 +610,5 @@
   <string name="conference_subject">Konu</string>
   <string name="choose_participants">Katılımcıları seç</string>
   <string name="creating_conference">Grup Sohbet başlatılıyor...</string>
+  <string name="invite_again">Yeniden davet et</string>
 </resources>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 73c952e9..b015ade2 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -104,8 +104,6 @@
   <string name="pref_notifications">Thông báo</string>
   <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string>
   <string name="pref_vibrate">Rung</string>
-  <string name="pref_notification_grace_period">Thời gian gia hạn thông báo</string>
-  <string name="pref_notification_grace_period_summary">Tắt thông báo trong một thời gian ngắn sau khi nhận được bản sao giấy than</string>
   <string name="pref_never_send_crash">Không bao giờ gửi báo cáo dừng chạy</string>
   <string name="pref_never_send_crash_summary">Bằng việc gửi báo cáo hoạt động, bạn đang hỗ trợ nhóm phát triển của Conversations</string>
   <string name="pref_confirm_messages">Xác nhận tin nhắn</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index df61bd1c..145da3c2 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -115,8 +115,6 @@
   <string name="pref_led_summary">收到新消息时闪烁通知灯</string>
   <string name="pref_sound">铃声</string>
   <string name="pref_sound_summary">收到新消息时响铃</string>
-  <string name="pref_notification_grace_period">通知限期</string>
-  <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
   <string name="pref_advanced_options">高级</string>
   <string name="pref_never_send_crash">总不发送崩溃报告</string>
   <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助 Conversations 开发人员</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index de919744..555a6bb1 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -80,8 +80,6 @@
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新訊息時通知</string>
   <string name="pref_vibrate">震動</string>
-  <string name="pref_notification_grace_period">通知限期</string>
-  <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
   <string name="pref_never_send_crash">總是不發送故障報告</string>
   <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
   <string name="pref_confirm_messages">確認訊息</string>
-- 
cgit v1.2.3