diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 7beee60e0..b95a59b18 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -359,7 +359,6 @@
   <string name="pdf_document">مستند PDF</string>
   <string name="apk">تطبيق اندرويد</string>
   <string name="vcard">تواصل</string>
-  <string name="received_x_file">تم التلقي %s</string>
   <string name="touch_to_open_conversations">ألمس لفتح تطبيق المحادثات</string>
   <string name="avatar_has_been_published">تم نشر الصورة الرمزية !</string>
   <string name="sending_x_file">ارسال %s</string>
@@ -375,7 +374,6 @@
   <string name="show_location">أظهر الموقع</string>
   <string name="no_application_found_to_display_location">لم يتم العثور على أي تطبيق يسمح بعرض الموقع الجغرافي</string>
   <string name="location">الموقع</string>
-  <string name="received_location">تلقيت موقعا</string>
   <string name="title_undo_swipe_out_conversation">تم إغلاق المحادثة</string>
   <string name="title_undo_swipe_out_muc">عادَر مجموعة المحادثة</string>
   <string name="pref_dont_trust_system_cas_title">لا تثق في سلطات شهادات النظام</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 13ac90aa0..1f79af0ac 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF документ</string>
   <string name="apk">Приложение за Андроид</string>
   <string name="vcard">Контакт</string>
-  <string name="received_x_file">Получихте %s</string>
   <string name="touch_to_open_conversations">Докоснете, за да отворите Conversations</string>
   <string name="avatar_has_been_published">Аватарът беше публикуван!</string>
   <string name="sending_x_file">Изпращане на %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Показване на местоположението</string>
   <string name="no_application_found_to_display_location">Няма намерено приложение за показване на местоположението</string>
   <string name="location">Местоположение</string>
-  <string name="received_location">Получено местоположение</string>
   <string name="title_undo_swipe_out_conversation">Conversation се затвори</string>
   <string name="title_undo_swipe_out_muc">Напуснахте груповия разговор</string>
   <string name="pref_dont_trust_system_cas_title">Да не се вярва на системните сертификати</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index e6b966344..438ac8aca 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -389,7 +389,6 @@ mentrestant.</string>
   <string name="pdf_document">Document PDF</string>
   <string name="apk">Aplicació d\'Android</string>
   <string name="vcard">Contacte</string>
-  <string name="received_x_file">Rebut %s</string>
   <string name="touch_to_open_conversations">Tocar per obrir les conversacions</string>
   <string name="avatar_has_been_published">L\'avatar ha sigut publicat!</string>
   <string name="sending_x_file">Enviant %s</string>
@@ -405,7 +404,6 @@ mentrestant.</string>
   <string name="show_location">Mostrar localització</string>
   <string name="no_application_found_to_display_location">No s\'ha trobat cap aplicació per mostrar la localització</string>
   <string name="location">Localització</string>
-  <string name="received_location">Localització rebuda</string>
   <string name="title_undo_swipe_out_conversation">Conversa tancada</string>
   <string name="title_undo_swipe_out_muc">Sortir del xat en grup</string>
   <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 24a82892f..bfa572346 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -332,7 +332,6 @@
   <string name="pdf_document">dokument PDF</string>
   <string name="apk">Aplikace pro Android</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">%s přijat</string>
   <string name="touch_to_open_conversations">Ťuknout pro otevření Konverzace</string>
   <string name="avatar_has_been_published">Avatar byl zveřejněn!</string>
   <string name="sending_x_file">Odesílám %s</string>
@@ -345,7 +344,6 @@
   <string name="show_location">Zobrazit pozici</string>
   <string name="no_application_found_to_display_location">Nebyla nalezena aplikace pro zobrazení pozice</string>
   <string name="location">Pozice</string>
-  <string name="received_location">Přijmout pozici</string>
   <string name="title_undo_swipe_out_conversation">Conversation zavřena</string>
   <string name="pref_dont_trust_system_cas_title">Nedůvěřovat systémovým CA</string>
   <string name="pref_dont_trust_system_cas_summary">Všechny certifikáty musí být schváleny ručně</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f3a050ab7..1e6bb2453 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF-Dokument</string>
   <string name="apk">Android App</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">%s empfangen</string>
   <string name="touch_to_open_conversations">Antippen, um Conversations zu öffnen</string>
   <string name="avatar_has_been_published">Avatar wurde gespeichert</string>
   <string name="sending_x_file">%s wird gesendet</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Standort anzeigen</string>
   <string name="no_application_found_to_display_location">Keine App für die Standort-Anzeige gefunden</string>
   <string name="location">Standort</string>
-  <string name="received_location">Standort empfangen</string>
   <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
   <string name="title_undo_swipe_out_muc">Gruppenchat verlassen</string>
   <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen nicht vertrauen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 83d86ae7d..c1bb41382 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -328,7 +328,6 @@
   <string name="pdf_document">έγγραφο PDF</string>
   <string name="apk">Εφαρμογή Android</string>
   <string name="vcard">Επαφή</string>
-  <string name="received_x_file">Λήψη του %s</string>
   <string name="touch_to_open_conversations">Επιλέξτε για να ανοίξετε το Conversations</string>
   <string name="avatar_has_been_published">Η εικόνα προφίλ έχει δημοσιευτεί!</string>
   <string name="sending_x_file">Αποστολή του %s</string>
@@ -340,7 +339,6 @@
   <string name="show_location">Εμφάνιση τοποθεσίας</string>
   <string name="no_application_found_to_display_location">Δεν βρέθηκε εφαρμογή για την απεικόνιση τοποθεσίας</string>
   <string name="location">Τοποθεσία</string>
-  <string name="received_location">Ελήφθη τοποθεσία</string>
   <string name="title_undo_swipe_out_conversation">Η συζήτηση έκλεισε</string>
   <string name="pref_dont_trust_system_cas_title">Μη έμπιστες αρχές πιστοποίησης συστήματος</string>
   <string name="pref_dont_trust_system_cas_summary">Όλα τα πιστοποιητικά πρέπει να εγκριθούν χειροκίνητα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index e758c8f2d..ca9f49408 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">documento PDF</string>
   <string name="apk">Android App</string>
   <string name="vcard">Contacto</string>
-  <string name="received_x_file">Recibido %s</string>
   <string name="touch_to_open_conversations">Pulsa para abrir Conversations</string>
   <string name="avatar_has_been_published">¡La imagen de perfil ha sido publicada!</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Mostrar ubicación</string>
   <string name="no_application_found_to_display_location">No se ha encontrado ninguna aplicación para mostrar la ubicación</string>
   <string name="location">Ubicación</string>
-  <string name="received_location">Ubicación recibida</string>
   <string name="title_undo_swipe_out_conversation">Conversación cerrada</string>
   <string name="title_undo_swipe_out_muc">Salir de la conversación</string>
   <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
@@ -513,11 +511,11 @@
   <string name="no_application_to_share_uri">No se ha encontrado ninguna aplicación para compartir la URI</string>
   <string name="share_uri_with">Compartir URI con...</string>
   <string name="welcome_text">Jabber es una red de mensajería instantánea independiente del proveedor. Puedes usar este cliente con cualquier servidor Jabber que elijas.\nSin embargo, para tu conveniencia, hacemos de forma sencilla la creación de una cuenta en conversations.im¹; un proveedor especialmente especializado para el uso con Conversations.</string>
-  <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.¹\nCuando selecciones conversations.im como proveedor, podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber.</string>
+  <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.¹\nCuando selecciones conversations.im como proveedor podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber.</string>
   <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
   <string name="create_account">Crear cuenta</string>
   <string name="use_own_provider">Usar otro proveedor de mi elección</string>
-  <string name="pick_your_username">Selecciona tu nombre de usuario</string>
+  <string name="pick_your_username">Elige tu nombre de usuario</string>
   <string name="pref_manually_change_presence">Gestionar disponibilidad manualmente</string>
   <string name="pref_manually_change_presence_summary">Establezca su disponibilidad cuando edite su mensaje de estado.</string>
   <string name="status_message">Mensaje de estado</string>
@@ -608,7 +606,7 @@
   </plurals>
   <plurals name="hours">
     <item quantity="one">%d hora</item>
-    <item quantity="other">%dhoras</item>
+    <item quantity="other">%d horas</item>
   </plurals>
   <plurals name="days">
     <item quantity="one">%d día</item>
@@ -687,7 +685,7 @@
   <string name="default_on">Activo por defecto</string>
   <string name="default_off">Desactivado por defecto</string>
   <string name="small">Pequeño</string>
-  <string name="medium">Medio</string>
+  <string name="medium">Mediano</string>
   <string name="large">Grande</string>
   <string name="not_encrypted_for_this_device">El mensaje no fue cifrado para este dispositivo.</string>
   <string name="undo">deshacer</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 170068763..88eb0dba0 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF dokumentua</string>
   <string name="apk">Android aplikazioa</string>
   <string name="vcard">Kontaktua</string>
-  <string name="received_x_file">%s jaso da</string>
   <string name="touch_to_open_conversations">Ikutu Conversations irekitzeko</string>
   <string name="avatar_has_been_published">Profileko argazkia argitaratu da</string>
   <string name="sending_x_file">%s bidaltzen</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Kokapena erakutsi</string>
   <string name="no_application_found_to_display_location">Kokapena erakutsi dezakeen aplikaziorik ez da aurkitu</string>
   <string name="location">Kokapena</string>
-  <string name="received_location">Kokapena jaso da</string>
   <string name="title_undo_swipe_out_conversation">Elkarrizketa itxi egin da</string>
   <string name="title_undo_swipe_out_muc">Taldea utzi egin da</string>
   <string name="pref_dont_trust_system_cas_title">Sistemaren CAtaz ez fidatu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 3e7814449..801db38aa 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">document PDF</string>
   <string name="apk">Application Android</string>
   <string name="vcard">Contact</string>
-  <string name="received_x_file">%s reçu(e)</string>
   <string name="touch_to_open_conversations">Cliquez pour ouvrir Conversations</string>
   <string name="avatar_has_been_published">L\'avatar a été publié !</string>
   <string name="sending_x_file">%s en cours d\'envoi</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Afficher la position</string>
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
   <string name="location">Position</string>
-  <string name="received_location">Position reçue</string>
   <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
   <string name="title_undo_swipe_out_muc">Quitter le groupe de discussion</string>
   <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 90b84d7b2..b7f336592 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -385,7 +385,6 @@
   <string name="pdf_document">documento PDF</string>
   <string name="apk">App Android</string>
   <string name="vcard">Contacto</string>
-  <string name="received_x_file">Recibido %s</string>
   <string name="touch_to_open_conversations">Toque para abrir Conversations</string>
   <string name="avatar_has_been_published">Publicouse o avatar</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -401,7 +400,6 @@
   <string name="show_location">Mostrar localización</string>
   <string name="no_application_found_to_display_location">Non se atopou un aplicativo para mostrar a localización</string>
   <string name="location">Localización</string>
-  <string name="received_location">Localización recibida</string>
   <string name="title_undo_swipe_out_conversation">Pechouse a conversa</string>
   <string name="title_undo_swipe_out_muc">Deixar a conversa en grupo</string>
   <string name="pref_dont_trust_system_cas_title">Non confiar nas CAs do sistema</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 6d9fd295e..9b0a9fdf6 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF dokumentum</string>
   <string name="apk">Android applikáció</string>
   <string name="vcard">Névjegy</string>
-  <string name="received_x_file">Fogadott fájl: %s</string>
   <string name="touch_to_open_conversations">A Conversations megnyitásához érintse meg</string>
   <string name="avatar_has_been_published">A önarckép publikálva lett!</string>
   <string name="sending_x_file">Küldés alatt: %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Hely mutatása</string>
   <string name="no_application_found_to_display_location">Nincs alkalmazás a helyzetének megjelenítéséhez</string>
   <string name="location">Hely</string>
-  <string name="received_location">Kapott hely</string>
   <string name="title_undo_swipe_out_conversation">A beszélgetés lezárult</string>
   <string name="title_undo_swipe_out_muc">A konferenciát elhagyta</string>
   <string name="pref_dont_trust_system_cas_title">Ne bízzon a rendszer hitelesítésekben</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index d68a86347..0d47b4a79 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -294,7 +294,6 @@
   <string name="pdf_document">Berkas PDF</string>
   <string name="apk">Apl Android</string>
   <string name="vcard">Kontak</string>
-  <string name="received_x_file">Diterima %s</string>
   <string name="touch_to_open_conversations">Sentuh untuk membuka Conversations</string>
   <string name="avatar_has_been_published">Avatar telah diterbitkan!</string>
   <string name="sending_x_file">Mengirim %s</string>
@@ -307,7 +306,6 @@
   <string name="show_location">Tampilkan lokasi</string>
   <string name="no_application_found_to_display_location">Tidak ada aplikasi ditemukan untuk menampilkan lokasi</string>
   <string name="location">Lokasi</string>
-  <string name="received_location">Lokasi yang diterima</string>
   <string name="title_undo_swipe_out_conversation">Percakapan tertutup</string>
   <string name="pref_dont_trust_system_cas_title">Jangan percaya sistem CA</string>
   <string name="pref_dont_trust_system_cas_summary">Semua sertifikat harus disetujui secara manual</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6b18b9711..ee8efe23c 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">Documento PDF</string>
   <string name="apk">Applicazione Android</string>
   <string name="vcard">Contatto</string>
-  <string name="received_x_file">Ricevuto %s</string>
   <string name="touch_to_open_conversations">Tocca per avviare Conversations</string>
   <string name="avatar_has_been_published">Il tuo avatar è stato pubblicato!</string>
   <string name="sending_x_file">Invio %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Mostra la posizione</string>
   <string name="no_application_found_to_display_location">Non è stata trovata alcuna applicazione per mostrare la posizione</string>
   <string name="location">Posizione</string>
-  <string name="received_location">Posizione ricevuta</string>
   <string name="title_undo_swipe_out_conversation">Conversazione interrotta</string>
   <string name="title_undo_swipe_out_muc">Chat di gruppo abbandonata</string>
   <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index b78679870..448153128 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -287,7 +287,6 @@
   <string name="pdf_document">מסמך PDF</string>
   <string name="apk">אפליקציית אנדרויד</string>
   <string name="vcard">איש קשר</string>
-  <string name="received_x_file">התקבל %s</string>
   <string name="touch_to_open_conversations">לחץ כדי לפתוח את Conversations</string>
   <string name="avatar_has_been_published">תמונת הפרופיל פורסמה!</string>
   <string name="sending_x_file">שולח %s</string>
@@ -300,7 +299,6 @@
   <string name="show_location">הראה מיקום</string>
   <string name="no_application_found_to_display_location">לא נמצאה אפליקציית המראה את המיקום</string>
   <string name="location">מיקום</string>
-  <string name="received_location">מיקום שהתקבל</string>
   <string name="title_undo_swipe_out_conversation">השיחה נסגרה</string>
   <string name="pref_dont_trust_system_cas_title">אל תסמוך על ה- CAs של המערכת</string>
   <string name="pref_dont_trust_system_cas_summary">כל החתימות הדיגטליות יצטרכו לעבור אימות ידני</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 9171e4d26..85c06da12 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -375,7 +375,6 @@
   <string name="pdf_document">PDF 文書</string>
   <string name="apk">Android アプリ</string>
   <string name="vcard">連絡先</string>
-  <string name="received_x_file">%s を受信しました</string>
   <string name="touch_to_open_conversations">タッチして Conversations を開く</string>
   <string name="avatar_has_been_published">アバターを公開しました!</string>
   <string name="sending_x_file">%s の送信中</string>
@@ -391,7 +390,6 @@
   <string name="show_location">位置を表示</string>
   <string name="no_application_found_to_display_location">位置を表示するアプリケーションが見つかりません</string>
   <string name="location">位置</string>
-  <string name="received_location">位置を受信しました</string>
   <string name="title_undo_swipe_out_conversation">会話が閉じられました</string>
   <string name="title_undo_swipe_out_muc">談話室を退出</string>
   <string name="pref_dont_trust_system_cas_title">システムの CA を信頼しない</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 126b4e9b0..19cece22c 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -336,7 +336,6 @@
   <string name="pdf_document">PDF 문서 </string>
   <string name="apk">안드로이드 앱 </string>
   <string name="vcard">연락처 </string>
-  <string name="received_x_file">%s 수신 </string>
   <string name="touch_to_open_conversations">터치해서 Conversations 열기 </string>
   <string name="avatar_has_been_published">아바타가 공개되었습니다 </string>
   <string name="sending_x_file">%s 전송중 </string>
@@ -352,7 +351,6 @@
   <string name="show_location">위치 표시 </string>
   <string name="no_application_found_to_display_location">위치를 표시할 수 있는 앱이 발견되지 않았습니다 </string>
   <string name="location">위치 </string>
-  <string name="received_location">위치 수신 </string>
   <string name="title_undo_swipe_out_conversation">대화 끝남 </string>
   <string name="pref_dont_trust_system_cas_title">시스템 CA를 신뢰하지 않음 </string>
   <string name="pref_dont_trust_system_cas_summary">모든 인증서는 수동으로 승인되어야 함 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index c69af5461..b94364621 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -385,7 +385,6 @@
   <string name="pdf_document">PDF-dokument</string>
   <string name="apk">Android-app</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">Mottatt %s</string>
   <string name="touch_to_open_conversations">Trykk for å åpne Conversations</string>
   <string name="avatar_has_been_published">Avatar publisert!</string>
   <string name="sending_x_file">Sender %s</string>
@@ -401,7 +400,6 @@
   <string name="show_location">Vis plasseringsdata</string>
   <string name="no_application_found_to_display_location">Ingen programmer funnet til visning av plasseringsdata</string>
   <string name="location">Plasseringsdata</string>
-  <string name="received_location">Mottok plasseringsdata</string>
   <string name="title_undo_swipe_out_conversation">Samtale lukket</string>
   <string name="title_undo_swipe_out_muc">Forlot gruppesludringen</string>
   <string name="pref_dont_trust_system_cas_title">Ikke stol på systemets CA-er</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 336958dcc..947468325 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF-document</string>
   <string name="apk">Android-applicatie</string>
   <string name="vcard">Contact</string>
-  <string name="received_x_file">%s ontvangen</string>
   <string name="touch_to_open_conversations">Tik om Conversations te openen</string>
   <string name="avatar_has_been_published">Avatar is gepubliceerd!</string>
   <string name="sending_x_file">Bezig met versturen van %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Locatie weergeven</string>
   <string name="no_application_found_to_display_location">Geen applicatie om locatie weer te geven</string>
   <string name="location">Locatie</string>
-  <string name="received_location">Locatie ontvangen</string>
   <string name="title_undo_swipe_out_conversation">Gesprek gesloten</string>
   <string name="title_undo_swipe_out_muc">Groepsgesprek verlaten</string>
   <string name="pref_dont_trust_system_cas_title">Systeem-CA\'s niet vertrouwen</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 0d0a9268d..87f732b10 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">Dokument PDF</string>
   <string name="apk">Aplikacja Androida</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">Odebrano %s</string>
   <string name="touch_to_open_conversations">Dotknij, aby otworzyć Conversations</string>
   <string name="avatar_has_been_published">Avatar został pomyślnie opublikowany!</string>
   <string name="sending_x_file">Wysyłanie %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Pokaż lokalizację</string>
   <string name="no_application_found_to_display_location">Nie odnaleziono aplikacji do wyświetlenia lokalizacji</string>
   <string name="location">Lokalizacja</string>
-  <string name="received_location">Otrzymano lokalizację</string>
   <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
   <string name="title_undo_swipe_out_muc">Opuszczono konferencję</string>
   <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 408e9c451..074567285 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -49,6 +49,7 @@
   <string name="start_conversation">Iniciar conversa</string>
   <string name="invite_contact">Convidar contato</string>
   <string name="contacts">Contatos</string>
+  <string name="contact">Contato</string>
   <string name="cancel">Cancelar</string>
   <string name="set">Definir</string>
   <string name="add">Adicionar</string>
@@ -322,6 +323,7 @@
   <string name="file_deleted">O arquivo foi excluído</string>
   <string name="no_application_found_to_open_file">Não foi encontrado nenhum aplicativo para abrir o arquivo</string>
   <string name="no_application_found_to_open_link">Não foi encontrado nenhum aplicativo para abrir o link</string>
+  <string name="pref_show_dynamic_tags">Etiquetas dinâmicas</string>
   <string name="pref_show_dynamic_tags_summary">Exibe etiquetas de somente-leitura abaixo dos contatos.</string>
   <string name="enable_notifications">Habilitar notificações</string>
   <string name="no_conference_server_found">Não foi encontrado nenhum servidor de conversas em grupo</string>
@@ -386,7 +388,6 @@
   <string name="pdf_document">Documento PDF</string>
   <string name="apk">Aplicativo Android</string>
   <string name="vcard">Contato</string>
-  <string name="received_x_file">%s recebido</string>
   <string name="touch_to_open_conversations">Toque para abrir o Conversations</string>
   <string name="avatar_has_been_published">O avatar foi publicado.</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -402,7 +403,6 @@
   <string name="show_location">Exibir localização</string>
   <string name="no_application_found_to_display_location">Não foi encontrado nenhum aplicativo para exibir a localização</string>
   <string name="location">Localização</string>
-  <string name="received_location">Localização recebida</string>
   <string name="title_undo_swipe_out_conversation">A conversa foi fechada</string>
   <string name="title_undo_swipe_out_muc">Deixar a conversa em grupo</string>
   <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
@@ -674,4 +674,19 @@
   <string name="error_trustkey_hint_mutual">Dica: Em alguns casos isso pode ser resolvido adicionando-se um ao outro na lista de contatos.</string>
   <string name="disable_encryption_message">Tem certeza que deseja desabilitar a criptografia OMEMO nesta conversa?\nIsso permitirá que o administrador do seu servidor seja capaz de ler suas mensagens. Por outro lado, pode ser a única forma de se comunicar com pessoas usando clientes desatualizados.</string>
   <string name="disable_now">Desabilitar agora</string>
+  <string name="draft">Rascunho:</string>
+  <string name="pref_omemo_setting">Criptografia OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO será sempre utilizado em conversas um-para-um e de grupos privados.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO será utilizado por padrão em novas conversas.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO deverá ser explicitamente ativado para novas conversas.</string>
+  <string name="create_shortcut">Criar atalho</string>
+  <string name="pref_font_size">Tamanho da fonte</string>
+  <string name="pref_font_size_summary">O tamanho relativo da fonte utilizada no app.</string>
+  <string name="default_on">Ligado por padrão</string>
+  <string name="default_off">Desligado por padrão</string>
+  <string name="small">Pequena</string>
+  <string name="medium">Média</string>
+  <string name="large">Grande</string>
+  <string name="not_encrypted_for_this_device">A mensagem não foi criptografada para este dispositivo.</string>
+  <string name="undo">desfazer</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index bbeacbb46..9b7e0bfce 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -323,7 +323,6 @@
   <string name="pdf_document">Documento PDF</string>
   <string name="apk">Aplicação Android</string>
   <string name="vcard">Contacto</string>
-  <string name="received_x_file">Recebeu %s</string>
   <string name="touch_to_open_conversations">Toque para abrir Conversations</string>
   <string name="avatar_has_been_published">O avatar foi publicado!</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -336,7 +335,6 @@
   <string name="show_location">Exibir localização</string>
   <string name="no_application_found_to_display_location">Não foi encontrada nenhuma aplicação para mostrar a localização</string>
   <string name="location">Localização</string>
-  <string name="received_location">Localização recebida</string>
   <string name="title_undo_swipe_out_conversation">Conversa fechada</string>
   <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos os certificados têm que ser aprovados manualmente</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 1ab571333..53bd6e1dc 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">document PDF</string>
   <string name="apk">Aplicație Android</string>
   <string name="vcard">Contact</string>
-  <string name="received_x_file">Primit %s</string>
   <string name="touch_to_open_conversations">Atingeți pentru a deschide Conversations</string>
   <string name="avatar_has_been_published">Avatarul a fost publicat!</string>
   <string name="sending_x_file">Trimit %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">Arată locația</string>
   <string name="no_application_found_to_display_location">Nu s-a găsit nici o aplicație care să afișeze locația</string>
   <string name="location">Locatie</string>
-  <string name="received_location">Locație primită</string>
   <string name="title_undo_swipe_out_conversation">Conversație închisă</string>
   <string name="title_undo_swipe_out_muc">A părăsit discuția de grup</string>
   <string name="pref_dont_trust_system_cas_title">Nu ai încredere în CA din sistem</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d1b51729d..20432bbd3 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -382,7 +382,6 @@
   <string name="pdf_document">PDF-документ</string>
   <string name="apk">Приложение Android</string>
   <string name="vcard">Контакт</string>
-  <string name="received_x_file">Получено %s</string>
   <string name="touch_to_open_conversations">Коснитесь, чтобы открыть Conversations</string>
   <string name="avatar_has_been_published">Аватар загружен!</string>
   <string name="sending_x_file">Отправляется %s</string>
@@ -398,7 +397,6 @@
   <string name="show_location">Показать местоположение</string>
   <string name="no_application_found_to_display_location">Не найдено приложений для отображения местоположения</string>
   <string name="location">Местоположение</string>
-  <string name="received_location">Получено местоположение</string>
   <string name="title_undo_swipe_out_conversation">Беседа окончена</string>
   <string name="title_undo_swipe_out_muc">Покинул конференцию</string>
   <string name="pref_dont_trust_system_cas_title">Не доверять системным УЦ</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index a92fa54e9..e58c886df 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -281,7 +281,6 @@
   <string name="pdf_document">dokument PDF</string>
   <string name="apk">Android App</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">Prijatý %s</string>
   <string name="touch_to_open_conversations">Kliknite na spustenie Conversations</string>
   <string name="avatar_has_been_published">Avatar sa publikoval!</string>
   <string name="sending_x_file">Posielam %s</string>
@@ -293,7 +292,6 @@
   <string name="show_location">Zobraziť polohu</string>
   <string name="no_application_found_to_display_location">Nenašla sa aplikácia na zobrazenie polohy</string>
   <string name="location">Poloha</string>
-  <string name="received_location">Prijatá poloha</string>
   <string name="title_undo_swipe_out_conversation">Konverzácia zatvorená</string>
   <string name="pref_dont_trust_system_cas_title">Nedôverovať systému CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Všetky certifikáty musia byť ručne schválené</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 3d1636294..7c0fecfc2 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -341,7 +341,6 @@
   <string name="pdf_document">ПДФ документ</string>
   <string name="apk">Апликација за Андроид</string>
   <string name="vcard">Контакт</string>
-  <string name="received_x_file">Примљено %s</string>
   <string name="touch_to_open_conversations">Тапните да отворите Конверзацију</string>
   <string name="avatar_has_been_published">Аватар је објављен!</string>
   <string name="sending_x_file">Шаљем %s</string>
@@ -357,7 +356,6 @@
   <string name="show_location">Прикажи локацију</string>
   <string name="no_application_found_to_display_location">Нема апликације за приказ локације</string>
   <string name="location">Локација</string>
-  <string name="received_location">Примљена локација</string>
   <string name="title_undo_swipe_out_conversation">Преписка затворена</string>
   <string name="pref_dont_trust_system_cas_title">Не поуздај се у системска сертификациона тела</string>
   <string name="pref_dont_trust_system_cas_summary">Сви сертификати морају ручно да се одобре</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 71478223b..94a00a407 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -341,7 +341,6 @@
   <string name="pdf_document">PDF-dokument</string>
   <string name="apk">Android-app</string>
   <string name="vcard">Kontakt</string>
-  <string name="received_x_file">Tagit emot %s</string>
   <string name="touch_to_open_conversations">Tryck för att öppna Conversations</string>
   <string name="avatar_has_been_published">Avatarbild har publicerats!</string>
   <string name="sending_x_file">Skickar %s</string>
@@ -357,7 +356,6 @@
   <string name="show_location">Visa position</string>
   <string name="no_application_found_to_display_location">Kunde inte hitta applikation för att visa position</string>
   <string name="location">Position</string>
-  <string name="received_location">Mottog position</string>
   <string name="title_undo_swipe_out_conversation">Konversation stängd</string>
   <string name="pref_dont_trust_system_cas_title">Lita inte på systemets CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Alla certifikat måste manuellt godkännas</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index e0b6c7d79..ec20968ef 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -337,7 +337,6 @@
   <string name="pdf_document">PDF belgesi</string>
   <string name="apk">Android uygulaması</string>
   <string name="vcard">Kişi</string>
-  <string name="received_x_file">%s alındı</string>
   <string name="touch_to_open_conversations">Conversations’ı başlatmak için dokunun</string>
   <string name="avatar_has_been_published">Avatar yayımlandı!</string>
   <string name="sending_x_file">%s gönderiliyor</string>
@@ -353,7 +352,6 @@
   <string name="show_location">Yer bildirimi göster</string>
   <string name="no_application_found_to_display_location">Yer bildirimi için bir uygulama bulunamadı</string>
   <string name="location">Yer</string>
-  <string name="received_location">Bildirilen yer</string>
   <string name="title_undo_swipe_out_conversation">Konuşma sonlandı</string>
   <string name="pref_dont_trust_system_cas_title">Sistem sertifikalarına güvenmeyin</string>
   <string name="pref_dont_trust_system_cas_summary">Tüm sertifikalar bizzat onaylanmalıdır</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 533415805..f7a1ec268 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -343,7 +343,6 @@
   <string name="pdf_document">PDF документ</string>
   <string name="apk">програма Android</string>
   <string name="vcard">Контакт</string>
-  <string name="received_x_file">Отримано %s</string>
   <string name="touch_to_open_conversations">Торкніться, щоб відкрити Розмови</string>
   <string name="avatar_has_been_published">Аватар опубліковано!</string>
   <string name="sending_x_file">Відправка %s</string>
@@ -359,7 +358,6 @@
   <string name="show_location">Показати місцезнаходження</string>
   <string name="no_application_found_to_display_location">Не знайдено програми, щоб показати місцезнаходження</string>
   <string name="location">Місцезнаходження</string>
-  <string name="received_location">Отримано місцезнаходження</string>
   <string name="title_undo_swipe_out_conversation">Розмову закрито</string>
   <string name="pref_dont_trust_system_cas_title">Не довіряти системним центрам сертифікації</string>
   <string name="pref_dont_trust_system_cas_summary">Усі сертифікати мають бути підтверджені вручну</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 62b38e33a..65b219b10 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -323,7 +323,6 @@
   <string name="pdf_document">tài liệu PDF</string>
   <string name="apk">Ứng dụng Android</string>
   <string name="vcard">Liên hệ</string>
-  <string name="received_x_file">Đã nhận %s</string>
   <string name="touch_to_open_conversations">Chạm để mở Conversations</string>
   <string name="avatar_has_been_published">Đã đăng tải ảnh đại diện!</string>
   <string name="sending_x_file">Đang gửi %s</string>
@@ -336,7 +335,6 @@
   <string name="show_location">Hiện vị trí</string>
   <string name="no_application_found_to_display_location">Không thấy ứng dụng nào có thể hiện vị trí</string>
   <string name="location">Vị trí</string>
-  <string name="received_location">Vị trí đã nhận</string>
   <string name="title_undo_swipe_out_conversation">Đã đóng cuộc hội thoại</string>
   <string name="pref_dont_trust_system_cas_title">Đừng tin các CA hệ thống</string>
   <string name="pref_dont_trust_system_cas_summary">Tất cả chứng nhận phải được phê duyệt thủ công</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9fdc2183d..ac2315ce1 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -388,7 +388,6 @@
   <string name="pdf_document">PDF 文档</string>
   <string name="apk">Android App</string>
   <string name="vcard">联系人</string>
-  <string name="received_x_file">已经收到 %s</string>
   <string name="touch_to_open_conversations">轻触打开 Conversations</string>
   <string name="avatar_has_been_published">头像已经发布！</string>
   <string name="sending_x_file">发送中 %s</string>
@@ -404,7 +403,6 @@
   <string name="show_location">显示位置</string>
   <string name="no_application_found_to_display_location">无法找到显示位置的应用</string>
   <string name="location">位置</string>
-  <string name="received_location">位置已收到</string>
   <string name="title_undo_swipe_out_conversation">会话已关闭</string>
   <string name="title_undo_swipe_out_muc">离开群聊</string>
   <string name="pref_dont_trust_system_cas_title">不相信系统 CA</string>
@@ -669,7 +667,7 @@
   <string name="error_trustkey_hint_mutual">提示：某些情况下，可以将对方加入联系人列表，以解决此问题。</string>
   <string name="disable_encryption_message">确认要禁用此会话的 OMEMO 加密吗？\n这会允许您的服务器管理员阅读你们的消息，但这可能是和使用过时客户端的人会话的唯一方式。</string>
   <string name="disable_now">现在禁用</string>
-  <string name="draft">草案：</string>
+  <string name="draft">草稿：</string>
   <string name="pref_omemo_setting">OMEMO加密</string>
   <string name="pref_omemo_setting_summary_always">OMEMO将始终用于一对一和私人群组聊天。</string>
   <string name="pref_omemo_setting_summary_default_on">OMEMO将默认用于新对话。</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index d23b8950d..dea96be3f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -341,7 +341,6 @@
   <string name="pdf_document">PDF 文檔</string>
   <string name="apk">Android App</string>
   <string name="vcard">連絡人</string>
-  <string name="received_x_file">已經收到 %s</string>
   <string name="touch_to_open_conversations">輕觸打開 Conversations</string>
   <string name="avatar_has_been_published">頭像已經發佈！</string>
   <string name="sending_x_file">發送中 %s</string>
@@ -357,7 +356,6 @@
   <string name="show_location">顯示位置</string>
   <string name="no_application_found_to_display_location">無法找到顯示位置的應用</string>
   <string name="location">位置</string>
-  <string name="received_location">位置已收到</string>
   <string name="title_undo_swipe_out_conversation">Conversation 已關閉</string>
   <string name="pref_dont_trust_system_cas_title">不信任系統的憑證機構</string>
   <string name="pref_dont_trust_system_cas_summary">所有證書必須人工通過</string>