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 7ab43a1..eda4d52 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -62,7 +62,9 @@
   <string name="message_failed">فشل</string>
   <string name="time_just_now">للتوّ</string>
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">خطأ</string>
+  <string name="ringtone_custom_label">حسب الطلب</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index 71e1f27..429ce25 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -110,9 +110,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Право за използване на камерата</string>
   <string name="permission_dialog_camera_message">Разговорите с видео изискват правото за използване на камерата. Моля, дайте това право на приложението.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Грешка</string>
   <string name="ringtone_error_format_not_supported">Този формат не се поддържа.</string>
   <string name="ringtone_error_size_too_big">Този файл е твърде голям. Максималният размер е %1$dkB.</string>
+  <string name="ringtone_custom_label">Персонализиран</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami се нуждае от разрешението \"Четене на контакти\", за да активира тази функция. Моля, предоставете го.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index bee7731..36af84b 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -104,6 +104,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permís de la càmera</string>
   <string name="permission_dialog_camera_message">Habiliteu el permís de la càmera perquè funcionin les trucades de vídeo. </string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Error</string>
   <string name="ringtone_error_format_not_supported">Aquest format no és compatible.</string>
   <string name="ringtone_error_size_too_big">Aquest arxiu és massa gran. La mida màxima és %1$dkB.</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 708dd0a..8120e33 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Povolení ke kameře</string>
   <string name="permission_dialog_camera_message">Video konverzace vyžadují povolení ke kameře. Prosím zvažte jeho povolení.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Chyba</string>
   <string name="ringtone_error_format_not_supported">Tento formát je nepodporovaný.</string>
   <string name="ringtone_error_size_too_big">Tento soubor je příliš velký. Největší velikost je %1$dkB.</string>
+  <string name="ringtone_custom_label">Vlastní</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Pro tuto funkci Jami vyžaduje povolení „Číst kontakty“. Povolte jej prosím.</string>
   <!--Write call log permission-->
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 1207f10..50ca7c0 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -99,9 +99,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-tilladelse</string>
   <string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fejl</string>
   <string name="ringtone_error_format_not_supported">Dette format understøttes ikke.</string>
   <string name="ringtone_error_size_too_big">Filen er for stor. Maksimumstørrelsen er %1$dkB.</string>
+  <string name="ringtone_custom_label">Brugerdefineret</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 8b0ae1a..9c7cf5d 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
@@ -110,6 +110,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
   <string name="permission_dialog_camera_message">Video-Konferenzen benötigen Zugriff auf die Kamera. Bitte erlauben Sie diesen Zugriff.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fehler</string>
   <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
   <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Maximal %1$dkB sind erlaubt.</string>
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 c2b8c43..dfb8605 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -15,9 +15,11 @@
   <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 höher</u></string>
   <string name="description">Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.</string>
   <string name="credits">Würdigung</string>
+  <string name="call_service_description">Dieser Dienst ist notwendig um Anrufe im Vordergrund zu halten. Er läuft nur während eines Anrufs.</string>
   <!--About dialog-->
   <string name="developed_by">Entwickelt von</string>
   <string name="designed_by">Entworfen von</string>
+  <string name="ringtones_by">Klingeltöne von</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkverbindung</string>
@@ -113,9 +115,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
   <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fehler</string>
   <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
   <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Die maximale Größe ist %1$dkB.</string>
+  <string name="ringtone_custom_label">Benutzerdefiniert</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--Write call log permission-->
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 71af419..b5fbaa7 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -75,6 +75,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string>
   <string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά  για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Σφάλμα</string>
   <string name="ringtone_error_format_not_supported">Η μορφή δεν υποστιρίζεται.</string>
   <!--Read contacts permission-->
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index ae42df0..bf6038f 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -63,7 +63,9 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permeso je kamerao</string>
   <string name="permission_dialog_camera_message">Video-konversacioj bezonas permeson je kamerao por funkcii. Bonvole pripensu permesi ĝin.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Eraro</string>
+  <string name="ringtone_custom_label">Propra</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 8d31102..d124a40 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
@@ -92,8 +92,10 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las videollamadas requieren el permiso de cámara para funcionar. Considerá activarlo.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Error</string>
   <string name="ringtone_error_format_not_supported">Formato no soportado.</string>
+  <string name="ringtone_custom_label">Personalizado</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 17e50bc..9293483 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -111,9 +111,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Error</string>
   <string name="ringtone_error_format_not_supported">Este formato no está soportado.</string>
   <string name="ringtone_error_size_too_big">Este archivo es demasiado grande. El tamaño máximo es de %1$dkB.</string>
+  <string name="ringtone_custom_label">Personalizado</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami necesita el permiso \"Leer contactos\" para habilitar esta función. Por favor concédelo.</string>
   <!--Write call log permission-->
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 00c6b13..ab62731 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -111,6 +111,7 @@
   <string name="hist_file_received">Fitxategia jasota</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-baimena</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Errorea</string>
   <string name="ringtone_error_format_not_supported">Formatu hau ez da onartzen.</string>
   <!--Read contacts permission-->
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 0490d1a..ffb2367 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
@@ -110,9 +110,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">دسترسی دوربین</string>
   <string name="permission_dialog_camera_message">گفت‌وگوی ویدیویی برای کار کردن نیاز به دسترسی دوربین دارد. لطفاً آن را فعّال کنید.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">خطا</string>
   <string name="ringtone_error_format_not_supported">این قالب پشتیبانی نمی‌شود.</string>
   <string name="ringtone_error_size_too_big">این فایل خیلی بزرگ است.حداکثر اندازه %1$d ک‌.ب. است.</string>
+  <string name="ringtone_custom_label">سفارشی</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">جمی برای فعّال کردن این ویژگی به دسترسی «خواندن مخاطبان» نیاز دارد. لطفاً اعطایش کنید.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index c45aa63..ada7547 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -109,6 +109,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera oikeudet</string>
   <string name="permission_dialog_camera_message">Videopuhelut vaativat toimiakseen kameran käyttöoikeudet.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Virhe</string>
   <string name="ringtone_error_format_not_supported">Tätä tiedostomuotoa ei tueta.</string>
   <string name="ringtone_error_size_too_big">Tämä tiedosto on liian suuri. Maksimikoko on %1$dkt.</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 d56466b..62849d5 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
@@ -20,6 +20,7 @@
   <!--Call Fragment-->
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 26f908d..dc8226c 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
@@ -84,8 +84,10 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Droits d\'accès à la caméra</string>
   <string name="permission_dialog_camera_message">Les conversations vidéos requièrent les droits d\'accès à la caméra pour fonctionner. S.v.p. envisager d\'octroyer ces droits.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Erreur</string>
   <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté.</string>
+  <string name="ringtone_custom_label">coutume</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 d56466b..62849d5 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
@@ -20,6 +20,7 @@
   <!--Call Fragment-->
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 553921e..da04043 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
@@ -66,6 +66,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Autoriser la caméra</string>
   <string name="permission_dialog_camera_message">Les conversations en mode vidéo demandent à ce que les permissions soient accordées. Merci d\'activer les permissions.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Erreur</string>
   <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté</string>
   <!--Read contacts permission-->
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 7595ad3..5df29fe 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -113,9 +113,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permission d\'accès à la caméra</string>
   <string name="permission_dialog_camera_message">Les conversation vidéo nécessitent la permission d\'utiliser l\'objectif. Merci de l\'autoriser.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Erreur</string>
   <string name="ringtone_error_format_not_supported">Ce format de fichier n\'est pas supporté.</string>
   <string name="ringtone_error_size_too_big">Le fichier est trop grand. La taille maximum est %1$d kB.</string>
+  <string name="ringtone_custom_label">Personnalisé</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami a besoin de votre autorisation pour lire vos contacts. Autorisez Jami, svp.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 174b92a..6901c3d 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -34,7 +34,9 @@
   <string name="send_message">שלח הודעה</string>
   <string name="message_failed">של</string>
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">שגיאה</string>
+  <string name="ringtone_custom_label">מותאם</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings.xml b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
index f7d78d0..6a558bf 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
@@ -29,6 +29,7 @@
   <!--Call Fragment-->
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 455fb5f..cb2056f 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -95,9 +95,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Dozvola kamere</string>
   <string name="permission_dialog_camera_message">Video pozivi zahtjevaju dozvolu korištenja kamere. Molimo dozvolite aplikaciji korištenje kamere.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Greška</string>
   <string name="ringtone_error_format_not_supported">Ovaj format nije podržan.</string>
   <string name="ringtone_error_size_too_big">Datoteka je prevelika. Maksimalna veličina je %1$dkB.</string>
+  <string name="ringtone_custom_label">Prilagođeno</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 23df8dd..a668205 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -15,6 +15,7 @@
   <string name="license">Ez a szoftver a „jelen állapotában” kerül kiadásra, mindenféle garanciavállalás nélkül. A részletekért lásd a<u>GNU általános nyilvános engedély 3-as vagy újabb verzióját</u></string>
   <string name="description">A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét.</string>
   <string name="credits">Készítők</string>
+  <string name="call_service_description">Ez a szolgáltatás szükséges a hívások előtérben történő futtatásához. Csak hívások alatt fut.</string>
   <!--About dialog-->
   <string name="developed_by">Fejlesztők</string>
   <string name="designed_by">Tervezők</string>
@@ -114,9 +115,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kameraengedély</string>
   <string name="permission_dialog_camera_message">A videótársalgások működéséhez szükséges a kamera engedély. Fontolja meg az engedélyezését!</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Hiba</string>
   <string name="ringtone_error_format_not_supported">Ez a formátum nem támogatott</string>
   <string name="ringtone_error_size_too_big">Ez a fájl túl nagy. A maximum méret %1$d kB.</string>
+  <string name="ringtone_custom_label">Szokás</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">A Jaminak szüksége van a „Kapcsolatok olvasása” engedélyre. Kérjük, engedélyezze.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index eece72e..41d51fa 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -45,6 +45,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Izin kamera</string>
   <string name="permission_dialog_camera_message">Percakapan video memerlukan izin kamera agar dapat bekerja.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Galat</string>
   <string name="ringtone_error_format_not_supported">Format tidak didukung.</string>
   <!--Read contacts permission-->
diff --git a/ring-android/app/src/main/res/values-ig/strings.xml b/ring-android/app/src/main/res/values-ig/strings.xml
index ce45c9e..cc9f8a9 100644
--- a/ring-android/app/src/main/res/values-ig/strings.xml
+++ b/ring-android/app/src/main/res/values-ig/strings.xml
@@ -20,6 +20,7 @@
   <!--Text messages-->
   <string name="send_message">Zie ozi</string>
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 7cc498f..14a8739 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
@@ -110,9 +110,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permesso videocamera</string>
   <string name="permission_dialog_camera_message">Le videochiamate hanno bisogna del permesso per accedere alla videocamera. Se lo desideri, attivalo.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Errore</string>
   <string name="ringtone_error_format_not_supported">Questo formato non è supportato.</string>
   <string name="ringtone_error_size_too_big">Il file è troppo grande. La dimensione massima consentita è di %1$dkB</string>
+  <string name="ringtone_custom_label">Personalizzato</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami necessita dell\'autorizzazione a \"Accedere ai Contatti\" per abilitare questa funzione. Concedere Autorizzazione</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 4648c64..d003c5a 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -15,6 +15,7 @@
   <string name="license">Questo software è fornito \"così com\'è\", senza garanzie di alcun tipo. Per dettagli, vedi <u>GNU General Public License versione 3 o successiva</u></string>
   <string name="description">Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.</string>
   <string name="credits">Crediti</string>
+  <string name="call_service_description">Questo servizio è necessario per mantenere le chiamate in esecuzione in primo piano. Funziona solo durante le chiamate.</string>
   <!--About dialog-->
   <string name="developed_by">Sviluppato da</string>
   <string name="designed_by">Progettato da</string>
@@ -114,9 +115,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Attivare videocamera</string>
   <string name="permission_dialog_camera_message">Le videochiamate richiedono l\'autorizzazione Fotocamera per funzionare. Per favore attivala.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Errore</string>
   <string name="ringtone_error_format_not_supported">Questo formato non è supportato.</string>
   <string name="ringtone_error_size_too_big">Questo file è troppo grande. La dimensione massima è %1$dkB.</string>
+  <string name="ringtone_custom_label">Personalizzato</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami ha bisogno dell\'autorizzazione \"Lettura contatti\" per abilitare questa funzionalità. Per favore concedila.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index eff321d..061f3b0 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -119,6 +119,8 @@
   <string name="ring_account">Account Jami</string>
   <string name="ring_account_identity">Identità</string>
   <string name="account_update_needed">Aggiornamento necessario</string>
+  <string name="account_cannot_be_found_title">Impossibile trovare l\'account</string>
+  <string name="account_no_network_title">Impossibile connettersi alla rete</string>
   <string name="account_sip_success_title">Account SIP registrato</string>
   <string name="account_link_prompt_pin">Inserisci PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index e3cf90f..b226b19 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -10,6 +10,7 @@
   <string name="pref_pushNotifications_title">Push notifiche</string>
   <string name="pref_pushNotifications_summary">Usa i server Google per ricevere chiamate/messaggi in background</string>
   <string name="pref_hd_summary">Attiva invio video HD</string>
+  <string name="pref_hwEncode_title">Abilita codifica accelerata</string>
   <string name="pref_hwEncode_summary">Funzione sperimentale</string>
   <string name="pref_systemContacts_title">Usare i contatti del dispositivo</string>
   <string name="pref_systemContacts_summary">Usare i contatti del dispositivo per mostrare i dettagli di chi chiama. </string>
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 8d1146c..960e819 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -78,8 +78,10 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">カメラのアクセス許可</string>
   <string name="permission_dialog_camera_message">ビデオ会話ではカメラが動作するためにアクセス許可が必要です。 有効にすることを検討してください。</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">エラー</string>
   <string name="ringtone_error_format_not_supported">この形式はサポートされていません。</string>
+  <string name="ringtone_custom_label">カスタム</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings.xml b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
index dc1ab0f..8536e79 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
@@ -20,6 +20,7 @@
   <string name="ab_action_contact_add">연락처에 추가</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 e750b8d..30ae917 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -106,6 +106,7 @@
   <string name="hist_file_received">Failas gautas</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kameros leidimas</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Klaida</string>
   <string name="ringtone_error_format_not_supported">Šis formatas yra nepalaikomas.</string>
   <string name="ringtone_error_size_too_big">Šis failas yra per didelis. Didžiausias dydis yra %1$dkB.</string>
@@ -192,10 +193,12 @@
   <string name="file_transfer_status_unsupported">nepalaikoma</string>
   <string name="file_transfer_status_invalid_pathname">neteisingas kelio pavadinimas</string>
   <string name="file_saved_in">Failas įrašytas į %s</string>
+  <string name="file_saved_successfully">Failas sėkmingai įrašytas</string>
   <string name="no_space_left_on_device">Įrenginyje nebeliko vietos</string>
   <string name="title_media_viewer">Medijos žiūryklė</string>
   <string name="menu_file_open">Atverti failą</string>
   <string name="menu_file_download">Atsisiųsti failą</string>
+  <string name="menu_file_save">Įrašyti failą</string>
   <string name="menu_file_delete">Ištrinti failą</string>
   <string name="menu_file_share">Bendrinti failą</string>
   <string name="menu_message_copy">Kopijuoti</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index e5ccd35..c24f0a6 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -68,8 +68,10 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Akses kamera</string>
   <string name="permission_dialog_camera_message">Perbualan video memerlukan akses kepada kamera untuk bekerja dengan sempurna. Sila pertimbangkan untuk membenarkan akses tersebut.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Gagal</string>
   <string name="ringtone_error_format_not_supported">Format ini tidak disokong.</string>
+  <string name="ringtone_custom_label">Tidak lalai</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index d004193..bc9d0c0 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -110,9 +110,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamerarettigheter</string>
   <string name="permission_dialog_camera_message">Videosamtaler krever tilgang til kameraet for å virke.  Vurder å aktivere det.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Feil</string>
   <string name="ringtone_error_format_not_supported">Dette formatet støttes ikke</string>
   <string name="ringtone_error_size_too_big">Filen er for stor.  Maksimal størrelse er %1$d kB.</string>
+  <string name="ringtone_custom_label">Tilpasset</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami trenger tilgang til å «Lese kontakter» for å aktivere denne egenskapen.  Vær så snill å gi tilgang.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 7fad1c0..6717e3b 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
@@ -9,15 +9,17 @@
   <string name="contribute_section">Bijdragen</string>
   <string name="version_section">Versie</string>
   <string name="no_email_app_installed">Geen e-mailapp gevonden, installeer er een om ons een rapport te kunnen sturen</string>
-  <string name="no_browser_app_installed">Geen webbrowserapp gevonden, installeer er een om deze pagina te bekijken</string>
+  <string name="no_browser_app_installed">Geen webbrowserapp gevonden, installeer er een om dit blad te bekijken</string>
   <string name="email_chooser_title">E-mail versturen met…</string>
   <string name="website_chooser_title">Website bekijken met…</string>
   <string name="license">Deze software wordt ‘als zodanig’ aangeboden zonder enige garantie. Bekijk voor meer informatie de <u>GNU General Public License versie 3 of later</u></string>
   <string name="description">Jami is vrije software voor universele communicatie, die de vrijheden en privacy van zijn gebruikers eerbiedigt.</string>
   <string name="credits">Met dank aan</string>
+  <string name="call_service_description">Deze dienst is vereist om uw oproepen op de voorgrond te blijven uitvoeren. Hij draait enkel tijdens oproepen.</string>
   <!--About dialog-->
   <string name="developed_by">Ontwikkeld door</string>
   <string name="designed_by">Ontworpen door</string>
+  <string name="ringtones_by">Beltonen door</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
@@ -57,9 +59,12 @@
   <string name="notif_incoming_call">Inkomende oproep</string>
   <string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
   <string name="notif_outgoing_call">Uitgaande oproep</string>
+  <string name="notif_current_call_title">Oproep met %1$s bezig</string>
   <string name="notif_current_call">Lopende oproep</string>
+  <string name="notif_channel_call_in_progress">Oproep bezig</string>
   <string name="notif_channel_calls">Oproepen</string>
   <string name="notif_channel_missed_calls">Gemiste oproepen</string>
+  <string name="notif_channel_incoming_calls">Inkomende oproepen</string>
   <string name="notif_channel_messages">Berichten</string>
   <string name="notif_channel_requests">Verzoeken</string>
   <string name="notif_channel_file_transfer">Bestandsoverdracht</string>
@@ -83,7 +88,7 @@
   <string name="hist_in_call">Inkomende oproep van %1$s</string>
   <string name="hist_out_call">Uitgaande oproep van %1$s</string>
   <string name="start_error_title">Jami kan niet opgestart worden!</string>
-  <string name="start_error_mic_required">Jami vereist toestemming om de microfoon te kunnen gebruiken.</string>
+  <string name="start_error_mic_required">Jami vereist toegang tot de microfoon.</string>
   <string name="action_call_accept">Oproep aannemen</string>
   <string name="action_call_decline">Weigeren</string>
   <string name="action_call_mic_mute">Microfoon dempen</string>
@@ -109,16 +114,22 @@
   <string name="hist_file_received">Bestand ontvangen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
-  <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_dialog_camera_message">Videogesprekken vereisen toegang tot de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fout</string>
   <string name="ringtone_error_format_not_supported">Dit formaat wordt niet ondersteund.</string>
   <string name="ringtone_error_size_too_big">Dit bestand is te groot. De maximale grootte is %1$dkB.</string>
+  <string name="ringtone_custom_label">Aangepast</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Jami vereist de ‘Contacten lezen’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
+  <string name="permission_dialog_read_contacts_message">Jami vereist toegang tot uw contacten om deze functie in te schakelen. Gelieve deze machtiging toe te kennen.</string>
   <!--Write call log permission-->
-  <string name="permission_dialog_write_call_log_message">Jami vereist de ‘Oproepgeschiedenis’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
+  <string name="permission_dialog_write_call_log_message">Jami vereist toegang tot uw oproepgeschiedenis om deze functie in te schakelen. Gelieve deze machtiging toe te kennen.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scan de QR-code van de toe te voegen account.</string>
+  <string name="title_activity_qrcode">Mijn account delen</string>
+  <string name="error_scan_no_camera_permissions">De QR-codescanner vereist toegang tot de camera</string>
+  <string name="tab_code">Mijn code</string>
+  <string name="tab_scan">Code scannen</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
   <string name="clear_history_dialog_message">Deze handeling kan niet ongedaan gemaakt worden.</string>
@@ -139,19 +150,20 @@
   <string name="conversation_action_select_peer_number">Kies een nummer</string>
   <string name="conversation_action_block_this">Contact blokkeren</string>
   <string name="conversation_action_go_to_call">Terug naar lopende oproep</string>
+  <string name="conversation_open_file_error">Er is geen app geïnstalleerd om dit bestandstype mee te openen.</string>
   <string name="clip_contact_uri">Contactadres</string>
   <string name="block_contact_dialog_title">%1$s blokkeren?</string>
   <string name="block_contact_dialog_message">%1$s zal u niet meer kunnen contacteren totdat u hem/haar deblokkeert.</string>
   <string name="block_contact_completed">%1$s is geblokkeerd.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s toevoegen?</string>
-  <string name="prompt_new_password">Nieuw wachtwoord</string>
-  <string name="prompt_new_password_optional">Nieuw wachtwoord (optioneel)</string>
-  <string name="prompt_new_password_repeat">Herhaal nieuw wachtwoord</string>
+  <string name="prompt_new_password">Nieuw paswoord</string>
+  <string name="prompt_new_password_optional">Nieuw paswoord (optioneel)</string>
+  <string name="prompt_new_password_repeat">Herhaal nieuw paswoord</string>
   <string name="account_create_title">Een Jami-account aanmaken</string>
   <string name="prompt_new_username">Geef nieuwe gebruikersnaam in</string>
-  <string name="help_password_choose">Kies een sterk wachtwoord om uw Jami-account te beschermen.</string>
-  <string name="help_password_enter">Geef het hoofdwachtwoord van uw Jami-account in</string>
+  <string name="help_password_choose">Kies een sterk paswoord om uw Jami-account te beschermen.</string>
+  <string name="help_password_enter">Geef het hoofdpaswoord van uw Jami-account in</string>
   <string name="help_pin_enter">Geef de pincode in vanuit uw Jami-account die al is geconfigureerd op een ander apparaat. Gebruik de functie ‘Jami-account exporteren’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
@@ -207,12 +219,16 @@
   <string name="file_transfer_status_invalid_pathname">ongeldige padnaam</string>
   <string name="file_transfer_status_unjoinable_peer">peer kan niet deelnemen</string>
   <string name="file_saved_in">Bestand opgeslagen in %s</string>
+  <string name="file_saved_successfully">Bestand opgeslagen</string>
   <string name="no_space_left_on_device">Geen vrije ruimte resterend op apparaat</string>
   <string name="title_media_viewer">Mediaweergave</string>
   <string name="menu_file_open">Bestand openen</string>
   <string name="menu_file_download">Bestand downloaden</string>
+  <string name="menu_file_save">Bestand opslaan</string>
   <string name="menu_file_delete">Bestand verwijderen</string>
   <string name="menu_file_share">Bestand delen</string>
   <string name="menu_message_copy">Kopiëren</string>
+  <string name="menu_message_delete">Bericht verwijderen</string>
+  <string name="menu_message_cancel">Bericht annuleren</string>
   <string name="menu_delete">Verwijderen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
index fbb6586..9c9511f 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
@@ -7,10 +7,11 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Jami-account toevoegen</string>
   <string name="add_sip_account_title">SIP-account toevoegen</string>
+  <string name="ring_account_default_name">Jami-account %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostnaam</string>
   <string name="prompt_username">Gebruikersnaam</string>
-  <string name="prompt_password">Wachtwoord</string>
+  <string name="prompt_password">Paswoord</string>
   <string name="action_create">Account aanmaken</string>
   <string name="action_create_short">Aanmaken</string>
   <string name="action_register">Registreren</string>
@@ -40,12 +41,12 @@
   <string name="account_device_revocation_success_title">Klaar</string>
   <string name="account_device_revocation_success">Het apparaat is nu ingetrokken!</string>
   <string name="account_device_revocation_error_title">Kan apparaat niet intrekken</string>
-  <string name="account_device_revocation_wrong_password">Verkeerd wachtwoord.</string>
+  <string name="account_device_revocation_wrong_password">Verkeerd paswoord.</string>
   <string name="account_device_revocation_unknown_device">Onbekend apparaat.</string>
   <string name="account_device_revocation_error_unknown">Onbekende fout.</string>
-  <string name="account_password_change">Wachtwoord wijzigen</string>
-  <string name="account_password_set">Wachtwoord instellen</string>
-  <string name="account_password_change_wait_message">Accountwachtwoord wordt gewijzigd</string>
+  <string name="account_password_change">Paswoord wijzigen</string>
+  <string name="account_password_set">Paswoord instellen</string>
+  <string name="account_password_change_wait_message">Accountpaswoord wordt gewijzigd</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
   <string name="account_basic_category">Basisinstellingen</string>
@@ -53,7 +54,7 @@
   <string name="account_hostname_label">Hostnaam</string>
   <string name="account_bootstrap_label">Bootstrap</string>
   <string name="account_username_label">Gebruikersnaam</string>
-  <string name="account_password_label">Wachtwoord</string>
+  <string name="account_password_label">Paswoord</string>
   <string name="account_optionnal_category">Optionele instellingen</string>
   <string name="account_useragent_label">Gebruikersagent</string>
   <string name="account_autoanswer_label">Automatisch beantwoorden</string>
@@ -80,7 +81,7 @@
   <string name="account_turn_enable_label">TURN gebruiken</string>
   <string name="account_turn_server_label">TURN-server</string>
   <string name="account_turn_username_label">TURN-gebruikersnaam</string>
-  <string name="account_turn_password_label">TURN-wachtwoord</string>
+  <string name="account_turn_password_label">TURN-paswoord</string>
   <string name="account_published_same_as_local_label">Gepubliceerd gelijk aan lokaal</string>
   <string name="account_published_port_label">Gepubliceerde poort</string>
   <string name="account_published_address_label">Gepubliceerd adres</string>
@@ -100,7 +101,7 @@
   <string name="account_tls_certificate_list_label">Certificeringsinstanties</string>
   <string name="account_tls_certificate_file_label">Certificaatbestand</string>
   <string name="account_tls_private_key_file_label">Bestand met persoonlijke sleutel</string>
-  <string name="account_tls_password_label">Wachtwoord persoonlijke sleutel</string>
+  <string name="account_tls_password_label">Paswoord persoonlijke sleutel</string>
   <string name="account_tls_method_label">TLS-methode</string>
   <string name="account_tls_ciphers_label">TLS-sleutels</string>
   <string name="account_tls_server_name_label">Servernaam</string>
@@ -111,21 +112,23 @@
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Audio RTP-poortenreeks</string>
   <!--restore/backup-->
-  <string name="account_new_device_password">Geef hoofdwachtwoord in om account te ontgrendelen</string>
+  <string name="account_new_device_password">Geef hoofdpaswoord in om account te ontgrendelen</string>
   <string name="error_password_char_count">Minimaal 6 tekens</string>
-  <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
+  <string name="error_passwords_not_equals">Paswoorden komen niet overeen</string>
   <string name="export_account_wait_title">Even geduld…</string>
-  <string name="account_export_end_decryption_message">Kon uw account niet ontgrendelen met het ingegeven wachtwoord.</string>
+  <string name="export_account_wait_message">Accountinformatie wordt geëxporteerd</string>
+  <string name="account_export_file">Back-up maken van account</string>
+  <string name="account_export_end_decryption_message">Kon uw account niet ontgrendelen met het ingegeven paswoord.</string>
   <string name="account_export_end_network_title">Netwerkfout</string>
   <string name="account_export_end_network_message">Kon account niet exporteren over het netwerk. Controleer uw netwerkverbinding.</string>
   <string name="account_export_end_error_title">Fout</string>
   <string name="account_export_end_error_message">Kon account niet exporteren. Er is een onbekende fout opgetreden.</string>
-  <string name="account_enter_password">Geef wachtwoord in</string>
+  <string name="account_enter_password">Geef paswoord in</string>
   <string name="account_share_body">Contacteer mij met ‘%1$s’ op Jami, het gedistribueerde communicatieplatform: %2$s</string>
   <string name="account_share_body_with_username">Contacteer mij met ‘%1$s’ of mijn openbare gebruikersnaam ‘%2$s’ op Jami, het gedistribueerde communicatieplatform: %3$s</string>
   <string name="account_contact_me">Contacteer mij op Jami!</string>
   <string name="update_account">Account bijwerken</string>
-  <string name="account_migration">Uw Jami-account kan bijgewerkt worden.\nGeef uw wachtwoord in.</string>
+  <string name="account_migration">Uw Jami-account kan bijgewerkt worden.\nGeef uw paswoord in.</string>
   <string name="ring_account">Jami-account</string>
   <string name="ring_account_identity">Identiteit</string>
   <string name="account_migration_title_dialog">Accountmigratie</string>
@@ -140,10 +143,12 @@
   <string name="account_device_added_message">Uw Jami-account is met succes op dit apparaat ingesteld.</string>
   <string name="account_device_updated_title">Accountapparaat bijgewerkt</string>
   <string name="account_device_updated_message">Uw Jami-account is met succes bijgewerkt.</string>
-  <string name="account_cannot_be_updated_message">Accountapparaat kon niet bijgewerkt worden. Controleer uw wachtwoord.</string>
+  <string name="account_cannot_be_updated_message">Accountapparaat kon niet bijgewerkt worden. Controleer uw paswoord.</string>
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
+  <string name="account_link_button">Verbinden uit netwerk</string>
+  <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Geef pincode in</string>
   <string name="account_new_button">Een Jami-account aanmaken</string>
   <string name="account_link_export_button">Een ander apparaat aan deze account koppelen</string>
@@ -156,12 +161,14 @@
   <!--Name registration-->
   <string name="error_username_empty">Geef een gebruikersnaam in</string>
   <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor deze account</string>
+  <string name="username_available">Gebruikersnaam is beschikbaar!</string>
   <string name="register_name">Naam registreren</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
   <string name="register_username">Registreer een openbare gebruikersnaam (aanbevolen)</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
+  <string name="unknown_error">Onbekende fout. Controleer uw netwerkverbinding!</string>
   <string name="looking_for_username_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd…</string>
   <string name="account_status_connecting">Verbinden</string>
   <string name="account_status_connection_error">Verbindingsfout</string>
@@ -177,8 +184,8 @@
   <!--Edit profile-->
   <string name="account_edit_profile">Bewerk uw profiel</string>
   <!--Devices-->
-  <string name="account_revoke_device_hint">Geef wachtwoord in ter bevestiging</string>
-  <string name="enter_password">Geef wachtwoord in</string>
+  <string name="account_revoke_device_hint">Geef paswoord in ter bevestiging</string>
+  <string name="enter_password">Geef paswoord in</string>
   <string name="revoke_device_title">Apparaat intrekken</string>
   <string name="revoke_device_message">Weet u zeker dat u %1$s wilt intrekken?</string>
   <string name="revoke_device_wait_title">Even geduld…</string>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index e0d81cf..b8bcac4 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -29,6 +29,7 @@
   <string name="ab_action_contact_add">Voeg toe aan contacten</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index e60dd16..ddfb8ce 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -15,9 +15,11 @@
   <string name="license">Deze software wordt ‘als zodanig’ aangeboden zonder enige garantie. Bekijk voor meer informatie de <u>GNU General Public License versie 3 of later</u></string>
   <string name="description">Jami is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.</string>
   <string name="credits">Met dank aan</string>
+  <string name="call_service_description">Deze dienst is vereist om uw oproepen op de voorgrond te blijven uitvoeren. Ze draait enkel tijdens oproepen.</string>
   <!--About dialog-->
   <string name="developed_by">Ontwikkeld door</string>
   <string name="designed_by">Ontworpen door</string>
+  <string name="ringtones_by">Beltonen door</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
@@ -57,9 +59,12 @@
   <string name="notif_incoming_call">Inkomende oproep</string>
   <string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
   <string name="notif_outgoing_call">Uitgaande oproep</string>
+  <string name="notif_current_call_title">Oproep met %1$s bezig</string>
   <string name="notif_current_call">Lopende oproep</string>
+  <string name="notif_channel_call_in_progress">Oproep bezig</string>
   <string name="notif_channel_calls">Oproepen</string>
   <string name="notif_channel_missed_calls">Gemiste oproepen</string>
+  <string name="notif_channel_incoming_calls">Inkomende oproepen</string>
   <string name="notif_channel_messages">Berichten</string>
   <string name="notif_channel_requests">Verzoeken</string>
   <string name="notif_channel_file_transfer">Bestandsoverdracht</string>
@@ -110,15 +115,21 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
   <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fout</string>
   <string name="ringtone_error_format_not_supported">Dit formaat wordt niet ondersteund.</string>
   <string name="ringtone_error_size_too_big">Dit bestand is te groot. De maximale grootte is %1$dkB.</string>
+  <string name="ringtone_custom_label">Aangepast</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami vereist de ‘Contacten lezen’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Jami vereist de ‘Oproepgeschiedenis’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scan de QR-code van het toe te voegen account.</string>
+  <string name="title_activity_qrcode">Mijn account delen</string>
+  <string name="error_scan_no_camera_permissions">De QR-codescanner vereist toestemming om de camera te kunnen gebruiken</string>
+  <string name="tab_code">Mijn code</string>
+  <string name="tab_scan">Code scannen</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
   <string name="clear_history_dialog_message">Deze handeling kan niet ongedaan gemaakt worden.</string>
@@ -139,6 +150,7 @@
   <string name="conversation_action_select_peer_number">Kies een nummer</string>
   <string name="conversation_action_block_this">Contact blokkeren</string>
   <string name="conversation_action_go_to_call">Terug naar lopende oproep</string>
+  <string name="conversation_open_file_error">Er is geen toepassing geïnstalleerd om dit bestandstype te openen.</string>
   <string name="clip_contact_uri">Contactadres</string>
   <string name="block_contact_dialog_title">%1$s blokkeren?</string>
   <string name="block_contact_dialog_message">%1$s zal u niet meer kunnen contacteren totdat u hem/haar deblokkeert.</string>
@@ -207,12 +219,16 @@
   <string name="file_transfer_status_invalid_pathname">ongeldige padnaam</string>
   <string name="file_transfer_status_unjoinable_peer">peer kan niet deelnemen</string>
   <string name="file_saved_in">Bestand opgeslagen in %s</string>
+  <string name="file_saved_successfully">Bestand opgeslagen</string>
   <string name="no_space_left_on_device">Geen vrije ruimte resterend op apparaat</string>
   <string name="title_media_viewer">Mediaweergave</string>
   <string name="menu_file_open">Bestand openen</string>
   <string name="menu_file_download">Bestand downloaden</string>
+  <string name="menu_file_save">Bestand opslaan</string>
   <string name="menu_file_delete">Bestand verwijderen</string>
   <string name="menu_file_share">Bestand delen</string>
   <string name="menu_message_copy">Kopiëren</string>
+  <string name="menu_message_delete">Bericht verwijderen</string>
+  <string name="menu_message_cancel">Bericht annuleren</string>
   <string name="menu_delete">Verwijderen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index f476cab..edd6a2e 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Jami-account toevoegen</string>
   <string name="add_sip_account_title">SIP-account toevoegen</string>
+  <string name="ring_account_default_name">Jami-account %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostnaam</string>
   <string name="prompt_username">Gebruikersnaam</string>
@@ -17,7 +18,7 @@
   <string name="action_settings">Instellingen</string>
   <string name="error_field_required">Dit veld is verplicht</string>
   <string name="dialog_wait_create">Account wordt toegevoegd</string>
-  <string name="dialog_wait_create_details">Uw nieuwe account wordt toegevoegd, even geduld…</string>
+  <string name="dialog_wait_create_details">Uw nieuw account wordt toegevoegd, even geduld…</string>
   <string name="dialog_wait_update">Account wordt bijgewerkt</string>
   <string name="dialog_wait_update_details">Uw account wordt bijgewerkt, even geduld…</string>
   <string name="dialog_warn_ip2ip_account_title">Leeg SIP-account aanmaken?</string>
@@ -115,6 +116,7 @@
   <string name="error_password_char_count">Minimaal 6 tekens</string>
   <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
   <string name="export_account_wait_title">Even geduld…</string>
+  <string name="export_account_wait_message">Accountinformatie wordt geëxporteerd</string>
   <string name="account_export_file">Reservekopie van account maken</string>
   <string name="account_export_end_decryption_message">Kon uw account niet ontgrendelen met het opgegeven wachtwoord.</string>
   <string name="account_export_end_network_title">Netwerkfout</string>
@@ -145,6 +147,8 @@
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
+  <string name="account_link_button">Verbinden uit netwerk</string>
+  <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Voer pincode in</string>
   <string name="account_new_button">Een Jami-account aanmaken</string>
   <string name="account_link_export_button">Een ander apparaat aan dit account koppelen</string>
@@ -157,12 +161,14 @@
   <!--Name registration-->
   <string name="error_username_empty">Voer een gebruikersnaam in</string>
   <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor dit account</string>
+  <string name="username_available">Gebruikersnaam is beschikbaar!</string>
   <string name="register_name">Naam registreren</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
   <string name="register_username">Registreer een openbare gebruikersnaam (aanbevolen)</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
+  <string name="unknown_error">Onbekende fout. Controleer uw netwerkverbinding!</string>
   <string name="looking_for_username_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd…</string>
   <string name="account_status_connecting">Verbinden</string>
   <string name="account_status_connection_error">Verbindingsfout</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/ring-android/app/src/main/res/values-nl/strings_call.xml
index 0d1bf5f..35c0954 100644
--- a/ring-android/app/src/main/res/values-nl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_call.xml
@@ -31,7 +31,7 @@
     <string name="call_human_state_ringing">Gaat over</string>
     <string name="call_human_state_current">Praten</string>
     <string name="call_human_state_hungup">Opgehangen</string>
-    <string name="call_human_state_busy">Bezig</string>
+    <string name="call_human_state_busy">Bezet</string>
     <string name="call_human_state_failure">Mislukt</string>
     <string name="call_human_state_hold">In wacht zetten</string>
     <string name="call_human_state_unhold">Uit wacht halen</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 97aaf05..328c002 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -110,6 +110,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">ਕੈਮਰਾ ਇਜਾਜ਼ਤ</string>
   <string name="permission_dialog_camera_message">ਵੀਡੀਓ ਗੱਲਾਂਬਾਤਾਂ ਕਰਨ ਲਈ ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ। ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰੋ।</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">ਗੜਬੜ</string>
   <string name="ringtone_error_format_not_supported">ਇਸ ਵੰਨਗੀ ਦੀ ਸੁਵਿਧਾ ਨਹੀਂ ਹੈ।</string>
   <string name="ringtone_error_size_too_big">ਇਹ ਫ਼ਾਈਲ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ %1$dkB ਹੋਵੇ।</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 4c7de6c..10c86b7 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
   <string name="permission_dialog_camera_message">Rozmowy wideo wymagają przyznania uprawnień dla aparatu. Proszę rozważyć udzielenie ich.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Błąd</string>
   <string name="ringtone_error_format_not_supported">Ten format nie jest obsługiwany.</string>
   <string name="ringtone_error_size_too_big">Ten plik jest zbyt duży! Maksymalny rozmiar to %1$d kB.</string>
+  <string name="ringtone_custom_label">Wartość własna</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index e1c52c1..72ecad0 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -115,9 +115,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
   <string name="permission_dialog_camera_message">Rozmowy wideo wymagają przyznania uprawnień dla aparatu. Proszę rozważyć udzielenie ich.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Błąd</string>
   <string name="ringtone_error_format_not_supported">Ten format nie jest obsługiwany.</string>
   <string name="ringtone_error_size_too_big">Ten plik jest zbyt duży! Maksymalny rozmiar to %1$d kB.</string>
+  <string name="ringtone_custom_label">Wartość własna</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami potrzebuje pozwolenia na czytanie kontaktów, by włączyć tą funkcję.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 945df4a..534a7c9 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -111,9 +111,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permissão de câmera</string>
   <string name="permission_dialog_camera_message">Conversas de vídeo requerem permissão para acesso à câmera. Considere habilitá-la.</string>
+  <!--Ringtone activity-->
   <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 arquivo é grande demais. O tamanho máximo é %1$dkB.</string>
+  <string name="ringtone_custom_label">Personalizado</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">O Jami precisa da permissão \"Acessar contatos\" para habilitar esta função. Permita, por favor.</string>
   <!--Write call log permission-->
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 e5c1806..5100ff2 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
@@ -113,9 +113,11 @@
   <!--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>
+  <!--Ringtone activity-->
   <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_label">Personalizado</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-->
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index e5c1806..5100ff2 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -113,9 +113,11 @@
   <!--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>
+  <!--Ringtone activity-->
   <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_label">Personalizado</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-->
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
index 84fc765..7d39d20 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -65,6 +65,7 @@
   <string name="send_message">Trimite messajul</string>
   <string name="message_sending">Se transmite mesajul...</string>
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Eroare</string>
   <string name="ringtone_error_format_not_supported">Acest format nu este suportat</string>
   <!--Read contacts permission-->
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 e8c15ee..390a01b 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
@@ -72,7 +72,9 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Разрешение на использование камеры</string>
   <string name="permission_dialog_camera_message">Необходимо доступ к камере для работы с видеозвонками. Пожалуйста, предоставьте их.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Ошибка</string>
+  <string name="ringtone_custom_label">Своё</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 45a90a1..4be4448 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Разрешение на доступ к камере</string>
   <string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, предоставьте его.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Ошибка</string>
   <string name="ringtone_error_format_not_supported">Этот формат не поддерживается</string>
   <string name="ringtone_error_size_too_big">Этот файл слишком большой. Максимальный размер — %1$dКб.</string>
+  <string name="ringtone_custom_label">Настраиваемый</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami требуется разрешение «Чтение контактов», чтобы включить эту функцию. Пожалуйста, предоставьте его.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 4012e59..d129f3f 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Povolenie kamery</string>
   <string name="permission_dialog_camera_message">Video konverzácie vyžadujú povolenie používať kameru. Zvážte jeho udelenie.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Chyba</string>
   <string name="ringtone_error_format_not_supported">Tento formát nie je podporovaný.</string>
   <string name="ringtone_error_size_too_big">Tento súbor je priveľký. Maximálna veľkosť je %1$dkB.</string>
+  <string name="ringtone_custom_label">Vlastný</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami potrebuje povolenie čítať kontakty na zapnutie tejto funkcie. Zvážte jeho udelenie.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 9656409..8ad6412 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -77,8 +77,10 @@
   <string name="time_just_now">Ravnokar</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Dovoljenje kamere</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Napaka</string>
   <string name="ringtone_error_format_not_supported">Format ni podprt.</string>
+  <string name="ringtone_custom_label">Lastno</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
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 6b66f1a..77eb113 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
@@ -15,6 +15,8 @@
   <string name="license">Ky software jepet \"siç është\", pa asnjë garanci të çfarëdo lloji. Për hollësi, shihni <u>GNU General Public License, version 3 ose më të re</u></string>
   <string name="description">Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.</string>
   <string name="credits">Kredite</string>
+  <string name="call_service_description">Ky shërbim është i nevojshëm për t\’i mbajtur thirrjet tuaja në funksionim në pjesën e përparme. Ai xhiron vetëm gjatë thirrjesh.</string>
+  <string name="data_transfer_service_description">Ky shërbim është i domosdoshëm për të shfaqur mesazhe gjatë shpërnguljesh kartelash. Xhiron vetëm gjatë shpërnguljesh kartelash.</string>
   <!--About dialog-->
   <string name="developed_by">Programuar nga</string>
   <string name="designed_by">Skicuar nga</string>
@@ -114,9 +116,13 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Leje për kamerën</string>
   <string name="permission_dialog_camera_message">Që të funksionojnë, bisedat me video lypin doemos leje për kamerën. Ju lutemi, shihni mundësinë e akordimit të saj.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Gabim</string>
   <string name="ringtone_error_format_not_supported">Ky format nuk mbulohet.</string>
   <string name="ringtone_error_size_too_big">Kjo kartelë është shumë e madhe. Madhësia maksimum është %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Caktoni një zile vetjake</string>
+  <string name="ringtone_custom_label">Vetjake</string>
+  <string name="ringtone_jami_tones">Tone Jami</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami-t i duhet leja \"Lexo në kontakte\" që të aktivizojë këtë veçori. Ju lutemi, akordojani.</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index 340b266..23ab6a0 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -67,6 +67,8 @@
   <string name="account_ringtone_enabled_label">Aktivizo zilen</string>
   <string name="account_ringtone_path_label">Shteg zileje</string>
   <string name="account_ringtone_custom_label">Përdor zile vetjake</string>
+  <string name="account_ringtone_title">Zgjidhni një zile</string>
+  <string name="account_ringtone_summary">Përzgjidhni një zile ose zgjidhni një tuajën</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Aktivizo Video</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index 4647ef6..35be265 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Lejoni Jami në rrjete 3G/LTE, si shtesë ndaj atyre Wi-Fi</string>
   <string name="pref_pushNotifications_title">Njoftime push</string>
   <string name="pref_pushNotifications_summary">Përdorni shërbyesit Google që të lejoni marrje thirrjesh/mesazhesh në prapaskenë</string>
+  <string name="pref_video_advanced_title">Rregullime të mëtejshme për video</string>
+  <string name="pref_video_advanced_summary">Ndryshimi bitrate-in, qartësinë e videove, si dhe përdorni veçori eksperimentale</string>
   <string name="pref_hd_summary">Aktivizoni dërgim videosh HD</string>
   <string name="pref_hwEncode_title">Aktivizo kodim të përshpejtuar</string>
   <string name="pref_hwEncode_summary">Veçori eksperimentale</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 10f9489..41874e9 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -114,9 +114,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamerarättighet</string>
   <string name="permission_dialog_camera_message">Videokonversationer kräver kamerarättigheter. Överväg att aktivera det.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Fel</string>
   <string name="ringtone_error_format_not_supported">Detta format saknar stöd.</string>
   <string name="ringtone_error_size_too_big">Denna fil är för stor. Maximal storlek är %1$dkB.</string>
+  <string name="ringtone_custom_label">Anpassad</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring behöver rättighet att läsa kontakter för att aktivera den här funktionen. Överväg att tilldela rättigheter.</string>
   <!--Write call log permission-->
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 fc18853..fd5e1db 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -113,9 +113,11 @@
   <!--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>
+  <!--Ringtone activity-->
   <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_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>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 6c4360e..4995e64 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Дозволи для камери</string>
   <string name="permission_dialog_camera_message">Для здійснення відерозмови необхідно надати доступ до камери. Будь ласка, розгляньте дану можливість.</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">Помилка</string>
   <string name="ringtone_error_format_not_supported">Цей формат не підтримується</string>
   <string name="ringtone_error_size_too_big">Цей файл надто великий. Максимальний розмір — %1$dкБ. </string>
+  <string name="ringtone_custom_label">Кастомізація</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Для цього Джамі потрібні права «Читати контакти». Будь ласка, надайте їх.</string>
   <!--Write call log permission-->
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 fb81d03..2645bd7 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
@@ -112,9 +112,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">摄像头使用权限</string>
   <string name="permission_dialog_camera_message">视频会话需要使用摄像头，请设置相应权限。</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">错误</string>
   <string name="ringtone_error_format_not_supported">不支持的文件格式。</string>
   <string name="ringtone_error_size_too_big">文件过大。最大支持%1$dKB。</string>
+  <string name="ringtone_custom_label">自定义</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami需要“读取通讯录”权限来启用此功能，请批准。</string>
   <!--Write call log permission-->
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 aa94164..8d8dc9a 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
@@ -15,6 +15,7 @@
   <string name="license">本軟體以現狀（\"as is\"）提供，不負任何明示或暗示之擔保責任。詳細資訊請見 <u>GNU通用公共授權條款第三版或更新</u></string>
   <string name="description">Jami 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。</string>
   <string name="credits">榮譽</string>
+  <string name="call_service_description">此服務是為了讓您的通話保持在前景執行所需。它只會在通話期間執行。</string>
   <!--About dialog-->
   <string name="developed_by">開發由</string>
   <string name="designed_by">設計由</string>
@@ -113,9 +114,11 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">攝影機權限</string>
   <string name="permission_dialog_camera_message">視訊通話需要攝影機權限以正常運作。請考慮啟用它。</string>
+  <!--Ringtone activity-->
   <string name="ringtone_error_title">錯誤</string>
   <string name="ringtone_error_format_not_supported">不支援此格式。</string>
   <string name="ringtone_error_size_too_big">這個檔案太大了。最大的大小為 %1$d kB。</string>
+  <string name="ringtone_custom_label">自訂</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami 需要「讀取聯絡人」權限以啟用此功能。請給予它。</string>
   <!--Write call log permission-->
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index c4e1b97..a772558 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -22,6 +22,7 @@
   <string name="ab_action_contact_add">加到聯絡人</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <!--Ringtone activity-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->