From 27ca031f9370bb20085e3d314856af77f3f54271 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 17 Feb 2020 11:13:18 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/conversations/res/values-fr/strings.xml     | 5 ++++-
 src/conversations/res/values-zh-rCN/strings.xml | 6 +++++-
 src/main/res/values-ar/strings.xml              | 1 -
 src/main/res/values-bg/strings.xml              | 1 -
 src/main/res/values-ca/strings.xml              | 1 -
 src/main/res/values-cs/strings.xml              | 1 -
 src/main/res/values-de/strings.xml              | 1 -
 src/main/res/values-el/strings.xml              | 1 -
 src/main/res/values-es/strings.xml              | 1 -
 src/main/res/values-eu/strings.xml              | 1 -
 src/main/res/values-fr/strings.xml              | 1 -
 src/main/res/values-gl/strings.xml              | 1 -
 src/main/res/values-hu/strings.xml              | 1 -
 src/main/res/values-id/strings.xml              | 1 -
 src/main/res/values-it/strings.xml              | 1 -
 src/main/res/values-iw/strings.xml              | 1 -
 src/main/res/values-ja/strings.xml              | 1 -
 src/main/res/values-ko/strings.xml              | 1 -
 src/main/res/values-nb-rNO/strings.xml          | 1 -
 src/main/res/values-nl/strings.xml              | 1 -
 src/main/res/values-pl/strings.xml              | 1 -
 src/main/res/values-pt-rBR/strings.xml          | 1 -
 src/main/res/values-pt/strings.xml              | 1 -
 src/main/res/values-ro-rRO/strings.xml          | 3 +--
 src/main/res/values-ru/strings.xml              | 1 -
 src/main/res/values-sk/strings.xml              | 1 -
 src/main/res/values-sr/strings.xml              | 1 -
 src/main/res/values-sv/strings.xml              | 1 -
 src/main/res/values-tr-rTR/strings.xml          | 1 -
 src/main/res/values-uk/strings.xml              | 1 -
 src/main/res/values-vi/strings.xml              | 1 -
 src/main/res/values-zh-rCN/strings.xml          | 7 ++++++-
 src/main/res/values-zh-rTW/strings.xml          | 1 -
 33 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/conversations/res/values-fr/strings.xml b/src/conversations/res/values-fr/strings.xml
index b92d4798b..8fa8a3b9f 100644
--- a/src/conversations/res/values-fr/strings.xml
+++ b/src/conversations/res/values-fr/strings.xml
@@ -5,4 +5,7 @@
     <string name="create_new_account">Créer un nouveau compte</string>
     <string name="do_you_have_an_account">Avez-vous déjà un compte XMPP ? Cela peut être le cas si vous utilisez déjà un autre client XMPP ou si vous avez déjà utilisé Conversations auparavant. Sinon, vous pouvez créer un nouveau compte XMPP dès maintenant. Remarque : Certains fournisseurs de messagerie proposent également des comptes XMPP.</string>
     <string name="server_select_text">XMPP est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n\'importe quel serveur XMPP de votre choix. Toutefois, pour votre commodité, nous avons facilité la création d\'un compte sur conversations.im¹ ; un fournisseur spécialement conçu pour l\'utilisation avec Conversations.</string>
-    </resources>
\ No newline at end of file
+    <string name="magic_create_text_on_x">Vous avez été invité à %1$s. Nous vous guiderons dans le processus de création d\'un compte.\nEn choisissant %1$s comme fournisseur, vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leur donnant votre adresse XMPP complète.</string>
+    <string name="magic_create_text_fixed">Vous avez été invité par %1$s . Un nom d\'utilisateur a déjà été choisi pour vous. Nous vous guiderons dans le processus de création d\'un compte. Vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leur donnant votre adresse XMPP complète.</string>
+    <string name="your_server_invitation">Votre invitation au serveur</string>
+</resources>
\ No newline at end of file
diff --git a/src/conversations/res/values-zh-rCN/strings.xml b/src/conversations/res/values-zh-rCN/strings.xml
index ff6a0c393..d554df1a0 100644
--- a/src/conversations/res/values-zh-rCN/strings.xml
+++ b/src/conversations/res/values-zh-rCN/strings.xml
@@ -4,4 +4,8 @@
     <string name="use_conversations.im">使用 conversations.im</string>
     <string name="create_new_account">创建新账户</string>
     <string name="do_you_have_an_account">您已经拥有一个XMPP账户了吗？如果您之前使用过其他的XMPP客户端的话，那么您已经拥有这种账户了。如果没有账户的话，您可以现在创建一个。\n提示：有些电子邮件服务也提供XMPP账户。</string>
-    </resources>
\ No newline at end of file
+    <string name="server_select_text">XMPP是独立于提供程序的即时消息网络。 您可以将此客户端与所选的任何XMPP服务器一起使用。\ n不过，为了您的方便，我们很容易在对话中创建帐户。im¹; 特别适合与“对话”配合使用的提供商。</string>
+    <string name="magic_create_text_on_x">您已受邀参加%1$s。 我们将指导您完成创建帐户的过程。\n选择%1$s作为提供者后，您可以通过提供其他人的完整XMPP地址与其他提供者的用户进行交流。</string>
+    <string name="magic_create_text_fixed">您已受邀参加%1$s。 已经为您选择了一个用户名。 我们将指导您完成创建帐户的过程。\n您可以通过向其他提供商的用户提供完整的XMPP地址来与他们进行交流。</string>
+    <string name="your_server_invitation">你的服务器邀请</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 25f653038..5673a3a17 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -219,7 +219,6 @@
   <string name="destroy_channel">دمر القناة</string>
   <string name="could_not_destroy_room">لم نتمكن مِن تدمير فريق المحادثة</string>
   <string name="could_not_destroy_channel">لم نتمكن مِن تدمير القناة</string>
-  <string name="bookmark_already_exists">موجوده بالمفضلة سابقا</string>
   <string name="action_edit_subject">تعديل موضوع مجموعة المحادثة</string>
   <string name="topic">الموضوع</string>
   <string name="joining_conference">في صدد الإنظمام إلى مجموعة المحادثة ...</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 0586dea21..da9c5917d 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -221,7 +221,6 @@
   <string name="destroy_room">Унищожаване на груповия разговор</string>
   <string name="destroy_room_dialog">Наистина ли искате да унищожите този групов разговор?\n\n<b>Внимание:</b> Груповият разговор ще бъде премахнат от сървъра.</string>
   <string name="could_not_destroy_room">Груповият разговор не може да бъде унищожен</string>
-  <string name="bookmark_already_exists">Вече съществува такава отметка</string>
   <string name="action_edit_subject">Редактиране на темата на груповия разговор</string>
   <string name="topic">Тема</string>
   <string name="joining_conference">Присъединяване в групов разговор…</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 130746827..1202cb293 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -221,7 +221,6 @@
   <string name="delete_bookmark">Elimina dels marcadors</string>
   <string name="destroy_room">Destrueix el xat en grup</string>
   <string name="destroy_channel">Destrueix el canal</string>
-  <string name="bookmark_already_exists">Aquest marcador ja existeix</string>
   <string name="action_edit_subject">Edita el tema del xat de grup</string>
   <string name="topic">Assumpte</string>
   <string name="joining_conference">S\'està unint al xat de grup…</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index d6490d987..82be2316e 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -191,7 +191,6 @@
   <string name="join">Vstoupit</string>
   <string name="save_as_bookmark">Uložit jako záložku</string>
   <string name="delete_bookmark">Smazat záložku</string>
-  <string name="bookmark_already_exists">Tato záložka již existuje</string>
   <string name="leave">Odejít</string>
   <string name="contact_added_you">Kontakt přidán do seznamu</string>
   <string name="add_back">Opět přidat</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index eed197548..1f15f095f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Bist du sicher, dass du diesen öffentlichen Channel löschen willst?\n\n<b>Achtung:</b> Der Channel wird dabei vollständig auf dem Server gelöscht.</string>
   <string name="could_not_destroy_room">Gruppenchat konnte nicht gelöscht werden</string>
   <string name="could_not_destroy_channel">Channel konnte nicht gelöscht werden</string>
-  <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
   <string name="action_edit_subject">Gruppenchatthema bearbeiten</string>
   <string name="topic">Thema</string>
   <string name="joining_conference">Gruppenchat wird beigetreten…</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 2453932b2..1d0115b1c 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -234,7 +234,6 @@
   <string name="destroy_channel_dialog">Είστε βέβαιοι ότι θέλετε να καταστρέψετε αυτό το δημόσιο κανάλι;\n\n<b>Προσοχή:</b>Το κανάλι θα διαγραφεί πλήρως από τον διακομιστή.</string>
   <string name="could_not_destroy_room">Δεν ήταν δυνατή η καταστροφή της ομαδικής συζήτησης</string>
   <string name="could_not_destroy_channel">Δεν ήταν δυνατή η καταστροφή του καναλιού</string>
-  <string name="bookmark_already_exists">Αυτός ο σελιδοδείκτης υπάρχει ήδη</string>
   <string name="action_edit_subject">Επεξεργασία θέματος ομαδικής συζήτησης</string>
   <string name="topic">Θέμα</string>
   <string name="joining_conference">Συμμετοχή σε ομαδική συζήτηση...</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 0c8674027..7d1b3af86 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">¿Estás seguro de que quieres destruir este canal público?\n\n<b>Aviso:</b>El canal será eliminado completamente en el servidor.</string>
   <string name="could_not_destroy_room">No se ha podido destruir la conversación en grupo</string>
   <string name="could_not_destroy_channel">No se ha podido destruir el canal</string>
-  <string name="bookmark_already_exists">Este marcador ya existe</string>
   <string name="action_edit_subject">Editar asunto de la conversación</string>
   <string name="topic">Asunto</string>
   <string name="joining_conference">Uniéndose a conversación...</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 6366f3809..2e841f7f3 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -234,7 +234,6 @@
   <string name="destroy_channel_dialog">Kanal publiko hau deuseztatu nahi duzu?\n\n<b>Abisua:</b> Kanala zerbitzaritik guztiz kenduko da.</string>
   <string name="could_not_destroy_room">Ezin izan da taldea deuseztatu</string>
   <string name="could_not_destroy_channel">Ezin izan da kanala deuseztatu</string>
-  <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
   <string name="action_edit_subject">Taldearen gaia editatu</string>
   <string name="topic">Gaia</string>
   <string name="joining_conference">Taldera batzen...</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4f22d8bd2..1f2fd6d4f 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -235,7 +235,6 @@
   <string name="destroy_channel_dialog">Êtes-vous sûr de vouloir détruire ce canal public? \ On \ <b>Avertissement:</b> le canal sera complètement supprimé du serveur.</string>
   <string name="could_not_destroy_room">Impossible de détruire le chat en groupe</string>
   <string name="could_not_destroy_channel">Impossible de détruire le canal</string>
-  <string name="bookmark_already_exists">Le favori existe déjà</string>
   <string name="action_edit_subject">Modifier le sujet de la conversation de groupe</string>
   <string name="topic">Sujet</string>
   <string name="joining_conference">Rejoindre la conversation de groupe</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 611e87bda..7d7b0c4fd 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Está segura de que quere eliminar o canal?\n\n<b>Aviso:</b> O canal eliminarase completamente do servidor.</string>
   <string name="could_not_destroy_room">Non se desfixo a conversa en grupo</string>
   <string name="could_not_destroy_channel">Non se puido eliminar o canal</string>
-  <string name="bookmark_already_exists">Este marcador xa existe</string>
   <string name="action_edit_subject">Editar o tema da conversa en grupo</string>
   <string name="topic">Asunto</string>
   <string name="joining_conference">Entrando na conversa en grupo</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 9611701ab..bd4f0e3b3 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Biztosan meg szeretné szüntetni ezt a nyilvános csatornát?\n\n<b>Figyelmeztetés:</b> A csatorna teljesen el lesz távolítva a kiszolgálóról.</string>
   <string name="could_not_destroy_room">Nem sikerült megszüntetni a csoportos csevegést</string>
   <string name="could_not_destroy_channel">Nem sikerült megszüntetni a csatornát</string>
-  <string name="bookmark_already_exists">A könyvjelző már létezik</string>
   <string name="action_edit_subject">Csoportos csevegés tárgyának szerkesztése</string>
   <string name="topic">Téma</string>
   <string name="joining_conference">Csatlakozás csoportos csevegéshez…</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 2bb662efa..009cf7266 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -172,7 +172,6 @@
   <string name="join">Gabung</string>
   <string name="save_as_bookmark">Simpan sebagai bookmark</string>
   <string name="delete_bookmark">Hapus bookmark</string>
-  <string name="bookmark_already_exists">Bookmark ini sudah ada</string>
   <string name="leave">Tinggalkan</string>
   <string name="contact_added_you">Kontak ditambahkan ke daftar anda</string>
   <string name="add_back">Tambah kembali</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 8e462b899..82343123e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Sei sicuro di voler distruggere questo canale pubblico?\n\n<b>Attenzione:</b> il canale verrà completamente rimosso sul server.</string>
   <string name="could_not_destroy_room">Distruzione della chat di gruppo fallita</string>
   <string name="could_not_destroy_channel">Distruzione canale fallita</string>
-  <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
   <string name="action_edit_subject">Modifica titolo chat di gruppo</string>
   <string name="topic">Argomento</string>
   <string name="joining_conference">Ingresso nella chat di gruppo...</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 7300c187e..f64ca7ad6 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -164,7 +164,6 @@
   <string name="join">הצטרף</string>
   <string name="save_as_bookmark">שמור בתור סימנייה</string>
   <string name="delete_bookmark">מחק סימנייה</string>
-  <string name="bookmark_already_exists">סימנייה זו כבר קיימת</string>
   <string name="leave">עזוב</string>
   <string name="contact_added_you">איש קשר הוסיף אותך אל רשימת קשר</string>
   <string name="add_back">הוסף בחזרה</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index ff20bff0b..412049c2c 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -226,7 +226,6 @@
   <string name="destroy_room">グループチャットを破棄する</string>
   <string name="destroy_room_dialog">このグループチャットを破棄してもよろしいですか?\n\n<b>警告:</b> グループチャットはサーバーから完全に削除されます。</string>
   <string name="could_not_destroy_room">グループチャットを削除できません</string>
-  <string name="bookmark_already_exists">このブックマークはすでに存在します</string>
   <string name="action_edit_subject">談話室の題を編集</string>
   <string name="topic">トピック</string>
   <string name="joining_conference">談話室に参加しています…</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 63806b67f..ee646b5be 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -192,7 +192,6 @@
   <string name="join">참석 </string>
   <string name="save_as_bookmark">즐겨찾기로 저장 </string>
   <string name="delete_bookmark">즐겨찾기 삭제 </string>
-  <string name="bookmark_already_exists">즐겨찾기가 이미 존재합니다 </string>
   <string name="leave">퇴장 </string>
   <string name="contact_added_you">연락처가 당신을 연락처 목록에 추가했습니다 </string>
   <string name="add_back">Add back</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 5dc4eb3f2..f38b28b96 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -204,7 +204,6 @@
   <string name="join">Ta del i</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="joining_conference">Tar del i gruppesludring…</string>
   <string name="leave">Forlat</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 3f2dcb4db..89693ed51 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -234,7 +234,6 @@
   <string name="destroy_channel_dialog">Weet je zeker dat je dit openbare kanaal wilt vernietigen?\n\n<b>Waarschuwing:</b> Dit kanaal wordt volledig verwijderd van de server.</string>
   <string name="could_not_destroy_room">Kan groepsgesprek niet vernietigen</string>
   <string name="could_not_destroy_channel">Kan kanaal niet vernietigen</string>
-  <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
   <string name="action_edit_subject">Gespreksonderwerp bewerken</string>
   <string name="topic">Onderwerp</string>
   <string name="joining_conference">Deelnemen aan groepsgesprek…</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 6c0548b56..a8ed931ae 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Czy na pewno chcesz usunąć ten kanał publiczny?\n\n<b>Ostrzeżenie:</b> Ten kanał zostanie całkowicie usunięty z serwera.</string>
   <string name="could_not_destroy_room">Usuwanie konferencji nieudane</string>
   <string name="could_not_destroy_channel">Nie można usunąć kanału</string>
-  <string name="bookmark_already_exists">Zakładka już istnieje</string>
   <string name="action_edit_subject">Edytuj tytuł konferencji</string>
   <string name="topic">Temat</string>
   <string name="joining_conference">Dołączanie do konferencji</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 09bd46dd9..c856ac249 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Tem certeza que deseja destruir esse canal público?\n\n<b>Atenção:</b> O canal será removido completamente do servidor.</string>
   <string name="could_not_destroy_room">Não foi possível destruir a conversa em grupo</string>
   <string name="could_not_destroy_channel">Não foi possível destruir o canal</string>
-  <string name="bookmark_already_exists">Esse favorito já existe</string>
   <string name="action_edit_subject">Editar o assunto da conversa em grupo</string>
   <string name="topic">Tópico</string>
   <string name="joining_conference">Entrando na conversa em grupo...</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index ce817ac1a..2db314122 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -199,7 +199,6 @@
   <string name="join">Juntar</string>
   <string name="save_as_bookmark">Guardar como favorito</string>
   <string name="delete_bookmark">Apagar favorito</string>
-  <string name="bookmark_already_exists">O favorito já existe</string>
   <string name="action_edit_subject">Editar tema da conversa em grupo</string>
   <string name="topic">Tópico</string>
   <string name="leave">Sair</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 48d83fc98..eefc2dc35 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -27,7 +27,7 @@
   <string name="title_activity_choose_contacts">Alegeți contactele</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="just_now">acum</string>
   <string name="minute_ago">acum un minut</string>
   <string name="minutes_ago">acum %d minute</string>
   <string name="x_unread_conversations">%d conversații necitite</string>
@@ -236,7 +236,6 @@
   <string name="destroy_channel_dialog">Sigur doriți distrugerea acestui canal public?\n\n<b>Atenție:</b> Canalul public v-a fi complet șters de pe server.</string>
   <string name="could_not_destroy_room">Nu s-a putut distruge discuția de grup</string>
   <string name="could_not_destroy_channel">Nu s-a putut distruge canalul</string>
-  <string name="bookmark_already_exists">Acest semn de carte există deja</string>
   <string name="action_edit_subject">Editează subiectul discuției de grup</string>
   <string name="topic">Subiect discuție</string>
   <string name="joining_conference">Vă alăturați discuției de grup...</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d9e92fbd2..cc504d3fe 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -221,7 +221,6 @@
   <string name="delete_bookmark">Удалить закладку</string>
   <string name="destroy_room">Уничтожить конференцию</string>
   <string name="destroy_channel">Уничтожить канал</string>
-  <string name="bookmark_already_exists">Такая закладка уже существует</string>
   <string name="action_edit_subject">Редактировать тему конференции</string>
   <string name="topic">Тема</string>
   <string name="joining_conference">Вход в конференцию…</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 2c88c6796..1908493ec 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -161,7 +161,6 @@
   <string name="join">Vstúpiť</string>
   <string name="save_as_bookmark">Uložiť ako záložku</string>
   <string name="delete_bookmark">Vymazať záložku</string>
-  <string name="bookmark_already_exists">Táto záložka už existuje</string>
   <string name="leave">Odísť</string>
   <string name="contact_added_you">Kontakt pridaný do zoznamu</string>
   <string name="add_back">Znova pridať</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b3aae18f1..aeabe6c0f 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -208,7 +208,6 @@
   <string name="join">Придружи се</string>
   <string name="save_as_bookmark">Сачувај као обележивач</string>
   <string name="delete_bookmark">Обриши обележивач</string>
-  <string name="bookmark_already_exists">Овај обележивач већ постоји</string>
   <string name="action_edit_subject">Уреди предмет групног ћаскања</string>
   <string name="topic">Тема</string>
   <string name="joining_conference">Улазим у групно ћаскање…</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 224f4cabc..d9cf1e430 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -221,7 +221,6 @@
   <string name="join">Gå med</string>
   <string name="save_as_bookmark">Spara som bokmärke</string>
   <string name="delete_bookmark">Ta bort bokmärke</string>
-  <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
   <string name="topic">Ämne</string>
   <string name="joining_conference">Går med i gruppchatt...</string>
   <string name="leave">Lämna</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 203ae1df9..a32aa7c48 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -192,7 +192,6 @@
   <string name="join">Katıl</string>
   <string name="save_as_bookmark">Yer imi olarak kaydet</string>
   <string name="delete_bookmark">Yer imini sil</string>
-  <string name="bookmark_already_exists">Bu yer imi zaten mevcut</string>
   <string name="leave">Ayrıl</string>
   <string name="contact_added_you">Kişi sizi listesine ekledi</string>
   <string name="add_back">Siz de ekleyin</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 1c8b2e762..41ed517d1 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -232,7 +232,6 @@
   <string name="destroy_channel_dialog">Упевнені, що бажаєте знищити цей публічний канал?\n\n<b>Увага:</b> Канал буде повністю знищено та видалено з сервера.</string>
   <string name="could_not_destroy_room">Видалити цей груповий чат не вдалось</string>
   <string name="could_not_destroy_channel">Не вдалося знищити канал</string>
-  <string name="bookmark_already_exists">Ця закладка вже існує</string>
   <string name="action_edit_subject">Редагувати тему групи</string>
   <string name="topic">Тема</string>
   <string name="joining_conference">Приєднання до групи…</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2335bdd05..82bbfc97f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -192,7 +192,6 @@
   <string name="join">Tham gia</string>
   <string name="save_as_bookmark">Lưu thành đánh dấu</string>
   <string name="delete_bookmark">Xoá đánh dấu</string>
-  <string name="bookmark_already_exists">Đã có đánh dấu này rồi</string>
   <string name="leave">Rời khỏi</string>
   <string name="contact_added_you">Liên hệ đã thêm bạn vào danh bạ</string>
   <string name="add_back">Thêm họ vào</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 0bb284ed2..862375ad3 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -119,6 +119,7 @@
   <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>
@@ -154,6 +155,7 @@
   <string name="account_status_regis_conflict"> 用户名已存在</string>
   <string name="account_status_regis_success">注册完成</string>
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
+  <string name="account_status_regis_invalid_token">无效的注册令牌</string>
   <string name="account_status_tls_error">TLS 协商失败</string>
   <string name="account_status_policy_violation">违反政策</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
@@ -234,7 +236,6 @@
   <string name="destroy_channel_dialog">您确定要解散此公共频道吗？\n\n<b>警告：</b>该频道将在服务器上完全删除。</string>
   <string name="could_not_destroy_room">无法解散群聊</string>
   <string name="could_not_destroy_channel">无法解散频道</string>
-  <string name="bookmark_already_exists">该书签已存在</string>
   <string name="action_edit_subject">编辑群聊主题</string>
   <string name="topic">主题</string>
   <string name="joining_conference">正在加入群聊…</string>
@@ -332,6 +333,7 @@
   <string name="x_file_offered_for_download">可以下载 %s</string>
   <string name="cancel_transmission">取消传输</string>
   <string name="file_transmission_failed">文件传输失败</string>
+  <string name="file_transmission_cancelled">文件传输已取消</string>
   <string name="file_deleted">文件已经删除</string>
   <string name="no_application_found_to_open_file">没有可以打开此文件的应用</string>
   <string name="no_application_found_to_open_link">没有可以打开此链接的应用</string>
@@ -504,6 +506,7 @@
   <string name="notify_never">禁用通知</string>
   <string name="notify_paused">暂停通知</string>
   <string name="pref_picture_compression">图像压缩</string>
+  <string name="pref_picture_compression_summary">提示：使用“选择文件”而不是“选择图片”来发送未经压缩的单个图像，无论此设置如何。</string>
   <string name="always">总是</string>
   <string name="battery_optimizations_enabled">启用节电模式</string>
   <string name="battery_optimizations_enabled_explained">你的设备正在为Conversations进行电池优化，这可能导致通知的延迟甚至消息的丢失。
@@ -859,4 +862,6 @@
   <string name="please_enter_password">请输入此账户的密码</string>
   <string name="unable_to_perform_this_action">无法执行此操作</string>
   <string name="open_join_dialog">加入公开群聊</string>
+  <string name="backup">备份</string>
+  <string name="category_about">关于</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 1884e9f6f..0c83bd770 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -196,7 +196,6 @@
   <string name="join">加入</string>
   <string name="save_as_bookmark">保存為書簽</string>
   <string name="delete_bookmark">刪除書簽</string>
-  <string name="bookmark_already_exists">該書簽已存在</string>
   <string name="leave">離開</string>
   <string name="contact_added_you">連絡人已添加你到連絡人列表</string>
   <string name="add_back">反向添加</string>