diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 25a242c6b..fabfeadd4 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -452,7 +452,6 @@
   <string name="this_field_is_required">هذه الخانة مطلوبة</string>
   <string name="correct_message">صَحِّح الرسالة</string>
   <string name="send_corrected_message">إبعث الرسالةَ مُصححة</string>
-  <string name="select_image_and_crop">إختر صورة ثم قم بقصها</string>
   <string name="this_account_is_disabled">لقد قمت بتعطيل هذا الحساب</string>
   <string name="security_error_invalid_file_access">خطأ في الأمان : نفاذ غير سليم إلى ملف</string>
   <string name="no_application_to_share_uri">تعذر العثور على تطبيق يُمكنُ بواسطته مشاركة الرابط</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index f880bf10f..5685cf52d 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Блокиране на всички контакти от %s?</string>
   <string name="unblock_domain_text">Деблокиране на всички контакти от %s?</string>
   <string name="contact_blocked">Контактът е блокиран</string>
+  <string name="blocked">Блокиран</string>
   <string name="remove_bookmark_text">Искате ли да премахнете отметката за %s? Разговорът, свързан с тази отметка, няма да бъде премахнат.</string>
   <string name="register_account">Регистриране на нов профил на сървъра</string>
   <string name="change_password_on_server">Промяна на паролата в сървъра</string>
@@ -293,6 +294,7 @@
   <string name="check_x_filesize_on_host">Проверете размера на %1$s на %2$s</string>
   <string name="message_options">Настройки за съобщенята</string>
   <string name="quote">Цитат</string>
+  <string name="paste_as_quote">Поставяне като цитат</string>
   <string name="copy_original_url">Копиране на оригиналния адрес</string>
   <string name="send_again">Повторно изпращане</string>
   <string name="file_url">Адрес на файла</string>
@@ -508,7 +510,6 @@
   <string name="correct_message">Поправяне на съобщението</string>
   <string name="send_corrected_message">Изпращане на поправеното съобщение</string>
   <string name="no_keys_just_confirm">Вие вече имате доверие на този контакт. Избирайки „готово“, Вие просто потвърждавате, че %s е част от този групов разговор.</string>
-  <string name="select_image_and_crop">Изберете изображение и изрежете</string>
   <string name="this_account_is_disabled">Вие сте деактивирали този профил</string>
   <string name="security_error_invalid_file_access">Грешка в сигурността: неправилен достъп до файл</string>
   <string name="no_application_to_share_uri">Няма намерено приложение за споделяне на адреса</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 1541a8c56..bedf87cae 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -519,7 +519,6 @@ missatges.\n\nAra se us demanarà que desactiveu-las.</string>
   <string name="correct_message">Corregeix el missatge</string>
   <string name="send_corrected_message">Envia el missatge corregit</string>
   <string name="no_keys_just_confirm">Ja confieu en aquest contacte. Si seleccioneu \"fet\", només confirma que forma %s part d\'aquest xat en grup.</string>
-  <string name="select_image_and_crop">Seleccioneu la imatge i retalleu</string>
   <string name="this_account_is_disabled">Heu desactivat aquest compte</string>
   <string name="security_error_invalid_file_access">Error de seguretat: accés d\'arxiu no vàlid</string>
   <string name="no_application_to_share_uri">No s\'ha trobat cap aplicació que comparteixi URI</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 99b7d3668..486ea5085 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -440,7 +440,6 @@
   <string name="this_field_is_required">Toto pole je vyžadováno</string>
   <string name="correct_message">Opravit zprávu</string>
   <string name="send_corrected_message">Odeslat opravenou zprávu</string>
-  <string name="select_image_and_crop">Vybrat obrázek a oříznout</string>
   <string name="this_account_is_disabled">Tento účet byl vypnut</string>
   <string name="security_error_invalid_file_access">Chyba zabezpečení: Neplatný přístup k souboru</string>
   <string name="no_application_to_share_uri">Nebyla nalezena aplikace pro sdílení URI</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3571f186c..a665b409c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Alle Kontakte von %s sperren?</string>
   <string name="unblock_domain_text">Alle Kontakte von %s entsperren?</string>
   <string name="contact_blocked">Kontakt gesperrt</string>
+  <string name="blocked">Gesperrt</string>
   <string name="remove_bookmark_text">Möchtest du %s von deiner Kontaktliste entfernen? Die Unterhaltung mit dieser Konferenz wird dabei nicht entfernt.</string>
   <string name="register_account">Neues Konto auf Server erstellen</string>
   <string name="change_password_on_server">Passwort ändern</string>
@@ -509,7 +510,6 @@
   <string name="correct_message">Nachricht korrigieren</string>
   <string name="send_corrected_message">Korrigierte Nachricht senden</string>
   <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieses Gruppenchats ist.</string>
-  <string name="select_image_and_crop">Bild auswählen und zuschneiden</string>
   <string name="this_account_is_disabled">Du hast dieses Konto deaktiviert</string>
   <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string>
   <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 6dc9fcdb7..c5649618e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string>
   <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string>
   <string name="contact_blocked">Contacto bloqueado</string>
+  <string name="blocked">Bloqueado</string>
   <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string>
   <string name="register_account">Registrar nueva cuenta en servidor</string>
   <string name="change_password_on_server">Cambiar contraseña en servidor</string>
@@ -509,7 +510,6 @@
   <string name="correct_message">Corregir mensaje</string>
   <string name="send_corrected_message">Enviar mensaje corregido</string>
   <string name="no_keys_just_confirm">Ya confías en este contacto. Seleccionando \'hecho\', estás confirmando que %s es parte de esta conversación.</string>
-  <string name="select_image_and_crop">Seleccionar imagen y recortar</string>
   <string name="this_account_is_disabled">Has deshabilitado esta cuenta</string>
   <string name="security_error_invalid_file_access">Error de seguridad: Acceso a fichero inválido</string>
   <string name="no_application_to_share_uri">No se ha encontrado ninguna aplicación para compartir la URI</string>
@@ -714,5 +714,5 @@
   <string name="copy_jabber_id">Copiar Identificador Jabber</string>
   <string name="p1_s3_filetransfer">Compartición de Archivos mediante S3</string>
   <string name="pref_start_search">Búsqueda directa</string>
-  <string name="pref_start_search_summary">Al cambiar a la pantalla de conversación abir el teclado y poner el cursor en el campo de búsqueda</string>
+  <string name="pref_start_search_summary">En la pantalla de \'Nueva Conversación\' abrir el teclado y poner el cursor en el campo de búsqueda</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 6d4bc8638..3fd311ad3 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">%s(r)en kontaktu guztiak blokeatu?</string>
   <string name="unblock_domain_text">%s(r)en kontaktu guztiak desblokeatu?</string>
   <string name="contact_blocked">Kontaktua blokeatu da</string>
+  <string name="blocked">Blokeatuta</string>
   <string name="remove_bookmark_text">%s laster-marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string>
   <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
   <string name="change_password_on_server">Pasahitza zerbitzarian aldatu</string>
@@ -293,6 +294,7 @@
   <string name="check_x_filesize_on_host">Egiaztatu %1$sren neurria %2$s ostalarian</string>
   <string name="message_options">Mezuaren aukerak</string>
   <string name="quote">Aipatu</string>
+  <string name="paste_as_quote">Aipamen bezala itsatsi</string>
   <string name="copy_original_url">Jatorrizko URLa kopiatu</string>
   <string name="send_again">Berriro bidali</string>
   <string name="file_url">Fitxategiaren URLa</string>
@@ -508,7 +510,6 @@
   <string name="correct_message">Mezua zuzendu</string>
   <string name="send_corrected_message">Mezu zuzendua bidali</string>
   <string name="no_keys_just_confirm">Kontaktu honetaz fidatzen zara dagoeneko. \'Eginda\' hautatuz %s talde honen kidea dela egiaztatzen duzu besterik gabe.</string>
-  <string name="select_image_and_crop">Irudia hautatu eta moztu</string>
   <string name="this_account_is_disabled">Kontu hau ezgaitu duzu</string>
   <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>
@@ -712,4 +713,6 @@
   <string name="copy_link">Web helbidea kopiatu</string>
   <string name="copy_jabber_id">Jabber IDa kopiatu</string>
   <string name="p1_s3_filetransfer">HTTP fitxategiak partekatzea S3rentzako</string>
+  <string name="pref_start_search">Bilaketa zuzena</string>
+  <string name="pref_start_search_summary">\'Elkarrizketa hasi\' pantailan teklatua ireki eta kurtsorea bilaketa eremuan jarri</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 7aa1337a0..8996c5918 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -508,7 +508,6 @@
   <string name="correct_message">Corriger le message</string>
   <string name="send_corrected_message">Envoyer le message corrigé</string>
   <string name="no_keys_just_confirm">Vous faites déjà confiance à ce contact. En sélectionnant \"terminé\", vous confirmez simplement que %s fait partie de ce groupe de discussion.</string>
-  <string name="select_image_and_crop">Sélectionner et découper une image</string>
   <string name="this_account_is_disabled">Vous avez désactivé ce compte</string>
   <string name="security_error_invalid_file_access">Erreur de sécurité : accès fichier non-valide</string>
   <string name="no_application_to_share_uri">Aucune application trouvée pour partager l\'URI</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index d14ba9449..fa3cd2f1d 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -508,7 +508,6 @@
   <string name="correct_message">Correxir mensaxe</string>
   <string name="send_corrected_message">Enviar mensaxe correxida</string>
   <string name="no_keys_just_confirm">Xa confia neste contacto. Ao seleccionar \'feito\' só está confirmando que %s é parte deste chat grupal.</string>
-  <string name="select_image_and_crop">Escoller imaxe e recortar</string>
   <string name="this_account_is_disabled">Deshabilitou esta conta</string>
   <string name="security_error_invalid_file_access">Fallo na seguridade: Acceso non válido ao ficheiro</string>
   <string name="no_application_to_share_uri">Non se atopou un aplicativo para compartir URI</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 76d289663..e9b14429c 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -18,7 +18,7 @@
   <string name="title_activity_manage_accounts">Fiókok kezelése</string>
   <string name="title_activity_settings">Beállítások</string>
   <string name="title_activity_sharewith">Megosztás Conversation-nel</string>
-  <string name="title_activity_start_conversation">Beszéljünk!</string>
+  <string name="title_activity_start_conversation">Beszélgessünk!</string>
   <string name="title_activity_choose_contact">Válassz névjegyet</string>
   <string name="title_activity_share_via_account">Megosztás fiókon keresztül</string>
   <string name="title_activity_block_list">Tiltólista</string>
@@ -42,6 +42,7 @@
   <string name="block_domain_text">%s minden névjegyét tiltja?</string>
   <string name="unblock_domain_text">%s minden tiltását feloldja</string>
   <string name="contact_blocked">Ismerős letiltva</string>
+  <string name="blocked">Letiltva</string>
   <string name="remove_bookmark_text">Szeretnéd eltávolítani %s nevű névjegyet a könyvjelzőkből? A beszélgetésetek nem fog törlődni.</string>
   <string name="register_account">Új fiók létrehozása a szerveren</string>
   <string name="change_password_on_server">Jelszó megváltoztatása a szerveren</string>
@@ -293,6 +294,7 @@
   <string name="check_x_filesize_on_host">Ellenőrizze a %1$s méretét a %2$s oldalon</string>
   <string name="message_options">Műveletek üzenetekkel</string>
   <string name="quote">Idéz</string>
+  <string name="paste_as_quote">Beillesztés idézetként</string>
   <string name="copy_original_url">Eredeti URL másolása</string>
   <string name="send_again">Elküldi újra</string>
   <string name="file_url">Fájl URL-je</string>
@@ -508,7 +510,6 @@
   <string name="correct_message">Üzenet szerkesztése</string>
   <string name="send_corrected_message">Kijavított üzenet küldése</string>
   <string name="no_keys_just_confirm">Már megbízik ebben a kapcsolatban. A \"kész\" beállítás kiválasztásával csak megerősíti, hogy %s része a konferenciának.</string>
-  <string name="select_image_and_crop">Válassza ki a képet és vágja körbe</string>
   <string name="this_account_is_disabled">Letiltotta ezt a fiókot</string>
   <string name="security_error_invalid_file_access">Biztonsági hiba: Érvénytelen fájl hozzáférés</string>
   <string name="no_application_to_share_uri">Nem találtunk URI-t használó alkalmazást</string>
@@ -711,4 +712,7 @@
   <string name="pref_use_share_location_plugin_summary">Használja a Helymegosztás bővítményt a beépített térkép helyett</string>
   <string name="copy_link">Webcím másolása</string>
   <string name="copy_jabber_id">Jabber azonosító másolása</string>
+  <string name="p1_s3_filetransfer">HTTP fájlmegosztás S3-nak</string>
+  <string name="pref_start_search">Közvetlen keresés</string>
+  <string name="pref_start_search_summary">A \"Beszélgessünk\" képernyőn nyissa meg a billentyűzetet, és helyezze a kurzort a keresőmezőbe</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 41b2e87fb..74ce43255 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -355,7 +355,6 @@
   <string name="this_field_is_required">Bagian ini wajib diisi</string>
   <string name="correct_message">Perbaiki pesan</string>
   <string name="send_corrected_message">Kirim perbaikan pesan</string>
-  <string name="select_image_and_crop">Pilih gambar dan sesuaikan</string>
   <string name="share_uri_with">Bagikan URI dengan...</string>
   <string name="your_full_jid_will_be">Jabber ID anda akan seperti: %s</string>
   <string name="create_account">Buat Akun</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 1eb06b1d4..7c8b22364 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -509,7 +509,6 @@
   <string name="correct_message">Correggi messaggio</string>
   <string name="send_corrected_message">Invia messaggio corretto</string>
   <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa chat di gruppo.</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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index f5f44b971..80dc74a3a 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -487,7 +487,6 @@
   <string name="correct_message">メッセージを修正</string>
   <string name="send_corrected_message">修正したメッセージを送信</string>
   <string name="no_keys_just_confirm">この連絡先を既に信用しています。\'done\'を選択すれば %s をグループチャットに加えることを承認します。</string>
-  <string name="select_image_and_crop">画像の選択とトリミング</string>
   <string name="this_account_is_disabled">このアカウントを無効にしました</string>
   <string name="security_error_invalid_file_access">セキュリティエラー: 不正なファイルアクセス</string>
   <string name="no_application_to_share_uri">URI を共有するアプリケーションが見つかりません</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 545281463..c150e31c1 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -438,7 +438,6 @@
   <string name="this_field_is_required">반드시 작성해야 합니다</string>
   <string name="correct_message">메세지 정정</string>
   <string name="send_corrected_message">정정한 메세지 전송</string>
-  <string name="select_image_and_crop">이미지 선택 후 자르기</string>
   <string name="this_account_is_disabled">이 계정을 비활성화했습니다</string>
   <string name="security_error_invalid_file_access">보안 오류 : 잘못된 파일 액세스</string>
   <string name="no_application_to_share_uri">URI를 공유하는 응용 프로그램을 찾을 수 없습니다</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index c5c6df514..65499d3ff 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -496,7 +496,6 @@
   <string name="correct_message">Korriger melding</string>
   <string name="send_corrected_message">Send korrigert melding</string>
   <string name="no_keys_just_confirm">Du stoler allerede på denne kontakten. Ved å velge \'ferdig\' bekrefter du bare at %s er en del av denne gruppesludringen.</string>
-  <string name="select_image_and_crop">Velg bilde og utsnitt</string>
   <string name="this_account_is_disabled">Du har skrudd av denne kontoen</string>
   <string name="security_error_invalid_file_access">Sikkerhetsfeil: Ugyldig filtilgang</string>
   <string name="no_application_to_share_uri">Fant inget program til deling av URI</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a28b5ece2..167f9703f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Alle contacten van %s blokkeren?</string>
   <string name="unblock_domain_text">Alle contacten van %s deblokkeren?</string>
   <string name="contact_blocked">Contact geblokkeerd</string>
+  <string name="blocked">Geblokkeerd</string>
   <string name="remove_bookmark_text">Wil je %s als bladwijzer verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string>
   <string name="register_account">Nieuwe account op server registreren</string>
   <string name="change_password_on_server">Wachtwoord op server veranderen</string>
@@ -509,7 +510,6 @@
   <string name="correct_message">Bericht corrigeren</string>
   <string name="send_corrected_message">Gecorrigeerd bericht versturen</string>
   <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string>
-  <string name="select_image_and_crop">Afbeelding kiezen en bijsnijden</string>
   <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string>
   <string name="security_error_invalid_file_access">Beveiligingsfout: Ongeldige bestandstoegang</string>
   <string name="no_application_to_share_uri">Geen applicatie om URI te delen</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 6f8c8fc87..4fd21aaf1 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -293,6 +293,7 @@
   <string name="check_x_filesize_on_host">Sprawdź rozmiar %1$s na %2$s</string>
   <string name="message_options">Opcje wiadomości</string>
   <string name="quote">Cytat</string>
+  <string name="paste_as_quote">Wklej jako cytat</string>
   <string name="copy_original_url">Skopiuj oryginalny URL</string>
   <string name="send_again">Wyślij ponownie</string>
   <string name="file_url">URL pliku</string>
@@ -514,7 +515,6 @@
   <string name="correct_message">Popraw wiadomość</string>
   <string name="send_corrected_message">Wyślij poprawioną wiadomość</string>
   <string name="no_keys_just_confirm">Już zaufałeś temu kontaktowi. Wybierając \'zrobione\' potwierdzasz, że %s jest członkiem konferencji.</string>
-  <string name="select_image_and_crop">Wybierz i przytnij obraz</string>
   <string name="this_account_is_disabled">Wyłączyłeś to konto</string>
   <string name="security_error_invalid_file_access">Błąd bezpieczeństwa: nieprawidłowy dostęp do pliku</string>
   <string name="no_application_to_share_uri">Nie odnaleziono aplikacji skojarzonej z URI</string>
@@ -733,4 +733,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="copy_link">Skopiuj URL</string>
   <string name="copy_jabber_id">Skopiuj JID</string>
   <string name="p1_s3_filetransfer">Udostępnianie plików przez HTTP S3</string>
+  <string name="pref_start_search">Wyszukiwanie bezpośrednie</string>
+  <string name="pref_start_search_summary">Na ekranie \'Rozpocznij konwersację\' otwórz klawiaturę i umieść kursor w polu wyszukiwania</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index d4fe18b1e..90311a979 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -509,7 +509,6 @@
   <string name="correct_message">Corrigir a mensagem</string>
   <string name="send_corrected_message">Enviar a mensagem corrigida</string>
   <string name="no_keys_just_confirm">Você já confia neste contato. Ao selecionar \'Concluído\' você está apenas confirmando que %s é parte desta conversa em grupo.</string>
-  <string name="select_image_and_crop">Selecione e recorte a imagem</string>
   <string name="this_account_is_disabled">Você desabilitou essa conta</string>
   <string name="security_error_invalid_file_access">Erro de segurança: Acesso inválido ao arquivo</string>
   <string name="no_application_to_share_uri">Não foi encontrado nenhum aplicativo para compartilhar a URI</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 58cf8379c..b0da9140d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -421,7 +421,6 @@
   <string name="this_field_is_required">Este campo é obrigatório</string>
   <string name="correct_message">Corrigir mensagem</string>
   <string name="send_corrected_message">Enviar mensagem corrigida</string>
-  <string name="select_image_and_crop">Selecione imagem e corte</string>
   <string name="this_account_is_disabled">Desativou esta conta</string>
   <string name="security_error_invalid_file_access">Erro de segurança: Acesso ao ficheiro inválido</string>
   <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para partilhar o URI</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index d8a8c250f..55c36f227 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Blochează toate contactele de la %s?</string>
   <string name="unblock_domain_text">Deblochează toate contactele de la %s?</string>
   <string name="contact_blocked">Contact blocat</string>
+  <string name="blocked">Blocat</string>
   <string name="remove_bookmark_text">Ați dori să ștergeți pe %s din semne de carte? Conversația asociată cu acest semn de carte nu va fi ștearsă.</string>
   <string name="register_account">Înregistrează un cont nou pe server</string>
   <string name="change_password_on_server">Schimbă parola pe server</string>
@@ -514,7 +515,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="correct_message">Corecție mesaj</string>
   <string name="send_corrected_message">Trimite text corectat</string>
   <string name="no_keys_just_confirm">Deja aveți încredere în acest contact. Selectând \'gata\' doar confirmați că %s ia parte la această discuție de grup.</string>
-  <string name="select_image_and_crop">Selectează imaginea și decupează</string>
   <string name="this_account_is_disabled">Ați dezactivat acest cont</string>
   <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fișier invalid</string>
   <string name="no_application_to_share_uri">Nu s-a găsit nici o aplicație care să partajeze adresa</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 3c60e8343..dcb1bf8aa 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -507,7 +507,6 @@
   <string name="correct_message">Исправить сообщение</string>
   <string name="send_corrected_message">Отправить исправленное сообщение</string>
   <string name="no_keys_just_confirm">Вы уже доверяете этому контакту. Выбрав «готово», вы только подтвердите, что %s является участником конференции.</string>
-  <string name="select_image_and_crop">Выбрать изображение</string>
   <string name="this_account_is_disabled">Вы отключили этот аккаунт</string>
   <string name="security_error_invalid_file_access">Ошибка безопасности: недействительный доступ к файлу</string>
   <string name="no_application_to_share_uri">Не найдено приложения для отправки</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index da4c9e658..1f827cac8 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -449,7 +449,6 @@
   <string name="this_field_is_required">Ово поље је захтевано</string>
   <string name="correct_message">Исправи поруку</string>
   <string name="send_corrected_message">Пошаљи исправљену поруку</string>
-  <string name="select_image_and_crop">Изабери слику и опсеци</string>
   <string name="this_account_is_disabled">Искључили сте овај налог</string>
   <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string>
   <string name="no_application_to_share_uri">Нема апликације за дељење веза</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 0bee9228e..832bfcc8a 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -446,7 +446,6 @@
   <string name="this_field_is_required">Detta fält måste fyllas i</string>
   <string name="correct_message">Korrigera meddelanden</string>
   <string name="send_corrected_message">Skicka korrigerat meddelande</string>
-  <string name="select_image_and_crop">Välj bild och beskär</string>
   <string name="this_account_is_disabled">Du har deaktiverat detta konto</string>
   <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string>
   <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 7808a0ea9..1a5d3562a 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -442,7 +442,6 @@
   <string name="this_field_is_required">Bu alan zorunludur</string>
   <string name="correct_message">ileti düzelt</string>
   <string name="send_corrected_message">Düzeltilmiş iletiyi gönder</string>
-  <string name="select_image_and_crop">Resmi seçip kırpın</string>
   <string name="this_account_is_disabled">Bu hesabı devre dışı bıraktınız</string>
   <string name="security_error_invalid_file_access">Güvenlik hatası: Geçersiz dosya erişimi</string>
   <string name="no_application_to_share_uri">URI paylaşmak için uygulama bulunamadı</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index cd85ff2c3..1a58da9d0 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -458,7 +458,6 @@
   <string name="this_field_is_required">Це поле вимагається</string>
   <string name="correct_message">Виправити повідомлення</string>
   <string name="send_corrected_message">Відправити виправлене повідомлення</string>
-  <string name="select_image_and_crop">Виберати й обрізати зображення</string>
   <string name="this_account_is_disabled">Ви вимкнули цей обліковий запис</string>
   <string name="security_error_invalid_file_access">Помилка безпеки: Недійсний доступ до файлу</string>
   <string name="no_application_to_share_uri">Не знайдено програми, щоб поділитися URI</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 58b8a84f3..482008b1c 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -42,10 +42,11 @@
   <string name="block_domain_text">屏蔽 %s 中的所有联系人？</string>
   <string name="unblock_domain_text">解除对 %s 中所有联系人的屏蔽？</string>
   <string name="contact_blocked">联系人已屏蔽</string>
+  <string name="blocked">已屏蔽</string>
   <string name="remove_bookmark_text">从书签中移除 %s ？相关会话消息不会被清除 .</string>
   <string name="register_account">在服务器上注册新账户</string>
   <string name="change_password_on_server">在服务器上改变密码</string>
-  <string name="share_with">分享</string>
+  <string name="share_with">分享……</string>
   <string name="start_conversation">开始会话</string>
   <string name="invite_contact">邀请联系人</string>
   <string name="contacts">联系人</string>
@@ -293,6 +294,7 @@
   <string name="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
   <string name="message_options">消息选项</string>
   <string name="quote">引用</string>
+  <string name="paste_as_quote">粘贴引用</string>
   <string name="copy_original_url">复制原始URL</string>
   <string name="send_again">重新发送</string>
   <string name="file_url">文件URL</string>
@@ -479,10 +481,10 @@
     <item quantity="other">%d 条消息</item>
   </plurals>
   <string name="load_more_messages">载入更多消息</string>
-  <string name="shared_file_with_x">用 %s 分享文件</string>
-  <string name="shared_image_with_x">用 %s 分享图片</string>
-  <string name="shared_images_with_x">图片分享自 %s</string>
-  <string name="shared_text_with_x">用 %s 分享文本</string>
+  <string name="shared_file_with_x">文件已分享给%s</string>
+  <string name="shared_image_with_x">图片已分享给%s</string>
+  <string name="shared_images_with_x">多张图片已分享给%s</string>
+  <string name="shared_text_with_x">文本已分享给%s</string>
   <string name="no_storage_permission">Conversations 需要外部储存权限</string>
   <string name="no_camera_permission">Conversations 需要摄像头权限</string>
   <string name="sync_with_contacts">同步联系人</string>
@@ -507,10 +509,9 @@
   <string name="correct_message">更正消息</string>
   <string name="send_corrected_message">发送更正后的消息</string>
   <string name="no_keys_just_confirm">您已经验证了该用户。 点击‘确认’即可让 %s 加入该群。 </string>
-  <string name="select_image_and_crop">选择照片并裁剪</string>
   <string name="this_account_is_disabled">你已经禁用了此账户</string>
   <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string>
-  <string name="no_application_to_share_uri">没有可以分享此链接的应用</string>
+  <string name="no_application_to_share_uri">未找到可以分享此链接的应用</string>
   <string name="share_uri_with">分享链接……</string>
   <string name="welcome_text">Jabber 是一个独立即时通讯网络服务商。无论您选择何种 Jabber 服务器，您都可使用本客户端\n但是为了让您更方便些，我们希望您在 conversations.im¹ 创建账号，它专门为 Conversations 服务。</string>
   <string name="magic_create_text">我们将会引导你完成在 conversations.im¹ 上注册账号的过程。\n当获得了 conversations.im 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。</string>
@@ -579,9 +580,9 @@
   <string name="verified_fingerprints">已验证的指纹</string>
   <string name="use_camera_icon_to_scan_barcode">使用相机扫描一个联系人的条码</string>
   <string name="please_wait_for_keys_to_be_fetched">请等待密钥被获取</string>
-  <string name="share_as_barcode">以条码的形式分享</string>
-  <string name="share_as_uri">以 XMPP URI 的形式分享</string>
-  <string name="share_as_http">以 HTTP 链接的形式分享</string>
+  <string name="share_as_barcode">分享条形码</string>
+  <string name="share_as_uri">分享XMPP URI</string>
+  <string name="share_as_http">分享HTTP链接</string>
   <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
   <string name="pref_blind_trust_before_verification_summary">自动信任之前未经过验证的联系人的所有新设备，并在每次验证的联系人添加新设备时提示手动确认。</string>
   <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥</string>
@@ -701,8 +702,10 @@
   <string name="gif">GIF</string>
   <string name="view_conversation">查看对话</string>
   <string name="pref_use_share_location_plugin">分享位置插件</string>
-  <string name="pref_use_share_location_plugin_summary">使用共享位置插件而不是内置地图</string>
+  <string name="pref_use_share_location_plugin_summary">使用分享位置插件而不是地图内置</string>
   <string name="copy_link">复制web地址</string>
   <string name="copy_jabber_id">复制Jabber ID</string>
   <string name="p1_s3_filetransfer">用于S3的HTTP文件共享</string>
+  <string name="pref_start_search">直接搜索</string>
+  <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索栏中</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 6171064bd..296a4f15c 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -447,7 +447,6 @@
   <string name="this_field_is_required">必填</string>
   <string name="correct_message">更正訊息</string>
   <string name="send_corrected_message">發送更正後的訊息</string>
-  <string name="select_image_and_crop">選擇照片並裁剪</string>
   <string name="this_account_is_disabled">你已經禁用了此帳戶</string>
   <string name="security_error_invalid_file_access">安全錯誤：檔案存取無效</string>
   <string name="no_application_to_share_uri">找不到可以分享網址(URI)的應用程式</string>