i18n: automatic bump

Change-Id: I14a0fdba452dc1806df8e8cadf8ebfdf8437a037
diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 4a0e954..629218d 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -262,5 +262,4 @@
   <string name="tv_audio_recording">تسجيل...</string>
   <string name="tv_send_text">أرسل نص</string>
   <string name="tv_send_audio">أرسل صوت</string>
-  <string name="tv_clear_history">محو السجل</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/ring-android/app/src/main/res/values-da/strings.xml
index e7c1c8d..a2a45c5 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -10,6 +10,7 @@
   <string name="no_browser_app_installed">Ingen webbrowser applikation fundet, installér en for at se denne side</string>
   <string name="email_chooser_title">Send mail ved brug af...</string>
   <string name="website_chooser_title">Vis websted med...</string>
+  <string name="description">Jami is free software for universal communication which respects the freedoms and privacy of its users. (Näcken)</string>
   <string name="credits">Krediteringer</string>
   <!--About dialog-->
   <string name="developed_by">Udviklet af</string>
@@ -117,6 +118,7 @@
   <string name="conversation_action_select_peer_number">Vælg et nummer</string>
   <string name="conversation_action_block_this">Bloker kontakt</string>
   <string name="conversation_action_go_to_call">Tilbage til igangeværende opkald</string>
+  <string name="conversation_contact_is_typing">Modparten skriver ........</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Tilføj %1$s?</string>
   <string name="prompt_new_password">Ny adgangskode</string>
@@ -137,7 +139,7 @@
   <string name="share_your_account_information">Del min kontaktinformation</string>
   <string name="share_label">Del</string>
   <string name="generic_error_migration">Fejl</string>
-  <string name="generic_error_migration_message">Der opstod en fejl under migrering</string>
+  <string name="generic_error_migration_message">Der opstod en fejl under overførsel</string>
   <!--Pending contact requests-->
   <string name="accept">Accepter</string>
   <string name="refuse">Afvis</string>
@@ -147,11 +149,11 @@
   <string name="contact_request_account">For %1$s</string>
   <string name="no_requests">0 kontaktforespørgsler</string>
   <string name="message_contact_not_trusted_yet">%s er ikke blandt dine kontakter endnu.\nVil du acceptere eller afvise denne kontaktforespørgsel?</string>
-  <string name="message_contact_not_trusted">%s er ikke i dine kontakter.\nTilføj en ny kontakt?</string>
+  <string name="message_contact_not_trusted">%s er ikke i dine \"kontakter\".\nTilføj en ny kontakt?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Send</string>
   <string name="send_request_title">Send en kontaktforespørgsel</string>
-  <string name="send_request_msg">Du skal sende en kontaktforespørgsel for at kommunikere med denne bruger. Så længe kontakten ikke har accepteret forespørgslen, kan du afsende beskeder men kontakten vil ikke være i stand til at besvare dem. </string>
+  <string name="send_request_msg">Du skal sende en kontaktforespørgsel for at kunne skrive sammen  med denne bruger. Så længe personen ikke har godkendt forespørgslen, kan du afsende beskeder men personen vil ikke være i stand til at besvare dem. </string>
   <!--Blacklist-->
   <string name="no_blocked_contact">0 blokerede kontakter</string>
   <!--Smartlist-->
@@ -165,10 +167,10 @@
   <!--File Transfer-->
   <string name="invalid_file">Ugyldig fil</string>
   <string name="not_able_to_write_file">Kan ikke skrive fil</string>
-  <string name="file_transfer_status_created">Initialiserer overførsel</string>
+  <string name="file_transfer_status_created">Start overførsel</string>
   <string name="file_transfer_status_unsupported">ikke understøttet</string>
-  <string name="file_transfer_status_wait_peer_acceptance">afventer modpartens accept</string>
-  <string name="file_transfer_status_wait_host_acceptance">afventer værtens accept</string>
+  <string name="file_transfer_status_wait_peer_acceptance">afventer modpartens godkendelse.</string>
+  <string name="file_transfer_status_wait_host_acceptance">afventer værtens godkendelse.</string>
   <string name="file_transfer_status_ongoing">igangværende</string>
   <string name="file_transfer_status_finished">afsluttet</string>
   <string name="file_transfer_status_closed_by_host">lukket af vært</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index c29c4b7..6aa66fa 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -15,6 +15,8 @@
   <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter <u>GNU General Public License Version 3 oder später</u></string>
   <string name="description">Jami ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.</string>
   <string name="credits">Abspann</string>
+  <string name="call_service_description">Dieser Dienst ist erforderlich, damit Ihre Anrufe im Vordergrund bleiben. Er wird nur während eines Anrufs ausgeführt.</string>
+  <string name="data_transfer_service_description">Dieser Dienst ist erforderlich, um dauerhafte Benachrichtigungen während der Dateiübertragung anzuzeigen. Er wird nur während der Dateiübertragung ausgeführt.</string>
   <!--About dialog-->
   <string name="developed_by">Entwickelt von</string>
   <string name="designed_by">Entworfen von</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
index 4e7980e..2e8c4d3 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Jami die Nutzung von 3G/LTE zusätzlich zu WLAN erlauben</string>
   <string name="pref_pushNotifications_title">Push-Benachrichtigungen</string>
   <string name="pref_pushNotifications_summary">Google-Server verwenden, um den Empfang von Anrufen/Nachrichten im Hintergrund zu ermöglichen</string>
+  <string name="pref_video_advanced_title">Erweiterte Videoeinstellungen</string>
+  <string name="pref_video_advanced_summary">Ändern Sie die Videobitrate, die Auflösung und greifen Sie auf experimentelle Funktionen zu</string>
   <string name="pref_hd_summary">HD-Videoübertragung aktivieren</string>
   <string name="pref_hwEncode_title">Hardware-Beschleunigung für den Encoder verwenden</string>
   <string name="pref_hwEncode_summary">Experimentelle Funktion</string>
@@ -19,6 +21,7 @@
   <string name="pref_startOnBoot_title">Jami beim Hochfahren starten</string>
   <string name="pref_startOnBoot_summary">Jami im Hintergrund ausführen während das System startet.</string>
   <string name="pref_clearHistory_title">Verlauf löschen</string>
+  <string name="pref_clearHistory_summary">Löschen Sie den gesamten Konversationsverlauf. Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="pref_persistNotification_title">Im Hintergrund ausführen</string>
   <string name="pref_persistNotification_summary">Ausführung im Hintergrund zulassen, um Anrufe und Nachrichten zu empfangen.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index b3cdcba..48919ab 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -49,7 +49,7 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Verpasster eingehender Anruf</string>
-  <string name="notif_missed_outgoing_call">Verpasster ausgehender Anruf</string>
+  <string name="notif_missed_outgoing_call">Ausgehender Anruf fehlgeschlagen</string>
   <string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
   <string name="notif_incoming_call">Eingehender Anruf</string>
   <string name="notif_outgoing_call_title">Ausgehender Anruf von %1$s</string>
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">Konto</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Audionachricht senden?</string>
+  <string name="tv_send_image_dialog_message">Bild senden?</string>
+  <string name="tv_send_video_dialog_message">Video senden?</string>
+  <string name="tv_media_preview">Vorschau</string>
   <string name="tv_audio_play">Abspielen</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Senden</string>
   <string name="tv_audio_recording">Aufnahme...</string>
   <string name="tv_send_text">Text senden</string>
   <string name="tv_send_audio">Audio senden</string>
-  <string name="tv_clear_history">Verlauf leeren</string>
+  <string name="tv_send_video">Medien senden</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 4d6ac07..29ea767 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -99,6 +99,7 @@
   <!--Share fragment-->
   <string name="share_message_no_account">Επιλέξτε έναν λογαριασμό για διαμοιρασμό.</string>
   <string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
+  <string name="share_label">Κοινοποίηση</string>
   <string name="generic_error_migration">Σφάλμα</string>
   <string name="generic_error_migration_message">Δημιουργήθηκε σφάλμα κατα την μετακίνηση</string>
   <!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 8fd0cae..200808b 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -51,6 +51,8 @@
   <!--restore/backup-->
   <string name="account_export_end_network_title">Σφάλμα δικτύου</string>
   <string name="account_export_end_error_title">Σφάλμα</string>
+  <string name="account_enter_password">Εισάγετε τον κωδικό πρόσβασης</string>
+  <string name="account_link_prompt_pin">Εισάγετε PIN</string>
   <string name="account_link_export_button">Σύνδεση μιας άλλης συσκευής σε αυτόν το λογαριασμό</string>
   <string name="account_connect_prompt_username">Όνομα χρήστη</string>
   <!--Name registration-->
@@ -62,4 +64,5 @@
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
+  <string name="enter_password">Εισάγετε τον κωδικό πρόσβασης</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index 79025aa..8cca235 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -258,5 +258,4 @@
   <string name="tv_audio_recording">Grabando...</string>
   <string name="tv_send_text">Enviar texto</string>
   <string name="tv_send_audio">Enviar audio</string>
-  <string name="tv_clear_history">Borrar historial</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 2e9ff99..2e98e55 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -253,11 +253,14 @@
   <string name="navigation_item_account">Cuenta</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">¿Enviar mensaje de audio?</string>
+  <string name="tv_send_image_dialog_message">¿Enviar la imagen?</string>
+  <string name="tv_send_video_dialog_message">¿Enviar el vídeo?</string>
+  <string name="tv_media_preview">Previsualización</string>
   <string name="tv_audio_play">Reproducir</string>
   <string name="tv_audio_pause">Pausar</string>
   <string name="tv_dialog_send">Enviar</string>
   <string name="tv_audio_recording">Grabando...</string>
   <string name="tv_send_text">Enviar texto</string>
   <string name="tv_send_audio">Enviar audio</string>
-  <string name="tv_clear_history">Limpiar historial</string>
+  <string name="tv_send_video">Enviar contenido</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-et/strings.xml b/ring-android/app/src/main/res/values-et/strings.xml
new file mode 100644
index 0000000..994bee8
--- /dev/null
+++ b/ring-android/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <!--About dialog-->
+  <!--RingActivity-->
+  <!--AB menus-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <string name="conversation_action_history_clear">Kustuta ajalugu</string>
+  <string name="conversation_action_block_this">Blokeeri kontakt</string>
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+  <!--Share fragment-->
+  <!--Pending contact requests-->
+  <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
+  <!--File Transfer-->
+  <!--Bottom Navigation-->
+  <string name="navigation_item_conversation">Vestlused</string>
+  <!--TV-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-et/strings_preferences.xml b/ring-android/app/src/main/res/values-et/strings_preferences.xml
new file mode 100644
index 0000000..ee0051f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-et/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_clearHistory_title">Kustuta ajalugu</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/ring-android/app/src/main/res/values-eu/strings.xml
index 984720f..d665f17 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -258,5 +258,4 @@
   <string name="tv_audio_recording">Grabatzen…</string>
   <string name="tv_send_text">Bidali testua</string>
   <string name="tv_send_audio">Bidali audioa</string>
-  <string name="tv_clear_history">garbitu historiala</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index d5efa3a..4bf05ce 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">حساب</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">ارسال پیام صوتی؟</string>
+  <string name="tv_send_image_dialog_message">ارسال تصویر؟</string>
+  <string name="tv_send_video_dialog_message">ارسال ویدیو؟</string>
+  <string name="tv_media_preview">پیش‌نمایش</string>
   <string name="tv_audio_play">پخش</string>
   <string name="tv_audio_pause">مکث</string>
   <string name="tv_dialog_send">ارسال</string>
   <string name="tv_audio_recording">در حال ضبط...</string>
   <string name="tv_send_text">ارسال متن</string>
   <string name="tv_send_audio">ارسال صدا</string>
-  <string name="tv_clear_history">پاک‌سازی تاریخچه</string>
+  <string name="tv_send_video">ارسال محتوای رسانه‌ای</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index f653836..97ff4a9 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -124,9 +124,9 @@
   <string name="account_rtp_port_range">دامنه درگاه RTP صدا</string>
   <!--restore/backup-->
   <string name="account_new_device_password">برای قفل‌گشایی حساب، گذرواژه اصلی را وارد کنید</string>
-  <string name="error_password_char_count">حداقل ۶ کاراکتر</string>
+  <string name="error_password_char_count">حداقل ۶ نویسه</string>
   <string name="error_passwords_not_equals">گذرواژه‌ها یکسان نیستند</string>
-  <string name="export_account_wait_title">لطفاً صبر کنید…</string>
+  <string name="export_account_wait_title">لطفا صبر کنید…</string>
   <string name="export_account_wait_message">برون‌برد (ذخیره) اطلاعات حساب</string>
   <string name="account_export_file">حساب کاربری پشتیبان</string>
   <string name="account_export_end_decryption_message">نمی‌توان قفل حسابتان را با گذرواژه  فراهم شده گشود.</string>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings.xml b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
index ae9a99a..997a286 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
@@ -15,7 +15,9 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <!--Call Fragment-->
+  <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <!--Text messages-->
+  <string name="message_failed">Échec</string>
   <!--MediaPreferenceFragment-->
   <!--Ringtone activity-->
   <!--Read contacts permission-->
@@ -23,19 +25,26 @@
   <!--QRCode Scan-->
   <!--Settings-->
   <!--Conversation-->
+  <string name="conversation_action_block_this">Bloquer le contact</string>
   <!--Contacts-->
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="wizard_skip">Passer</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
   <!--Share fragment-->
+  <string name="share_label">Partager</string>
   <!--Pending contact requests-->
+  <string name="accept">Accepter</string>
+  <string name="refuse">Refuser</string>
   <!--Send contact requests-->
+  <string name="send_request_button">Envoyer</string>
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Contacts</string>
   <!--File Transfer-->
+  <string name="menu_message_copy">Copier</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
+  <string name="tv_dialog_send">Envoyer</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml b/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
index 9fd4b65..75f5193 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
@@ -23,6 +23,7 @@
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
   <!--Name registration-->
+  <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créez votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml b/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml
new file mode 100644
index 0000000..90ff94e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <string name="call_human_state_failure">Échec</string>
+    <!-- Conferences -->
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 85473af..83ebbec 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -96,6 +96,7 @@
   <string name="conversation_action_copy_peer_number">Copier le numéro</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copié dans le presse papiers</string>
   <string name="conversation_action_select_peer_number">Sélectionner un numéro de téléphone</string>
+  <string name="conversation_action_block_this">Bloquer le contact</string>
   <!--Contacts-->
   <string name="prompt_new_password">Nouveau mot de passe</string>
   <string name="prompt_new_password_optional">Nouveau mot de passe (optionnel)</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings.xml b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
index ae9a99a..997a286 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
@@ -15,7 +15,9 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <!--Call Fragment-->
+  <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <!--Text messages-->
+  <string name="message_failed">Échec</string>
   <!--MediaPreferenceFragment-->
   <!--Ringtone activity-->
   <!--Read contacts permission-->
@@ -23,19 +25,26 @@
   <!--QRCode Scan-->
   <!--Settings-->
   <!--Conversation-->
+  <string name="conversation_action_block_this">Bloquer le contact</string>
   <!--Contacts-->
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="wizard_skip">Passer</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
   <!--Share fragment-->
+  <string name="share_label">Partager</string>
   <!--Pending contact requests-->
+  <string name="accept">Accepter</string>
+  <string name="refuse">Refuser</string>
   <!--Send contact requests-->
+  <string name="send_request_button">Envoyer</string>
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Contacts</string>
   <!--File Transfer-->
+  <string name="menu_message_copy">Copier</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
+  <string name="tv_dialog_send">Envoyer</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
index 9fd4b65..75f5193 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
@@ -23,6 +23,7 @@
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
   <!--Name registration-->
+  <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créez votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml b/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml
new file mode 100644
index 0000000..90ff94e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <string name="call_human_state_failure">Échec</string>
+    <!-- Conferences -->
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index a949493..462496c 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -258,5 +258,4 @@
   <string name="tv_audio_recording">Enregistrement en cours...</string>
   <string name="tv_send_text">Envoyer du texte</string>
   <string name="tv_send_audio">Envoyer de l\'audio</string>
-  <string name="tv_clear_history">effacer l\'historique</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
index b76f456..ceb6359 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
@@ -41,6 +41,7 @@
   <string name="account_link_export_button">Connecter un autre appareil à ce compte</string>
   <string name="account_connect_prompt_username">nom d\'utilisateur</string>
   <!--Name registration-->
+  <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <string name="account_status_unknown">Inconnu</string>
   <string name="account_status_error">Erreur</string>
   <!--Create account-->
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 49f43b0..ce08843 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Envoyer le message audio ?</string>
+  <string name="tv_send_image_dialog_message">Envoyer l\'image ?</string>
+  <string name="tv_send_video_dialog_message">Envoyer la vidéo ?</string>
+  <string name="tv_media_preview">Aperçu</string>
   <string name="tv_audio_play">Lire</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Envoyer</string>
   <string name="tv_audio_recording">Enregistrement...</string>
   <string name="tv_send_text">Envoyer un texte</string>
   <string name="tv_send_audio">Envoyer le message audio </string>
-  <string name="tv_clear_history">Effacer l\'historique</string>
+  <string name="tv_send_video">Envoyer le média</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-gl/strings.xml b/ring-android/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 0000000..cb0892d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,265 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <string name="feedback_section">A túa opinión</string>
+  <string name="report"><u>Envíanos un email</u></string>
+  <string name="section_license">Licenza</string>
+  <string name="sponsor_section">Jami é software libre desenvolto e mantido por</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contribuír</string>
+  <string name="version_section">Versión</string>
+  <string name="no_email_app_installed">Non se atopa unha app de correo, instala unha e envíanos un informe</string>
+  <string name="no_browser_app_installed">Non se atopou unha app de navegador, instala unha para ver esta páxina</string>
+  <string name="email_chooser_title">Enviar email utilizando...</string>
+  <string name="website_chooser_title">Ver sitio web utilizando...</string>
+  <string name="license">Este software proporcionase \"tal como é\", sen garantía de ningún tipo: Ao detalle en <u>GNU General Public License versión 3 ou posterior</u></string>
+  <string name="description">Jami é software libre para comunicacións universais e que respecta as liberdades e privacidade das súas usuarias.</string>
+  <string name="credits">Cŕedito</string>
+  <string name="call_service_description">Este servizo é preciso para manter as túas chamadas en marcha en primeiro plano. Só funciona durante as chamadas.</string>
+  <string name="data_transfer_service_description">Este servizo é necesario para mostrar notificacións persistentes durante a transferencia de ficheiros. Só funciona durante as transferencias.</string>
+  <!--About dialog-->
+  <string name="developed_by">Desenvolto por</string>
+  <string name="designed_by">Deseñado por</string>
+  <string name="ringtones_by">Tonos de aviso por</string>
+  <!--RingActivity-->
+  <string name="error_no_network">Sen conexión a rede</string>
+  <string name="error_mobile_network_available_but_disabled">Por favor, dalle permiso de acceso a rede móbil na pantalla de axustes:</string>
+  <!--AB menus-->
+  <string name="ab_action_chat">Mensaxes de texto</string>
+  <!--Sections-->
+  <string name="menu_item_contact_request">Solicitudes de contacto</string>
+  <string name="menu_item_accounts">Xestionar contas</string>
+  <string name="menu_item_account">Xestionar conta</string>
+  <string name="menu_item_settings">Axustes</string>
+  <string name="menu_item_share">Compartir o meu contacto</string>
+  <string name="menu_item_about">Acerca de Jami</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">Marcar un número</string>
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%dConversa</item>
+    <item quantity="other">%d Conversas</item>
+  </plurals>
+  <!--ContactList Fragment-->
+  <string name="searchbar_hint">Buscar nome ou número de teléfono...</string>
+  <string name="choose_number">Escolle un número</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Chamada entrante perdida</string>
+  <string name="notif_missed_outgoing_call">Chamada sen resposta</string>
+  <string name="notif_incoming_call_title">Chamada de %1$s</string>
+  <string name="notif_incoming_call">Chamada entrante</string>
+  <string name="notif_outgoing_call_title">Chamada a %1$s</string>
+  <string name="notif_outgoing_call">Chamada saínte</string>
+  <string name="notif_current_call_title">Chamada en curso con %1$s</string>
+  <string name="notif_current_call">Chamada en curso</string>
+  <string name="notif_channel_call_in_progress">Chamada en progreso</string>
+  <string name="notif_channel_calls">Chamadas</string>
+  <string name="notif_channel_missed_calls">Chamadas perdidas</string>
+  <string name="notif_channel_incoming_calls">Chamadas entrantes</string>
+  <string name="notif_channel_messages">Mensaxes</string>
+  <string name="notif_channel_requests">Solicitudes</string>
+  <string name="notif_channel_file_transfer">Transferencia de ficheiro</string>
+  <string name="notif_channel_sync">Sincr. de datos</string>
+  <string name="notif_channel_background_service">Servizo en segundo plano</string>
+  <string name="notif_channel_background_service_descr">Permite recibir chamadas e mensaxes en todo momento.</string>
+  <string name="notif_group_calls">Chamadas</string>
+  <string name="notif_background_service">Jami está a funcionar en segundo plano</string>
+  <string name="notif_mark_as_read">Marcar como lido</string>
+  <string name="notif_dismiss">Desbotar</string>
+  <string name="notif_reply">Responder</string>
+  <string name="notif_incoming_file_transfer_title">Recibindo ficheiro desde %1$s</string>
+  <string name="notif_outgoing_file_transfer_title">Enviando ficheiro a %1$s</string>
+  <string name="notif_incoming_picture">Imaxe desde %1$s</string>
+  <string name="notif_sync_title">Sincr. datos...</string>
+  <string name="notif_location_title">Compartindo localización con %1$s</string>
+  <string name="location_share_contact">%1$s está compartindo a localización contigo</string>
+  <string name="notif_location_multi_title">Compartindo a localización con %1$d contactos</string>
+  <string name="notif_location_remaining">%1$d minutos restantes</string>
+  <string name="notif_location_action_stop">Deixar de compartir localización</string>
+  <string name="location_share_action_start">Comezar a compartir</string>
+  <string name="location_share_action_stop">Deixar de compartir</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">Ti:</string>
+  <string name="action_call_hangup">Colgar</string>
+  <string name="ongoing_call">Chamada en curso</string>
+  <string name="hist_in_call">Chamada de %1$s</string>
+  <string name="hist_out_call">Chamada a %1$s</string>
+  <string name="start_error_title">Jami non pode iniciarse!</string>
+  <string name="start_error_mic_required">Jami precisa permiso de acceso ao micrófono para funcionar:</string>
+  <string name="action_call_accept">Responder a chamada</string>
+  <string name="action_call_decline">Rexeitar</string>
+  <string name="action_call_mic_mute">Apagar micrófono</string>
+  <string name="ab_action_speakerphone">Activar altofalante</string>
+  <string name="ab_action_contact_add">Engadir a contactos</string>
+  <string name="ab_action_contact_add_question">Engadir a contactos?</string>
+  <string name="hist_contact_added">Contacto engadido</string>
+  <string name="hist_invitation_received">Convite recibido</string>
+  <string name="ab_action_audio_call">Chamada de audio</string>
+  <string name="ab_action_video_call">Chamada de vídeo</string>
+  <string name="ab_action_change_screen_orientation">Cambiar orientación da pantalla</string>
+  <string name="share_via">Compartir vía</string>
+  <string name="write_a_message">Escribe unha mensaxe</string>
+  <string name="scan_qr">Escanear código QR</string>
+  <string name="ab_action_flipcamera">Cambiar de cámara</string>
+  <!--Text messages-->
+  <string name="send_message">Enviar mensaxe</string>
+  <string name="message_sending">Enviando mensaxe...</string>
+  <string name="message_failed">Fallou</string>
+  <string name="time_just_now">Xusto agora</string>
+  <string name="send_file">Enviar ficheiro</string>
+  <string name="hist_file_sent">Ficheiro enviado</string>
+  <string name="hist_file_received">Ficheiro recibido</string>
+  <string name="conversation_send_audio">Gravar clip de audio</string>
+  <string name="conversation_send_video">Gravar clip de vídeo</string>
+  <string name="conversation_share_location">Compartir localización</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permiso de cámara</string>
+  <string name="permission_dialog_camera_message">As conversas con vídeo precisan poder acceder a cámara. Por favor, considera proporcionarllo.</string>
+  <!--Ringtone activity-->
+  <string name="ringtone_error_title">Erro</string>
+  <string name="ringtone_error_format_not_supported">Este formato non está soportado.</string>
+  <string name="ringtone_error_size_too_big">Este ficheiro é moi grande. O tamaño máximo é de %1$d kB.</string>
+  <string name="ringtone_custom_prompt">Establecer ton personalizado</string>
+  <string name="ringtone_custom_label">Personalizar</string>
+  <string name="ringtone_jami_tones">Tonos Jami</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami precisa permiso para \"Ler os Contactos\" para esta característica. Por favor, concédello.</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami precisa permiso \"Escritura do rexistro de chamadas\" para esta característica. Por favor, concédello.</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Escanea o código QR da conta que queres engadir.</string>
+  <string name="title_activity_qrcode">Compartir a miña conta</string>
+  <string name="error_scan_no_camera_permissions">O escáner QR precisa acceso a cámara para funcionar.</string>
+  <string name="tab_code">O meu Código</string>
+  <string name="tab_scan">Escanear Código</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Limpar historial?</string>
+  <string name="clear_history_dialog_message">Esta acción non ten volta.</string>
+  <string name="clear_history_completed">Eliminouse o historial.</string>
+  <!--Conversation-->
+  <string name="conversation_details">Detalles do contacto</string>
+  <string name="conversation_action_delete_this">Eliminar esta conversa</string>
+  <string name="conversation_action_delete_this_title">Eliminar esta conversa?</string>
+  <string name="conversation_action_delete_this_message">Esta acción non ten volta.</string>
+  <string name="conversation_action_history_clear">Eliminar historial</string>
+  <string name="conversation_action_history_clear_title">Eliminar o historial da conversa?</string>
+  <string name="conversation_action_history_clear_message">Esto eliminará definitivamente o historial da conversa.</string>
+  <string name="conversation_action_remove_this">Eliminar contacto</string>
+  <string name="conversation_action_remove_this_title">Eliminar este contacto?</string>
+  <string name="conversation_action_remove_this_message">Esto eliminará o contacto de xeito definitivo e tamén o historial da conversa.</string>
+  <string name="conversation_action_copy_peer_number">Copiar número</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado ao portapapeis</string>
+  <string name="conversation_action_select_peer_number">Escolle un número</string>
+  <string name="conversation_action_block_this">Bloquear contacto</string>
+  <string name="conversation_action_go_to_call">Voltar a chamada en curso</string>
+  <string name="conversation_open_file_error">Non hai aplicacións instaladas que poidan abrir este tipo de ficheiro.</string>
+  <string name="clip_contact_uri">Enderezo do contacto</string>
+  <string name="block_contact_dialog_title">Bloquear a %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s non poderá contactar contigo ata que o desbloquees.</string>
+  <string name="block_contact_completed">%1$s foi bloqueada.</string>
+  <string name="conversation_contact_is_typing">O contacto está a escribir...</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Engadir %1$s?</string>
+  <string name="prompt_new_password">Novo contrasinal</string>
+  <string name="prompt_new_password_optional">Novo contrasinal (optativo)</string>
+  <string name="prompt_new_password_repeat">Repetir o novo contrasinal</string>
+  <string name="account_create_title">Crear conta Jami</string>
+  <string name="prompt_new_username">Escribir novo nome de usuaria</string>
+  <string name="help_password_choose">Escolle un contrasinal forte e gárdao para protexer a túa conta Jami.</string>
+  <string name="help_password_enter">Escribe o contrasinal principal da túa conta Jami</string>
+  <string name="help_server_enter">Escribe URL do servidor de xestión</string>
+  <string name="help_pin_enter">Escribe o PIN desde a outra conta Jami configurada. Utiliza o apartado \"Exportar conta Jami\" para obter o PIN.</string>
+  <string name="wizard_next">Seguinte</string>
+  <string name="wizard_back">Atrás</string>
+  <string name="wizard_skip">Saltar</string>
+  <!--MenuHeaderView-->
+  <string name="profile">Perfil</string>
+  <string name="profile_message_warning">O teu perfil só se comparte cos teus contactos</string>
+  <string name="open_the_gallery">Abrir a galería</string>
+  <string name="take_a_photo">Tomar fotografía</string>
+  <string name="profile_name_hint">Escribe o teu nome (optativo)</string>
+  <!--Share fragment-->
+  <string name="share_message">Escanea este código con Jami</string>
+  <string name="share_message_no_account">Escolle a conta a compartir.</string>
+  <string name="share_your_account_information">Compartir a miña información de contacto</string>
+  <string name="share_label">Compartir</string>
+  <string name="generic_error_migration">Erro</string>
+  <string name="generic_error_migration_message">Algo fallou no proceso de migración</string>
+  <string name="title_share_with">Compartir con...</string>
+  <!--Pending contact requests-->
+  <string name="accept">Aceptar</string>
+  <string name="refuse">Rexeitar</string>
+  <string name="block">Bloquar</string>
+  <string name="contact_request_title">Nova solicitude de contacto</string>
+  <string name="contact_request_msg">Tes %1$s solicitudes de contacto</string>
+  <string name="contact_request_account">Para %1$s</string>
+  <string name="no_requests">0 solicitudes de contacto</string>
+  <string name="message_contact_not_trusted_yet">%s non está nos teus contactos.\nQueres aceptar ou rexeitar esta solicitude de contacto?</string>
+  <string name="message_contact_not_trusted">%s non está nos teus contactos.\nEngadir un novo contacto?</string>
+  <!--Send contact requests-->
+  <string name="send_request_button">Enviar</string>
+  <string name="send_request_title">Enviar solicitude de contacto</string>
+  <string name="send_request_msg">Tes que enviar unha solicitude de contacto para comunicarte con esta usuaria. Mentras o contacto non acepte a solicitude poderás enviar mensaxes pero o contacto non poderá responder.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 contactos bloqueados</string>
+  <!--Smartlist-->
+  <string name="no_contact_request">Non se enviaron solicitudes de contacto</string>
+  <string name="contact_request_sent">Solicitude de contacto enviada</string>
+  <string name="start_conversation">Comezar conversa</string>
+  <string name="search_results">Resultados da busca</string>
+  <string name="tv_contact_row_header">Contactos</string>
+  <string name="gallery_error_title">Non se atopa app Galería</string>
+  <string name="gallery_error_message">Non se atopa unha app no dispositivo para abrir Galería</string>
+  <string name="generic_error">Aconteceu un fallo descoñecido</string>
+  <!--File Transfer-->
+  <string name="invalid_file">Ficheiro non válido</string>
+  <string name="not_able_to_write_file">Non se pode escribir o ficheiro</string>
+  <string name="file_transfer_status_created">iniciando a transferencia</string>
+  <string name="file_transfer_status_unsupported">non soportado</string>
+  <string name="file_transfer_status_wait_peer_acceptance">agardando aceptación do par</string>
+  <string name="file_transfer_status_wait_host_acceptance">agardando aceptación do host</string>
+  <string name="file_transfer_status_ongoing">en curso</string>
+  <string name="file_transfer_status_finished">rematada</string>
+  <string name="file_transfer_status_closed_by_host">pechada polo host</string>
+  <string name="file_transfer_status_closed_by_peer">pechada polo par</string>
+  <string name="file_transfer_status_invalid_pathname">ruta non válida</string>
+  <string name="file_transfer_status_unjoinable_peer">par non accesible</string>
+  <string name="file_transfer_status_cancelled">cancelada</string>
+  <string name="file_transfer_status_error">fallou debido a un erro</string>
+  <string name="file_transfer_status_timed_out">caducada</string>
+  <string name="file_saved_in">Ficheiro gardado en %s</string>
+  <string name="file_saved_successfully">Ficheiro gardado</string>
+  <string name="no_space_left_on_device">Non queda espazo no dispositivo</string>
+  <string name="title_media_viewer">Visor de multimedia</string>
+  <string name="menu_file_open">Abrir ficheiro</string>
+  <string name="menu_file_download">Descargar ficheiro</string>
+  <string name="menu_file_save">Gardar ficheiro</string>
+  <string name="menu_file_delete">Eliminar ficheiro</string>
+  <string name="menu_file_share">Compartir ficheiro</string>
+  <string name="menu_message_copy">Copiar</string>
+  <string name="menu_message_delete">Eliminar mensaxe</string>
+  <string name="menu_message_cancel">Cancelar mensaxe</string>
+  <string name="menu_delete">Eliminar</string>
+  <string name="pref_darkTheme_title">Decorado escuro</string>
+  <string name="pref_darkTheme_summary">Activar sempre o decorado escuro no lugar de utilizar preferencias do sistema</string>
+  <!--Bottom Navigation-->
+  <string name="navigation_item_conversation">Conversas</string>
+  <string name="navigation_item_contact_request">Solicitudes de contacto</string>
+  <string name="navigation_item_account">Conta</string>
+  <!--TV-->
+  <string name="tv_send_audio_dialog_message">Enviar mensaxe de audio?</string>
+  <string name="tv_send_image_dialog_message">Enviar a imaxe?</string>
+  <string name="tv_send_video_dialog_message">Enviar vídeo?</string>
+  <string name="tv_media_preview">Vista previa</string>
+  <string name="tv_audio_play">Reproducir</string>
+  <string name="tv_audio_pause">Deter</string>
+  <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">Gravando...</string>
+  <string name="tv_send_text">Enviar texto</string>
+  <string name="tv_send_audio">Enviar audio</string>
+  <string name="tv_send_video">Enviar multimedia</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-gl/strings_account.xml b/ring-android/app/src/main/res/values-gl/strings_account.xml
new file mode 100644
index 0000000..98e1ba4
--- /dev/null
+++ b/ring-android/app/src/main/res/values-gl/strings_account.xml
@@ -0,0 +1,219 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Eliminar</string>
+  <string name="ic_advanced_menu">Axustes avanzados</string>
+  <string name="ic_blacklist_menu">Contactos bloqueados</string>
+  <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Engadir conta Jami</string>
+  <string name="add_sip_account_title">Engadir conta SIP</string>
+  <string name="ring_account_default_name">Conta Jami %1$s</string>
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Servidor</string>
+  <string name="prompt_username">Nome de usuaria</string>
+  <string name="prompt_password">Contrasinal</string>
+  <string name="action_create">Crear conta</string>
+  <string name="action_create_short">Crar</string>
+  <string name="action_register">Rexistro</string>
+  <string name="action_settings">Axuste</string>
+  <string name="error_field_required">Este campo é requerido</string>
+  <string name="dialog_wait_create">Engadindo conta</string>
+  <string name="dialog_wait_create_details">Agarda por favor mentras se engade a conta...</string>
+  <string name="dialog_wait_update">Actualizando a conta</string>
+  <string name="dialog_wait_update_details">Agarda por favor mentras se actualiza a conta...</string>
+  <string name="dialog_warn_ip2ip_account_title">Crear conta SIP baleira?</string>
+  <string name="dialog_warn_ip2ip_account_message">Vas crear unha conta SIP cun nome de servidor non válido.
+     Só poderás realizar e recibir chamadas ip directas.
+     Podes editar a conta máis tarde</string>
+  <string name="account_type_ip2ip">Conta IP</string>
+  <string name="help_ring">Unha conta Jami permíteche contactar con persoas de xeito seguro a través dunha rede distribuída.</string>
+  <string name="help_sip_title">Engade a túa conta SIP</string>
+  <string name="help_sip">Configura unha conta SIP existente.</string>
+  <string name="create_sip_account">Engadir conta SIP</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Eliminar conta?</string>
+  <string name="account_delete_dialog_message">Esta acción non ten volta atrás.</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">Non hai conta rexistrada</string>
+  <string name="normal_accounts_titles">Contas</string>
+  <string name="normal_devices_titles">Dispositivos coñecidos ligados a esta conta Jami</string>
+  <string name="account_device_revoke">Revogar dispositivo</string>
+  <string name="account_device_revocation_success_title">Feito</string>
+  <string name="account_device_revocation_success">O dispositivo foi revogado!</string>
+  <string name="account_device_revocation_error_title">Non se pode revogar o dispositivo</string>
+  <string name="account_device_revocation_wrong_password">Contrasinal incorrecto.</string>
+  <string name="account_device_revocation_unknown_device">Dispositivo descoñecido.</string>
+  <string name="account_device_revocation_error_unknown">Erro descoñecido.</string>
+  <string name="account_password_change">Cambiar contrasinal</string>
+  <string name="account_password_set">Escribe contrasinal</string>
+  <string name="account_password_change_wait_message">Cambiando contrasinal da conta</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Xeral</string>
+  <string name="account_basic_category">Axustes básicos</string>
+  <string name="account_alias_label">Nome da conta</string>
+  <string name="account_hostname_label">Servidor</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
+  <string name="account_username_label">Nome de usuaria</string>
+  <string name="account_password_label">Contrasinal</string>
+  <string name="account_optionnal_category">Axustes optativos</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Resposta automática</string>
+  <string name="account_upnp_label">Activar UPnP</string>
+  <string name="account_proxy_field">Proxy</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Multimedia</string>
+  <string name="account_ringtone_label">Tonos</string>
+  <string name="account_ringtone_enabled_label">Activar tonos de chamada</string>
+  <string name="account_ringtone_path_label">Ruta ao tono de chamada</string>
+  <string name="account_ringtone_custom_label">Utilizar tono personalizado</string>
+  <string name="account_ringtone_title">Escolle un tono de chamada</string>
+  <string name="account_ringtone_summary">Escolle un tono ou establece o teu propio</string>
+  <!--Video Details-->
+  <string name="account_video_label">Vídeo</string>
+  <string name="account_video_enable">Activar vídeo</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Avanzado</string>
+  <string name="account_dht_public_in_calls_label">Permitir chamadas entrantes de contactos descoñecidos</string>
+  <string name="account_registration_exp_label">Caducidade do rexistro</string>
+  <string name="account_local_interface_label">Interface local</string>
+  <string name="account_local_port_label">Porto local</string>
+  <string name="account_stun_enable_label">Utilizar Stun</string>
+  <string name="account_stun_server_label">Servidor Stun</string>
+  <string name="account_accept_files">Aceptar ficheiros entrantes automáticamente</string>
+  <string name="account_accept_files_max_size">Tamaño máximo para aceptar ficheiros de xeito automático</string>
+  <string name="account_accept_files_never">Nunca aceptar de xeito automático</string>
+  <string name="account_accept_files_always">Aceptar sempre de xeito automático</string>
+  <string name="size_mb">%1$d MB</string>
+  <string name="account_turn_enable_label">Usar TURN</string>
+  <string name="account_turn_server_label">Servidor TURN</string>
+  <string name="account_turn_username_label">Nome usuaria TURN</string>
+  <string name="account_turn_password_label">Contrasinal TURN</string>
+  <string name="account_published_same_as_local_label">Publicado igual que en local</string>
+  <string name="account_published_port_label">Porto publicado</string>
+  <string name="account_published_address_label">Enderezo publicado</string>
+  <string name="account_proxy_label">Proxy DHT</string>
+  <string name="account_proxy_enable_label">Utilizar proxy DHT</string>
+  <string name="account_proxy_server_label">Enderezo proxy DHT</string>
+  <string name="account_proxy_server_list_label">Lista URL do proxy DHT</string>
+  <string name="account_peer_discovery_label">Descubrimento de pares locais</string>
+  <string name="account_peer_discovery_enable_label">Activar o descubrimento de pares locais</string>
+  <string name="account_peer_discovery_enable_summary">Conectar a outros nodos DHT que se anuncian na túa rede local</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">Credenciais</string>
+  <string name="account_credentials_edit">Editar credenciais</string>
+  <string name="account_credentials_add">Engadir credenciais</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Seguridade</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Utilizar transporte TLS</string>
+  <string name="account_tls_port_label">Porto de escoita TLS</string>
+  <string name="account_tls_certificate_list_label">Autoridades Certificadoras</string>
+  <string name="account_tls_certificate_file_label">Ficheiro de certificado</string>
+  <string name="account_tls_private_key_file_label">Ficheiro de chave privada</string>
+  <string name="account_tls_password_label">Contrasinal da chave privada</string>
+  <string name="account_tls_method_label">Método TLS</string>
+  <string name="account_tls_ciphers_label">Cifrados TLS</string>
+  <string name="account_tls_server_name_label">Nome de Servidor</string>
+  <string name="account_tls_verify_server_label">Verificar servidor</string>
+  <string name="account_tls_verify_client_label">Verificar cliente</string>
+  <string name="account_tls_negotiation_timeout_sec">Caducidade da negociación (seg)</string>
+  <string name="account_rtp_max_port">Máximo</string>
+  <string name="account_rtp_min_port">Mínimo</string>
+  <string name="account_rtp_port_range">Rango de portos Audio RTP</string>
+  <!--restore/backup-->
+  <string name="account_new_device_password">Escribe o contrasinal para desbloquear a conta</string>
+  <string name="error_password_char_count">mínimo 6 caracteres</string>
+  <string name="error_passwords_not_equals">Non concordan os contrasinais</string>
+  <string name="export_account_wait_title">Agarda por favor...</string>
+  <string name="export_account_wait_message">Exportando información da conta</string>
+  <string name="account_export_file">Copia de apoio da conta</string>
+  <string name="account_export_end_decryption_message">Non se pode desbloquear a conta co contrasinal escrito.</string>
+  <string name="account_export_end_network_title">Fallo na rede</string>
+  <string name="account_export_end_network_message">Non se pode exportar a conta a rede. Comproba a conectividade.</string>
+  <string name="account_export_end_error_title">Erro</string>
+  <string name="account_export_end_error_message">Non se puido exportar a conta. Aconteceu un fallo descoñecido.</string>
+  <string name="account_enter_password">Escribir contrasinal</string>
+  <string name="account_share_body">Contacta conmigo utilizando \'%1$s\' na plataforma de comunicación distribuída Jami: %2$s</string>
+  <string name="account_share_body_with_username">Contacta conmigo utilizando \'%1$s\' ou o meu nome de usuaria público \'%2$s\' na plataforma de comunicación distribuída Jami: %3$s</string>
+  <string name="account_contact_me">Contacta conmigo en Jami!</string>
+  <string name="update_account">Actualizar conta</string>
+  <string name="account_migration">Podes actualizar a túa conta Jami.\nEscribe o contrasinal.</string>
+  <string name="ring_account">Conta Jami</string>
+  <string name="ring_account_identity">Identidade</string>
+  <string name="account_migration_title_dialog">Migración de conta</string>
+  <string name="account_migration_message_dialog">As túas contas precisan ser actualizadas. Queres ir a Xestión de Contas para realizar esta operación?</string>
+  <string name="account_update_needed">Actualización necesaria</string>
+  <string name="account_cannot_be_found_title">Non se atopou a conta</string>
+  <string name="account_cannot_be_found_message">Non se atopou a conta na rede Jami.\nAsegúrate de que foi exportada a Jami desde un dispositivo existente, e que as credenciais son correctas.</string>
+  <string name="account_sip_cannot_be_registered_message">Podes continuar co proceso de creación da conta ou editar a túa información aquí. A edición é posible posteriormente nos axustes da conta.</string>
+  <string name="account_no_network_title">Non hai acceso a rede</string>
+  <string name="account_no_network_message">Non se puido engadir a conta porque Jami non ten acceso a rede distribuída. Comproba conectividade do dispositivo.</string>
+  <string name="account_device_added_title">Conta engadida no dispositivo</string>
+  <string name="account_device_added_message">Configuraches correctamente a túa conta Jami neste dispositivo.</string>
+  <string name="account_device_updated_title">Actualizada a conta no dispositivo</string>
+  <string name="account_device_updated_message">Actualizaches a túa conta Jami.</string>
+  <string name="account_cannot_be_updated_message">Non se puido actualizar a conta no dispositivo. Comproba o contrasinal.</string>
+  <string name="account_sip_success_title">Conta SIP rexistrada.</string>
+  <string name="account_sip_success_message">Rexistraches correctamente a conta SIP.</string>
+  <string name="account_sip_register_anyway">Rexistrar igualmente</string>
+  <string name="account_link_device">Conectar desde outro dispositivo</string>
+  <string name="account_link_button">Conectar desde a rede</string>
+  <string name="account_link_archive_button">Conectar desde copia de apoio</string>
+  <string name="account_link_prompt_pin">Escribe o PIN</string>
+  <string name="account_new_button">Crear conta Jami</string>
+  <string name="account_link_export_button">Ligar outro dispositivo a esta conta</string>
+  <string name="account_link_export_info">Para usar esta conta en outros dispositivos primeiro tes que exportala en Jami. Esto creará un código PIN que tes que escribir no novo dispositivo para configuralo. O PIN é válido durante 10 minutos.</string>
+  <string name="account_start_export_button">Crear PIN</string>
+  <string name="account_end_export_button">pechar</string>
+  <string name="account_end_export_infos">O PIN é:\n\n %% \n\nPara completar o proceso, abre Jami noutro dispositivo. Crea unha nova conta con \"Ligar este dispositivo a unha conta\". O PIN é válido durante 10 minutos.</string>
+  <string name="account_link_export_info_light">Para usar esta conta en outros dispositivos primeiro tes que exportala en Jami. Esto creará un código PIN que tes que escribir no novo dispositivo para configuralo. O PIN é válido durante 10 minutos.</string>
+  <string name="account_export_title">Engadir dispositivos</string>
+  <string name="account_connect_server_button">Conectar a servidor de xestión</string>
+  <string name="account_connect_button">Conectar</string>
+  <string name="prompt_server">URL do servidor de xestión Jami</string>
+  <string name="help_credentials_enter">Escribe as credenciais da túa organización</string>
+  <string name="help_connect_password_enter">Escribe o contrasinal da túa organización</string>
+  <string name="account_connect_prompt_username">Nome de usuaria</string>
+  <!--Name registration-->
+  <string name="error_username_empty">Escribe nome de usuaria</string>
+  <string name="no_registered_name_for_account">Non se atopou nome rexistrado para esta conta</string>
+  <string name="username_available">Nome de usuaria dispoñible!</string>
+  <string name="register_name">Rexistrar nome</string>
+  <string name="trying_to_register_name">Intentando rexistrar nome</string>
+  <string name="registered_username">Nome de usuaria rexistrado</string>
+  <string name="register_username">Rexistrar nome de usuaria público (recomendado)</string>
+  <string name="username_already_taken">Este nome de usuaria xa está pillado</string>
+  <string name="invalid_username">Nome de usuaria non válido</string>
+  <string name="unknown_error">Erro descoñecido. Comproba a conexión a rede!</string>
+  <string name="looking_for_username_availability">Comprobando a dispoñibilidade do nome...</string>
+  <string name="account_status_connecting">Conectando</string>
+  <string name="account_status_connection_error">Erro de conexión</string>
+  <string name="account_status_online">En liña</string>
+  <string name="account_status_unknown">Descoñecido</string>
+  <string name="account_status_offline">Desconectado</string>
+  <string name="account_status_error">Erro</string>
+  <!--Create account-->
+  <string name="account_creation_home">Benvida/o a Jami</string>
+  <string name="account_creation_profile">Crea o teu perfil</string>
+  <string name="account_creation_ring">Crea a túa conta Jami</string>
+  <string name="account_link_title">Liga este dispositivo</string>
+  <string name="account_sip_cannot_be_registered">Non se rexistrou a conta</string>
+  <!--Edit profile-->
+  <string name="account_edit_profile">Edita o teu perfil</string>
+  <!--Devices-->
+  <string name="account_revoke_device_hint">Escribe o contrasinal para confirmar</string>
+  <string name="enter_password">Escribir contrasinal</string>
+  <string name="revoke_device_title">Revogar dispositivo</string>
+  <string name="revoke_device_message">Seguro que queres revogar %1$s?</string>
+  <string name="revoke_device_wait_title">Agarda por favor...</string>
+  <string name="revoke_device_wait_message">Revogando dispositivo</string>
+  <string name="rename_device_title">Cambiar nome ao dispositivo</string>
+  <string name="rename_device_message">Escolle un novo nome para identificar este dispositivo na túa conta Jami</string>
+  <string name="rename_device_button">Cambiar nome</string>
+  <string name="account_rename_device_hint">Escolle un novo nome</string>
+  <string name="account_device_name_empty">O nome non pode quedar baleiro</string>
+  <string name="account_device_this_indicator">este dispositivo</string>
+  <string name="account_disabled_indicator">desactivado</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-gl/strings_call.xml b/ring-android/app/src/main/res/values-gl/strings_call.xml
new file mode 100644
index 0000000..b4a4d3d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-gl/strings_call.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Chamada cancelada. Non se detecta micrófono.</string>
+    <string name="call_error_no_camera_no_microphone">Chamada cancelada. Non se detecta cámara ou micrófono.</string>
+
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Buscando</string>
+    <string name="call_human_state_incoming">Entrante</string>
+    <string name="call_human_state_connecting">Conectando</string>
+    <string name="call_human_state_ringing">Chamando</string>
+    <string name="call_human_state_current">Falando</string>
+    <string name="call_human_state_busy">Ocupado</string>
+    <string name="call_human_state_failure">Fallou</string>
+    <string name="call_human_state_hold">Agardar</string>
+    <!-- Conferences -->
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-gl/strings_content_description.xml b/ring-android/app/src/main/res/values-gl/strings_content_description.xml
new file mode 100644
index 0000000..38226ab
--- /dev/null
+++ b/ring-android/app/src/main/res/values-gl/strings_content_description.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Chamada rápida</string>
+  <string name="contact_picture_description">Foto do contacto</string>
+  <string name="dial_numeric_pad">Marcador numérico</string>
+  <string name="contact_unblock">Desbloquear</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
new file mode 100644
index 0000000..b4f7776
--- /dev/null
+++ b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Rede</string>
+  <string name="pref_category_contacts">Contactos</string>
+  <string name="pref_category_video">Vídeo</string>
+  <string name="pref_category_system">Sistema</string>
+  <string name="pref_category_privacy">Privacidade</string>
+  <string name="pref_mobileData_title">Datos móbiles</string>
+  <string name="pref_mobileData_summary">Permitir que Jami acceda a redes 3G/LTE ademáis de a Wi-Fi.</string>
+  <string name="pref_pushNotifications_title">Notificacións Push</string>
+  <string name="pref_pushNotifications_summary">Usar servidores Google para permitir recibir chamadas e mensaxes en segundo plano</string>
+  <string name="pref_video_advanced_title">Axustes avanzados de video</string>
+  <string name="pref_video_advanced_summary">Cambiar a taxa de bits, resolución e acceso a características experimentais</string>
+  <string name="pref_hd_summary">Activar vídeo HD</string>
+  <string name="pref_hwEncode_title">Activar codificación acelerada</string>
+  <string name="pref_hwEncode_summary">Característica experimental</string>
+  <string name="pref_systemContacts_title">Usar contactos do sistema</string>
+  <string name="pref_systemContacts_summary">Usar contactos do sistema para mostrar detalles do contacto.</string>
+  <string name="pref_systemDialer_title">Facer as chamadas dos sistema usando Jami</string>
+  <string name="pref_systemDialer_summary">Usar Jami cando sexa posible para facer chamadas.</string>
+  <string name="pref_startOnBoot_title">Inciar Jami ao inicio do sistema</string>
+  <string name="pref_startOnBoot_summary">Executar Jami en segundo plano cando se inicia o sistema.</string>
+  <string name="pref_clearHistory_title">Eliminar historial</string>
+  <string name="pref_clearHistory_summary">Eliminar todo o historial de conversas. Esto non ten volta atrás.</string>
+  <string name="pref_persistNotification_title">Executar en segundo plano</string>
+  <string name="pref_persistNotification_summary">Permitir a execución en segundo plano para recibir mensaxe e chamadas.</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index a38003a..be25b1f 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">Fiók</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Hangüzenet küldése?</string>
+  <string name="tv_send_image_dialog_message">Küldd el a képet?</string>
+  <string name="tv_send_video_dialog_message">Küldd el a videót?</string>
+  <string name="tv_media_preview">Előnézet</string>
   <string name="tv_audio_play">Lejátszás</string>
   <string name="tv_audio_pause">Megállítás</string>
   <string name="tv_dialog_send">Elküld</string>
   <string name="tv_audio_recording">Felvétel…</string>
   <string name="tv_send_text">Szöveg küldése</string>
   <string name="tv_send_audio">Hang küldése</string>
-  <string name="tv_clear_history">Előzmények törlése</string>
+  <string name="tv_send_video">Média küldése</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 3a84db1..66bd8a6 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">Account</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Invia un messaggio audio?</string>
+  <string name="tv_send_image_dialog_message">Inviare l\'immagine?</string>
+  <string name="tv_send_video_dialog_message">Inviare il video?</string>
+  <string name="tv_media_preview">Anteprima</string>
   <string name="tv_audio_play">Avvia</string>
   <string name="tv_audio_pause">Pausa</string>
   <string name="tv_dialog_send">Invia</string>
   <string name="tv_audio_recording">Registrazione...</string>
   <string name="tv_send_text">Invia testo</string>
   <string name="tv_send_audio">Invia audio</string>
-  <string name="tv_clear_history">cancella cronologia</string>
+  <string name="tv_send_video">Inviare media</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 10105e1..dc0924c 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -76,6 +76,7 @@
   <string name="notif_sync_title">データの同期中</string>
   <string name="notif_location_title">現在地を次の連絡先に共有中: %1$s</string>
   <string name="location_share_contact">%1$s があなたに現在地を共有中です</string>
+  <string name="notif_location_multi_title">%1$d 人と現在位置を共有中</string>
   <string name="notif_location_remaining">残り %1$d 分</string>
   <string name="notif_location_action_stop">現在地の共有を停止</string>
   <string name="location_share_action_start">共有を開始</string>
@@ -123,13 +124,15 @@
   <string name="ringtone_error_size_too_big">ファイルのサイズが大きすぎます。最大サイズは%1$dkBです。</string>
   <string name="ringtone_custom_prompt">カスタム着信音を設定する</string>
   <string name="ringtone_custom_label">カスタム</string>
+  <string name="ringtone_jami_tones">Jamiの発信音</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jamiは連絡先へのアクセスが必要です。権限を許可してください。</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Jamiは着信履歴へのアクセスが必要です。権限を許可してください。</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">追加したいアカウントの QR コートをスキャンしてください。</string>
+  <string name="scan_qr_account_message">追加したいアカウントの QR コードをスキャンしてください。</string>
   <string name="title_activity_qrcode">アカウントの共有</string>
+  <string name="error_scan_no_camera_permissions">QRコードスキャナーはカメラの権限を必要とします</string>
   <string name="tab_code">自分のコード</string>
   <string name="tab_scan">スキャン</string>
   <!--Settings-->
@@ -143,12 +146,16 @@
   <string name="conversation_action_delete_this_message">この操作は元に戻せません。</string>
   <string name="conversation_action_history_clear">履歴をクリア</string>
   <string name="conversation_action_history_clear_title">会話の履歴を削除しますか?</string>
+  <string name="conversation_action_history_clear_message">この操作は会話の履歴を完全に削除します。</string>
   <string name="conversation_action_remove_this">連絡先を削除</string>
   <string name="conversation_action_remove_this_title">この連絡先を削除しますか?</string>
+  <string name="conversation_action_remove_this_message">この操作は連絡先を削除し、会話の履歴を完全に削除します。</string>
   <string name="conversation_action_copy_peer_number">番号をコピー</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s をクリップボードにコピーしました</string>
   <string name="conversation_action_select_peer_number">番号を選択</string>
   <string name="conversation_action_block_this">ブロックした連絡先</string>
+  <string name="conversation_action_go_to_call">通話に戻る</string>
+  <string name="conversation_open_file_error">この種類のファイルを開けるアプリがインストールされていません。</string>
   <string name="clip_contact_uri">連絡先</string>
   <string name="block_contact_dialog_title">%1$sをブロックしますか?</string>
   <string name="block_contact_dialog_message">%1$sはあなたがブロックを解除するまで連絡できません。</string>
@@ -163,6 +170,8 @@
   <string name="prompt_new_username">新しいユーザー名を入力してください</string>
   <string name="help_password_choose">あなたのJamiアカウントを守るために強固なパスワードを設定してください。また、このパスワードを忘れないでください。</string>
   <string name="help_password_enter">現在のJamiアカウントのパスワード</string>
+  <string name="help_server_enter">管理サーバーの URL を入力してください</string>
+  <string name="help_pin_enter">設定済みの別のJamiアカウントからPINを入力してください。 PINを取得するには、\"Jamiのアカウントをエクスポート\" 機能を使用します。</string>
   <string name="wizard_next">次へ</string>
   <string name="wizard_back">戻る</string>
   <string name="wizard_skip">スキップ</string>
@@ -179,6 +188,7 @@
   <string name="share_label">共有</string>
   <string name="generic_error_migration">エラー</string>
   <string name="generic_error_migration_message">移行中にエラーが発生しました。</string>
+  <string name="title_share_with">共有</string>
   <!--Pending contact requests-->
   <string name="accept">受け入れ</string>
   <string name="refuse">拒否</string>
@@ -187,9 +197,14 @@
   <string name="contact_request_msg">%1$s の連絡先リクエストがあります</string>
   <string name="contact_request_account">%1$s に</string>
   <string name="no_requests">0 件の連絡先リクエスト</string>
+  <string name="message_contact_not_trusted_yet">%s さんはあなたの連絡先に追加されていません。
+この連絡先のリクエストを許可しますか?</string>
+  <string name="message_contact_not_trusted">%s さんはあなたの連絡先に追加されていません。
+新しい連絡先に追加しますか?</string>
   <!--Send contact requests-->
   <string name="send_request_button">送信</string>
   <string name="send_request_title">連絡先リクエストを送信</string>
+  <string name="send_request_msg">このユーザーと会話するには、コンタクトリクエストを送信しなければなりません。連絡先のリクエストを許可するまでは、あなたはメッセージを送れますが、相手は返事を送れません。</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">0 件のブロックした連絡先</string>
   <!--Smartlist-->
@@ -198,13 +213,29 @@
   <string name="start_conversation">会話を開始</string>
   <string name="search_results">検索結果</string>
   <string name="tv_contact_row_header">連絡先</string>
+  <string name="gallery_error_title">ギャラリーアプリがありません</string>
+  <string name="gallery_error_message">デバイス上にギャラリーを開くアプリがありません</string>
+  <string name="generic_error">不明なエラーが起こりました</string>
   <!--File Transfer-->
+  <string name="invalid_file">無効なファイル</string>
+  <string name="not_able_to_write_file">ファイルを書き込めません</string>
+  <string name="file_transfer_status_created">転送の初期化中</string>
+  <string name="file_transfer_status_unsupported">未対応</string>
+  <string name="file_transfer_status_wait_peer_acceptance">相手の許可を待っています</string>
+  <string name="file_transfer_status_wait_host_acceptance">ホストの許可を待っています</string>
+  <string name="file_transfer_status_ongoing">通話中</string>
+  <string name="file_transfer_status_finished">終了</string>
+  <string name="file_transfer_status_closed_by_host">ホストが終了しました</string>
+  <string name="file_transfer_status_closed_by_peer">相手が終了しました</string>
+  <string name="file_transfer_status_invalid_pathname">不正なパス名</string>
+  <string name="file_transfer_status_unjoinable_peer">参加できない相手</string>
   <string name="file_transfer_status_cancelled">キャンセルしました</string>
   <string name="file_transfer_status_error">エラーで失敗しました</string>
   <string name="file_transfer_status_timed_out">タイムアウトしました</string>
   <string name="file_saved_in">%sに保存しました</string>
   <string name="file_saved_successfully">ファイルが保存されました</string>
   <string name="no_space_left_on_device">空き容量がありません</string>
+  <string name="title_media_viewer">メディアビューア</string>
   <string name="menu_file_open">ファイルを開く</string>
   <string name="menu_file_download">ファイルをダウンロード</string>
   <string name="menu_file_save">ファイルを保存</string>
@@ -221,11 +252,15 @@
   <string name="navigation_item_contact_request">連絡先のリクエスト</string>
   <string name="navigation_item_account">アカウント</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">音声を送信しますか?</string>
+  <string name="tv_send_image_dialog_message">画像を送信しますか?</string>
+  <string name="tv_send_video_dialog_message">ビデオを送信しますか?</string>
+  <string name="tv_media_preview">プレビュー</string>
   <string name="tv_audio_play">再生</string>
   <string name="tv_audio_pause">一時停止</string>
   <string name="tv_dialog_send">送信</string>
   <string name="tv_audio_recording">録音中...</string>
   <string name="tv_send_text">テキストの送信</string>
   <string name="tv_send_audio">音声の送信</string>
-  <string name="tv_clear_history">履歴を削除</string>
+  <string name="tv_send_video">メディアを送信</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 1c8cde5..bb4b453 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Jamiアカウントを追加</string>
   <string name="add_sip_account_title">SIPアカウントを追加</string>
+  <string name="ring_account_default_name">Jamiアカウント %1$s</string>
   <string name="prompt_alias">別名</string>
   <string name="prompt_hostname">ホスト名</string>
   <string name="prompt_username">ユーザー名</string>
@@ -44,6 +45,8 @@
   <string name="account_device_revocation_unknown_device">不明なデバイス。</string>
   <string name="account_device_revocation_error_unknown">不明なエラー。</string>
   <string name="account_password_change">パスワードを変更</string>
+  <string name="account_password_set">パスワードを設定</string>
+  <string name="account_password_change_wait_message">アカウントのパスワードを変更中</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">全般</string>
   <string name="account_basic_category">基本設定</string>
@@ -64,6 +67,7 @@
   <string name="account_ringtone_enabled_label">着信音を使用</string>
   <string name="account_ringtone_path_label">着信音のパス</string>
   <string name="account_ringtone_custom_label">カスタム着信音を使用</string>
+  <string name="account_ringtone_title">着信音を選択</string>
   <!--Video Details-->
   <string name="account_video_label">動画</string>
   <string name="account_video_enable">動画を有効化</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index e78cc24..b282468 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -217,5 +217,4 @@
   <string name="tv_dialog_send">Siųsti</string>
   <string name="tv_send_text">Siųsti tekstą</string>
   <string name="tv_send_audio">Siųsti garsą</string>
-  <string name="tv_clear_history">išvalyti istoriją</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings.xml b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
index be598b4..9800dba 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -15,9 +15,12 @@
   <string name="license">Este programa é fornecido \"tal qual como está\", sem qualquer tipo de garantia. Para mais detalhes ver <u>Licença Pública Geral GNU versão 3 ou posterior</u></string>
   <string name="description">O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</string>
   <string name="credits">Créditos</string>
+  <string name="call_service_description">Este serviço é necessário para manter a execução das suas chamadas. Só é executado durante chamadas.</string>
+  <string name="data_transfer_service_description">Este serviço é necessário para exibir notificações persistentes durante a transferência de ficheiros. Só é executado durante a transferência de ficheiros.</string>
   <!--About dialog-->
   <string name="developed_by">Desenvolvido por</string>
   <string name="designed_by">Projetado por</string>
+  <string name="ringtones_by">Toques de chamada por</string>
   <!--RingActivity-->
   <string name="error_no_network">Sem conectividade à rede</string>
   <string name="error_mobile_network_available_but_disabled">Por favor, conceda acesso à rede móvel no ecrã de configurações.</string>
@@ -40,6 +43,7 @@
     <item quantity="other">%d Conversas</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Pesquisar por nome ou número de telefone...</string>
   <string name="choose_number">Escolher um número</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -59,6 +63,7 @@
   <string name="notif_channel_messages">Mensagens</string>
   <string name="notif_channel_requests">Solicitações</string>
   <string name="notif_channel_file_transfer">Transferência de ficheiro</string>
+  <string name="notif_channel_sync">Sincronização de dados</string>
   <string name="notif_channel_background_service">Serviço em segundo plano</string>
   <string name="notif_channel_background_service_descr">Permite receber chamadas e mensagens em qualquer altura.</string>
   <string name="notif_group_calls">Chamadas</string>
@@ -69,6 +74,14 @@
   <string name="notif_incoming_file_transfer_title">A receber ficheiro de %1$s</string>
   <string name="notif_outgoing_file_transfer_title">A enviar ficheiro para %1$s</string>
   <string name="notif_incoming_picture">Foto de %1$s</string>
+  <string name="notif_sync_title">A sincronizar dados...</string>
+  <string name="notif_location_title">A partilhar localização com %1$s</string>
+  <string name="location_share_contact">%1$s está a partilhar a localização consigo</string>
+  <string name="notif_location_multi_title">A partilhar a localização com %1$d contactos</string>
+  <string name="notif_location_remaining">%1$dminutos restantes</string>
+  <string name="notif_location_action_stop">Parar a partilha de localização</string>
+  <string name="location_share_action_start">Iniciar a partilha</string>
+  <string name="location_share_action_stop">Parar a partilha</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
@@ -100,6 +113,9 @@
   <string name="send_file">Enviar ficheiro</string>
   <string name="hist_file_sent">Ficheiro enviado</string>
   <string name="hist_file_received">Ficheiro recebido</string>
+  <string name="conversation_send_audio">Gravar mensagem de áudio</string>
+  <string name="conversation_send_video">Gravar mensagem de vídeo</string>
+  <string name="conversation_share_location">Partilhar a localização</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permissão de câmara</string>
   <string name="permission_dialog_camera_message">As conversas de vídeo necessitam de permissão para aceder à câmara. Considere fornecer a permissão.</string>
@@ -107,7 +123,9 @@
   <string name="ringtone_error_title">Erro</string>
   <string name="ringtone_error_format_not_supported">Este formato não é suportado.</string>
   <string name="ringtone_error_size_too_big">Este ficheiro é grande demais. O tamanho máximo é %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Configurar um toque de chamada personalizado</string>
   <string name="ringtone_custom_label">Personalizado</string>
+  <string name="ringtone_jami_tones">Toques do Jami</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">O Jami necessita da permissão \"Ler contactos\" para ativar esta funcionalidade. Conceda esta permissão.</string>
   <!--Write call log permission-->
@@ -143,6 +161,7 @@
   <string name="block_contact_dialog_title">Bloquear %1$s?</string>
   <string name="block_contact_dialog_message">%1$s não poderá contactá-lo até que o desbloqueie.</string>
   <string name="block_contact_completed">%1$s foi bloqueado.</string>
+  <string name="conversation_contact_is_typing">O contacto está a escrever...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s?</string>
   <string name="prompt_new_password">Nova palavra-chave</string>
@@ -152,6 +171,7 @@
   <string name="prompt_new_username">Introduza o seu nome de utilizador</string>
   <string name="help_password_choose">Escolha uma palavra-chave forte que se lembre para proteger a sua conta Jami.</string>
   <string name="help_password_enter">Introduza a palavra-chave da sua conta principal Jami</string>
+  <string name="help_server_enter">Introduza o URL do servidor de gestão</string>
   <string name="help_pin_enter">Introduza o seu PIN de uma outra conta Jami já configurada. Utilize a opção \"Exportar conta no Jami\" para obter um PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
@@ -169,6 +189,7 @@
   <string name="share_label">Partilhar</string>
   <string name="generic_error_migration">Erro</string>
   <string name="generic_error_migration_message">Ocorreu um erro durante a migração</string>
+  <string name="title_share_with">Partilhar com...</string>
   <!--Pending contact requests-->
   <string name="accept">Aceitar</string>
   <string name="refuse">Recusar</string>
@@ -188,6 +209,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Nenhuma solicitação de contacto enviada</string>
   <string name="contact_request_sent">A solicitação de contacto foi enviada</string>
+  <string name="start_conversation">Iniciar conversa</string>
   <string name="search_results">Resultados da Pesquisa</string>
   <string name="tv_contact_row_header">Contactos</string>
   <string name="gallery_error_title">Não foi encontrada nenhuma app de Galeria</string>
@@ -206,6 +228,9 @@
   <string name="file_transfer_status_closed_by_peer">fechado pelo destinatário</string>
   <string name="file_transfer_status_invalid_pathname">diretório inválido</string>
   <string name="file_transfer_status_unjoinable_peer">contacto indisponível</string>
+  <string name="file_transfer_status_cancelled">cancelado</string>
+  <string name="file_transfer_status_error">falhou devido a erro</string>
+  <string name="file_transfer_status_timed_out">expirou o tempo</string>
   <string name="file_saved_in">Ficheiro gravado em %s</string>
   <string name="file_saved_successfully">Ficheiro gravado com sucesso</string>
   <string name="no_space_left_on_device">Sem espaço disponível no dispositivo</string>
@@ -219,12 +244,22 @@
   <string name="menu_message_delete">Eliminar mensagem</string>
   <string name="menu_message_cancel">Cancelar mensagem</string>
   <string name="menu_delete">Eliminar</string>
+  <string name="pref_darkTheme_title">Tema escuro</string>
+  <string name="pref_darkTheme_summary">Ativar sempre o tema escuro em vez da configuração do sistema</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Conversas</string>
   <string name="navigation_item_contact_request">Solicitações de contactos</string>
   <string name="navigation_item_account">Conta</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Enviar mensagem de áudio?</string>
+  <string name="tv_send_image_dialog_message">Enviar a imagem?</string>
+  <string name="tv_send_video_dialog_message">Enviar o vídeo?</string>
+  <string name="tv_media_preview">Pré-visualizar</string>
   <string name="tv_audio_play">Reproduzir</string>
   <string name="tv_audio_pause">Pausa</string>
   <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">A gravar...</string>
+  <string name="tv_send_text">Enviar Texto</string>
+  <string name="tv_send_audio">Enviar Áudio</string>
+  <string name="tv_send_video">Enviar media</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
index 8c167cf..ac1027d 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
@@ -67,16 +67,24 @@
   <string name="account_ringtone_enabled_label">Ativar toques de chamada</string>
   <string name="account_ringtone_path_label">Caminho do toque de chamada</string>
   <string name="account_ringtone_custom_label">Usar toque personalizado</string>
+  <string name="account_ringtone_title">Escolher toque de chamada</string>
+  <string name="account_ringtone_summary">Selecionar toque de chamada ou escolher o seu próprio</string>
   <!--Video Details-->
   <string name="account_video_label">Vídeo</string>
   <string name="account_video_enable">Ativar Vídeo</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avançado</string>
+  <string name="account_dht_public_in_calls_label">Permitir receber chamadas de contactos desconhecidos</string>
   <string name="account_registration_exp_label">O Registo Expirou</string>
   <string name="account_local_interface_label">Interface Local</string>
   <string name="account_local_port_label">Porta Local</string>
   <string name="account_stun_enable_label">Usar Stun</string>
   <string name="account_stun_server_label">Servidor Stun</string>
+  <string name="account_accept_files">Permitir receber ficheiros automáticamente</string>
+  <string name="account_accept_files_max_size">Tamanho máximo de ficheiro a aceitar automáticamente</string>
+  <string name="account_accept_files_never">Nunca aceitar automáticamente</string>
+  <string name="account_accept_files_always">Aceitar sempre automáticamente</string>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">Usar TURN</string>
   <string name="account_turn_server_label">Servidor TURN</string>
   <string name="account_turn_username_label">Nome de utilizador TURN</string>
@@ -87,6 +95,10 @@
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Endereço do proxy DHT</string>
+  <string name="account_proxy_server_list_label">URL de lista de proxy DHT</string>
+  <string name="account_peer_discovery_label">Descoberta de membros locais</string>
+  <string name="account_peer_discovery_enable_label">Ativar a descoberta de membros locais</string>
+  <string name="account_peer_discovery_enable_summary">Ligar a outros nós de DHT a anunciar na rede local</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenciais</string>
   <string name="account_credentials_edit">Editar credenciais</string>
@@ -146,6 +158,7 @@
   <string name="account_sip_success_title">Conta SIP registada</string>
   <string name="account_sip_success_message">Registou a sua conta SIP com sucesso.</string>
   <string name="account_sip_register_anyway">Registar mesmo assim</string>
+  <string name="account_link_device">Ligar através de outro dispositivo</string>
   <string name="account_link_button">Conectar da rede</string>
   <string name="account_link_archive_button">Conectar da cópia de segurança</string>
   <string name="account_link_prompt_pin">Introduza o PIN</string>
@@ -157,6 +170,11 @@
   <string name="account_end_export_infos">O seu código PIN é:\n\n%%\n\nPara completar o processo, tem de abrir o Jami no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo a uma conta\". O seu código PIN é válido por 10 minutos.</string>
   <string name="account_link_export_info_light">Para usar esta conta noutros dispositivos, necessita primeiro de expo-lo ao Jami. Isto irá gerar um código PIN que necessita de introduzir no novo dispositivo para configurar a sua conta. O PIN é válido por apenas 10 minutos.</string>
   <string name="account_export_title">Adicionar dispositivos</string>
+  <string name="account_connect_server_button">Ligar ao servidor de gestão</string>
+  <string name="account_connect_button">Ligar</string>
+  <string name="prompt_server">URL do servidor de gestão do Jami</string>
+  <string name="help_credentials_enter">Introduza as credenciais da sua organização</string>
+  <string name="help_connect_password_enter">Introduza a palavra-chave da sua organização</string>
   <string name="account_connect_prompt_username">Nome de utilizador</string>
   <!--Name registration-->
   <string name="error_username_empty">Introduza um nome de utilizador</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
index 0eebc57..05d51cd 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Permitir Jami em redes 3G/LTE para além do Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notificações push (do servidor)</string>
   <string name="pref_pushNotifications_summary">Usar os servidores da Google para permitir o recebimento de chamadas/mensagens em segundo plano</string>
+  <string name="pref_video_advanced_title">Definições de vídeo avançadas</string>
+  <string name="pref_video_advanced_summary">Modifique a taxa de bits, resolução e aceda a funcionalidades experimentais</string>
   <string name="pref_hd_summary">Ativar envio de vídeo em HD</string>
   <string name="pref_hwEncode_title">Ativar codificação acelerada</string>
   <string name="pref_hwEncode_summary">Funcionalidade experimental</string>
@@ -19,6 +21,7 @@
   <string name="pref_startOnBoot_title">Inicializar o Jami ao iniciar</string>
   <string name="pref_startOnBoot_summary">Executar o Jami em segundo plano ao iniciar o sistema.</string>
   <string name="pref_clearHistory_title">Limpar histórico</string>
+  <string name="pref_clearHistory_summary">Apagar o histórico de todas as conversas. Esta ação não pode ser revertida.</string>
   <string name="pref_persistNotification_title">Executar em segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ser executado em segundo plano para receber chamadas e mensagens</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index f1d3276..a665db7 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -98,7 +98,7 @@
   <string name="ab_action_change_screen_orientation">Изменить ориентацию экрана</string>
   <string name="share_via">Поделится</string>
   <string name="write_a_message">Написать сообщение</string>
-  <string name="scan_qr">Сканировать QR код</string>
+  <string name="scan_qr">Сканировать QR-код</string>
   <string name="ab_action_flipcamera">Перевернуть камеру</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
@@ -203,7 +203,7 @@
   <string name="no_contact_request">Нет запросов на добавление в контакты</string>
   <string name="contact_request_sent">Запрос на добавление в контакты отправлен</string>
   <string name="start_conversation">Начать беседу</string>
-  <string name="search_results">Результаты Поиска</string>
+  <string name="search_results">Результаты поиска</string>
   <string name="tv_contact_row_header">Контакты</string>
   <string name="gallery_error_title">Нет приложения Галереи</string>
   <string name="gallery_error_message">Не найдено приложений чтобы открыть Галерею</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 82178a7..cdd07a4 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -77,6 +77,13 @@
   <string name="notif_outgoing_file_transfer_title">Отправка файла %1$s</string>
   <string name="notif_incoming_picture">Изображение от %1$s</string>
   <string name="notif_sync_title">Синхронизация данных...</string>
+  <string name="notif_location_title">Трансляция геопозиции для %1$s</string>
+  <string name="location_share_contact">%1$s транслирует Вам геопозицию</string>
+  <string name="notif_location_multi_title">Трансляция геопозиции для %1$d контактов</string>
+  <string name="notif_location_remaining">%1$d минут осталось</string>
+  <string name="notif_location_action_stop">Остановить трансляцию геопозиции</string>
+  <string name="location_share_action_start">Начать трансляцию</string>
+  <string name="location_share_action_stop">Остановить трансляцию</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вы:</string>
   <string name="action_call_hangup">Повесить трубку</string>
@@ -110,6 +117,7 @@
   <string name="hist_file_received">Файл получен</string>
   <string name="conversation_send_audio">Запись аудиоклипа</string>
   <string name="conversation_send_video">Запись видиоклипа</string>
+  <string name="conversation_share_location">Транслировать геопозицию</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Разрешение на доступ к камере</string>
   <string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, предоставьте его.</string>
@@ -155,6 +163,7 @@
   <string name="block_contact_dialog_title">Заблокировать %1$s?</string>
   <string name="block_contact_dialog_message">%1$s не сможет связаться с вами, пока вы не разблокируете его.</string>
   <string name="block_contact_completed">%1$s заблокирован.</string>
+  <string name="conversation_contact_is_typing">Контакт печатает...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Добавить %1$s?</string>
   <string name="prompt_new_password">Новый пароль</string>
@@ -244,8 +253,15 @@
   <string name="navigation_item_contact_request">Запросы на добавление в контакты</string>
   <string name="navigation_item_account">Аккаунт</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Отправить аудио-сообщение?</string>
+  <string name="tv_send_image_dialog_message">Отправить изображение?</string>
+  <string name="tv_send_video_dialog_message">Отправить видео?</string>
+  <string name="tv_media_preview">Предпросмотр</string>
   <string name="tv_audio_play">Проиграть</string>
   <string name="tv_audio_pause">Пауза</string>
   <string name="tv_dialog_send">Отправить</string>
+  <string name="tv_audio_recording">Запись...</string>
   <string name="tv_send_text">Отправить текст</string>
+  <string name="tv_send_audio">Отправить аудио</string>
+  <string name="tv_send_video">Отправить медиа</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 1050507..3ff0929 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -95,6 +95,7 @@
   <string name="account_proxy_label">DHT прокси</string>
   <string name="account_proxy_enable_label">Использовать DHT прокси</string>
   <string name="account_proxy_server_label">Адрес DHT прокси</string>
+  <string name="account_proxy_server_list_label">DHT прокси список URL</string>
   <string name="account_peer_discovery_label">Обнаружение локальных пиров</string>
   <string name="account_peer_discovery_enable_label">Включить обнаружение локальных пиров</string>
   <string name="account_peer_discovery_enable_summary">Подключаться к другим DHT узлам в локальной сети</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 0c27420..42371ce 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -252,11 +252,14 @@
   <string name="navigation_item_account">Llogari</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Të dërgohet mesazh audio?</string>
+  <string name="tv_send_image_dialog_message">Të dërgohet figura?</string>
+  <string name="tv_send_video_dialog_message">Të dërgohet videoja?</string>
+  <string name="tv_media_preview">Paraparje</string>
   <string name="tv_audio_play">Luaje</string>
   <string name="tv_audio_pause">Pushim</string>
   <string name="tv_dialog_send">Dërgoje</string>
   <string name="tv_audio_recording">Po incizohet…</string>
   <string name="tv_send_text">Dërgoni Tekst</string>
   <string name="tv_send_audio">Dërgoni Audio</string>
-  <string name="tv_clear_history">spastro historikun</string>
+  <string name="tv_send_video">Dërgoni Media</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sr/strings.xml b/ring-android/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 0000000..c762bd8
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <string name="feedback_section">Vaš komentar</string>
+  <string name="report">Pošaljite nam e-mail</string>
+  <string name="section_license">Licenca</string>
+  <string name="sponsor_section">Jami je besplatni softver razvijen i podržavan od strane</string>
+  <string name="copyright_section">Autorsko pravo</string>
+  <string name="contribute_section">Doprinesite</string>
+  <string name="version_section">Verzija</string>
+  <string name="no_email_app_installed">E-mail aplikacija nije nađena, instalirajte je i pošaljite nam izveštaj</string>
+  <string name="no_browser_app_installed">Veb pretraživač nije nađen, instalirajte ga da bi videli ovu stranu</string>
+  <string name="email_chooser_title">Pošaljite e-mail koristeći...</string>
+  <string name="website_chooser_title">Pogledajte veb-sajt koristeći...</string>
+  <string name="license">Ovaj softver is dostupan \"kakav jeste\", bez bilo kakvih garancija. Više detalja možete naći u GNU Opštoj Javnoj Licenci verzija 3 ili u kasnijoj verziji</string>
+  <string name="description">Jami je besplatan i slobodan softver za univerzalnu komunikaciju, koji poštuje slobode i privatnost svojih korisnika</string>
+  <string name="credits">Zasluge</string>
+  <!--About dialog-->
+  <!--RingActivity-->
+  <!--AB menus-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <string name="account_create_title">Napravi Jami profil</string>
+  <string name="wizard_back">Nazad</string>
+  <!--MenuHeaderView-->
+  <!--Share fragment-->
+  <!--Pending contact requests-->
+  <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
+  <!--File Transfer-->
+  <!--Bottom Navigation-->
+  <!--TV-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 74f3351..7923c6e 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -40,6 +40,7 @@
     <item quantity="other">%d Konuşma</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">İsim veya telefon numarası arayın...</string>
   <string name="choose_number">Numara seçin</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -59,6 +60,7 @@
   <string name="notif_channel_messages">İletiler</string>
   <string name="notif_channel_requests">İstekler</string>
   <string name="notif_channel_file_transfer">Dosya aktarımı</string>
+  <string name="notif_channel_sync">Veri senkronizasyonu</string>
   <string name="notif_channel_background_service">Artalan hizmeti</string>
   <string name="notif_channel_background_service_descr">Herzaman çağrı ve ileti almaya izin verir</string>
   <string name="notif_group_calls">Aramalar</string>
@@ -69,6 +71,13 @@
   <string name="notif_incoming_file_transfer_title">%1$s\'dan gelen dosya</string>
   <string name="notif_outgoing_file_transfer_title">%1$s\'e dosya gönderme</string>
   <string name="notif_incoming_picture">%1$s\'dan resim</string>
+  <string name="notif_sync_title">Senkronize ediliyor</string>
+  <string name="notif_location_title">Konumunuz %1$s ile paylaşılıyor </string>
+  <string name="location_share_contact">%1$s sizinle konumunu paylaşıyor</string>
+  <string name="notif_location_remaining">%1$ddakika kaldı</string>
+  <string name="notif_location_action_stop">Konum paylaşmayı durdur</string>
+  <string name="location_share_action_start">Paylaşmayı başlat</string>
+  <string name="location_share_action_stop">Paylaşmayı durdur</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sen:</string>
   <string name="action_call_hangup">Kapat</string>
@@ -100,6 +109,9 @@
   <string name="send_file">Dosya gönder</string>
   <string name="hist_file_sent">Dosya gönderildi</string>
   <string name="hist_file_received">Dosya alındı</string>
+  <string name="conversation_send_audio">Ses klibi kaydet </string>
+  <string name="conversation_send_video">Video klibi kaydet</string>
+  <string name="conversation_share_location">Konum paylaş</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera izni</string>
   <string name="permission_dialog_camera_message">Görüntülü görüşmelerin çalışması için kamera izni gerekir. Lütfen etkinleştirmeyi göz ardı etmeyin.</string>
@@ -107,6 +119,7 @@
   <string name="ringtone_error_title">Hata</string>
   <string name="ringtone_error_format_not_supported">Bu biçim desteklenmiyor.</string>
   <string name="ringtone_error_size_too_big">Bu dosya çok büyük. En büyük boyut %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Özel zil sesi ayarla </string>
   <string name="ringtone_custom_label">Özel</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami\'nin bu özelliğini etkinleştirmek için \"Rehberi oku\" izni gerekli. Lütfen izin verin.</string>
@@ -143,6 +156,7 @@
   <string name="block_contact_dialog_title">%1$s Engellensin mi?</string>
   <string name="block_contact_dialog_message">Sen engelini kaldırana dek %1$s sana ulaşamaz.</string>
   <string name="block_contact_completed">%1$s engellendi.</string>
+  <string name="conversation_contact_is_typing">Kişi yazıyor... </string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s eklensin mi?</string>
   <string name="prompt_new_password">Yeni parola</string>
@@ -187,6 +201,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Gönderilmiş bir iletişim isteği yok</string>
   <string name="contact_request_sent">İletişim isteği gönderildi</string>
+  <string name="start_conversation">Konuşma başlat </string>
   <string name="search_results">Arama Sonuçları</string>
   <string name="tv_contact_row_header">Kişiler</string>
   <string name="gallery_error_title">Galeri uygulaması bulunamadı</string>
@@ -198,9 +213,13 @@
   <string name="file_transfer_status_unsupported">desteklenmeyen</string>
   <string name="file_transfer_status_finished">Bitti</string>
   <string name="file_transfer_status_invalid_pathname">geçersiz yol adı</string>
+  <string name="file_transfer_status_cancelled">iptal edildi</string>
+  <string name="file_transfer_status_error">hata nedeniyle başarısız </string>
+  <string name="file_transfer_status_timed_out">zaman aşımı</string>
   <string name="file_saved_in">Dosya %s içine kaydedildi</string>
   <string name="file_saved_successfully">Dosya başarıyla kaydedildi</string>
   <string name="no_space_left_on_device">Aygıtda boş alan kalmadı</string>
+  <string name="title_media_viewer">medya görüntüleyici</string>
   <string name="menu_file_open">Dosyayı Aç</string>
   <string name="menu_file_download">Dosyayı indir</string>
   <string name="menu_file_save">Dosyayı Kaydet</string>
@@ -210,12 +229,18 @@
   <string name="menu_message_delete">İletiyi sil</string>
   <string name="menu_message_cancel">İletiyi iptal et</string>
   <string name="menu_delete">Sil</string>
+  <string name="pref_darkTheme_title">Karanlık tema</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Konuşmalar</string>
   <string name="navigation_item_contact_request">İletişim istekleri</string>
   <string name="navigation_item_account">Hesap</string>
   <!--TV-->
+  <string name="tv_media_preview">Önizle</string>
   <string name="tv_audio_play">Oynat</string>
   <string name="tv_audio_pause">Duraklat</string>
   <string name="tv_dialog_send">Gönder</string>
+  <string name="tv_audio_recording">Kaydediliyor...</string>
+  <string name="tv_send_text">Mesaj gönder</string>
+  <string name="tv_send_audio">Ses gönder</string>
+  <string name="tv_send_video">Medya gönder</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index ecb16c6..085e58f 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Jami hesabı ekle</string>
   <string name="add_sip_account_title">SIP hesabı ekle</string>
+  <string name="ring_account_default_name">Jami hesabı %1$s</string>
   <string name="prompt_alias">Takma ad</string>
   <string name="prompt_hostname">Sunucu adı</string>
   <string name="prompt_username">Kullanıcı adı</string>
@@ -44,6 +45,8 @@
   <string name="account_device_revocation_unknown_device">Bilinmeyen aygıt.</string>
   <string name="account_device_revocation_error_unknown">Bilinmeyen hata.</string>
   <string name="account_password_change">Parolayı değiştir</string>
+  <string name="account_password_set">Parola ayarla</string>
+  <string name="account_password_change_wait_message">Hesap parolasını değiştir </string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Genel</string>
   <string name="account_basic_category">Temel Ayarlar</string>
@@ -64,16 +67,24 @@
   <string name="account_ringtone_enabled_label">Zil seslerini etkinleştir</string>
   <string name="account_ringtone_path_label">Zil sesi yolu</string>
   <string name="account_ringtone_custom_label">Özel zil sesi kullan</string>
+  <string name="account_ringtone_title">Zil sesi seç</string>
+  <string name="account_ringtone_summary">Zil sesi terchi et veya kendininkini seç</string>
   <!--Video Details-->
   <string name="account_video_label">Görüntü</string>
   <string name="account_video_enable">Görüntüyü Etkinleştir</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Gelişmiş</string>
+  <string name="account_dht_public_in_calls_label">Bilinmeyen kişilerden gelen çağrılara izin ver</string>
   <string name="account_registration_exp_label">Kaydolma Bitimi</string>
   <string name="account_local_interface_label">Yerel Arayüz</string>
   <string name="account_local_port_label">Yerel Delik</string>
   <string name="account_stun_enable_label">Stun Kullan</string>
   <string name="account_stun_server_label">Stun Sunucusu</string>
+  <string name="account_accept_files">Gelen dosyaları otomatik olarak kabul et</string>
+  <string name="account_accept_files_max_size">Otomatik kabul edilebilir maksimum dosya boyutu </string>
+  <string name="account_accept_files_never">Asla otomatik olarak kabul etme</string>
+  <string name="account_accept_files_always">Her zaman otomatik kabul et</string>
+  <string name="size_mb">%1$dMB</string>
   <string name="account_turn_enable_label">TURN kullan</string>
   <string name="account_turn_server_label">TURN sunucusu</string>
   <string name="account_turn_username_label">TURN kullanıcı adı</string>
@@ -84,6 +95,7 @@
   <string name="account_proxy_label">DHT vekil</string>
   <string name="account_proxy_enable_label">DHT vekil sunucu kullan</string>
   <string name="account_proxy_server_label">DHT vekil adresi</string>
+  <string name="account_proxy_server_list_label">DHT proxy listesi URL</string>
   <!--Security Details-->
   <string name="account_credentials_label">Kimlik Bilgileri</string>
   <string name="account_credentials_edit">Kimlik bilgilerini düzenle</string>
@@ -112,6 +124,7 @@
   <string name="error_password_char_count">En az 6 karakter</string>
   <string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
   <string name="export_account_wait_title">Lütfen bekleyin...</string>
+  <string name="export_account_wait_message">Hesap bilgilerini dışa aktar</string>
   <string name="account_export_file">Hesabı yedekle</string>
   <string name="account_export_end_decryption_message">Sağlanan parola kullanılarak hesabınızın kilidi açılamıyor.</string>
   <string name="account_export_end_network_title">Ağ hatası</string>
@@ -151,16 +164,19 @@
   <string name="account_end_export_infos">Pin\'iniz:\n\n%%\n\nSüreci tamamlamak için yeni aygıtta Ring\'i açmanız gerekiyor. \"Bu aygıtı bir hesaba bağla\" ile yeni hesap oluşturun. Pin\'iniz 10 dakikalığına geçerlidir.</string>
   <string name="account_link_export_info_light">Bu hesabı başka aygıtlarda kullanmak için önce Jami\'de açmalısınız. Bu, hesabı kurmak için yeni aygıtta girmeniz gereken bir PIN kodu oluşturacak. PIN 10 dakikalığına geçerlidir.</string>
   <string name="account_export_title">Aygıtlar ekle</string>
+  <string name="account_connect_button">Bağlan</string>
   <string name="account_connect_prompt_username">Kullanıcı adı</string>
   <!--Name registration-->
   <string name="error_username_empty">Bir kullanıcı adı gir</string>
   <string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
+  <string name="username_available">Kullanıcı adı geçerli !</string>
   <string name="register_name">Adı kaydet</string>
   <string name="trying_to_register_name">Ad kaydedilmeye çalışılıyor</string>
   <string name="registered_username">Kaydedilen kullanıcı adı</string>
   <string name="register_username">Halka açık kullanıcı adı kaydet (önerilir)</string>
   <string name="username_already_taken">Kullanıcı adı önceden alınmış</string>
   <string name="invalid_username">Geçersiz kullanıcı adı</string>
+  <string name="unknown_error">Bilinmeyen hata. Lütfen ağ bağlantınızı kontrol edin!</string>
   <string name="looking_for_username_availability">Kullanıcı adının uygunluğuna bakılıyor...</string>
   <string name="account_status_connecting">Bağlanılıyor</string>
   <string name="account_status_connection_error">Bağlantı hatası</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index c2beaed..a7865b3 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -257,5 +257,4 @@
   <string name="tv_audio_recording">正在录音...</string>
   <string name="tv_send_text">发送文本</string>
   <string name="tv_send_audio">发送音频</string>
-  <string name="tv_clear_history">清除历史</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index a79e83a..4bbca98 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -251,11 +251,14 @@
   <string name="navigation_item_account">帳號</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">傳送音訊訊息?</string>
+  <string name="tv_send_image_dialog_message">傳送圖片?</string>
+  <string name="tv_send_video_dialog_message">傳送影片?</string>
+  <string name="tv_media_preview">預覽</string>
   <string name="tv_audio_play">播放</string>
   <string name="tv_audio_pause">暫停</string>
   <string name="tv_dialog_send">傳送</string>
   <string name="tv_audio_recording">正在錄製……</string>
   <string name="tv_send_text">傳送文字</string>
   <string name="tv_send_audio">傳送音訊</string>
-  <string name="tv_clear_history">清除歷史紀錄</string>
+  <string name="tv_send_video">傳送媒體</string>
 </resources>