i18n: automatic bump
Change-Id: I646675bd9791da75674f64c634f026d6ea27dc9b
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index 8d930d7..56290d3 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -72,6 +72,7 @@
<string name="account_rtp_port_range">نطاق المنفذ RTP الصوتي</string>
<!--restore/backup-->
<string name="account_export_end_error_title">خطأ</string>
+ <string name="account_connect_prompt_username">اسم المستخدم</string>
<!--Name registration-->
<string name="account_status_unknown">مجهول</string>
<!--Create account-->
diff --git a/ring-android/app/src/main/res/values-ar/strings_preferences.xml b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
index 46953af..874c3ab 100644
--- a/ring-android/app/src/main/res/values-ar/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">استخدام جهات إتصال النظام</string>
<string name="pref_systemContacts_summary">استخدام جهات إتصال النظام لإظهار تفاصيل المتصل</string>
<string name="pref_clearHistory_title">مسح السجل</string>
- <string name="pref_clearHistory_summary">مسح كل سجل المحادثات، هذا الإختيار لايمكن التراجع عنه</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 455cfa1..f5ed9c3 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -132,6 +132,7 @@
<string name="account_start_export_button">Генериране на PIN код</string>
<string name="account_end_export_button">затваряне</string>
<string name="account_export_title">Добавяне на устройства</string>
+ <string name="account_connect_prompt_username">Потребителско име</string>
<!--Name registration-->
<string name="error_username_empty">Въведете потребителско име</string>
<string name="no_registered_name_for_account">Няма открито регистрирано име за този профил</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_preferences.xml b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
index 83a2cc9..1c2551c 100644
--- a/ring-android/app/src/main/res/values-bg/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Стартиране на Jami при включване</string>
<string name="pref_startOnBoot_summary">Jami стартира във фонов режим, когато системата се включи.</string>
<string name="pref_clearHistory_title">Изчистване на историята</string>
- <string name="pref_clearHistory_summary">Изчистване на цялата история на разговорите. Това действие е необратимо.</string>
<string name="pref_persistNotification_title">Фонов режим</string>
<string name="pref_persistNotification_summary">Jami работи във фонов режим, за да получава повиквания и съобщения.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/ring-android/app/src/main/res/values-ca/strings_account.xml
index 03a8fcf..27e99d8 100644
--- a/ring-android/app/src/main/res/values-ca/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_account.xml
@@ -126,6 +126,7 @@
<string name="account_sip_register_anyway">Registre de totes maneres</string>
<string name="account_link_prompt_pin">Introdueix PIN</string>
<string name="account_end_export_button">tanca</string>
+ <string name="account_connect_prompt_username">Nom d\'usuari</string>
<!--Name registration-->
<string name="register_name">Registrar nom</string>
<string name="username_already_taken">Nom d\'usuari ja registrat.</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings_preferences.xml b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
index 6e81d9c..853baa6 100644
--- a/ring-android/app/src/main/res/values-ca/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
@@ -11,5 +11,4 @@
<string name="pref_systemContacts_title">Usa contactes del sistema</string>
<string name="pref_systemContacts_summary">Usa contactes del sistema per mostrar detalls del que truca</string>
<string name="pref_clearHistory_title">Neteja historial</string>
- <string name="pref_clearHistory_summary">Neteja totes les converses de l\'historial. Aquesta acció no pot desfer-se.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index 5280eae..d32af29 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -154,6 +154,7 @@
<string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete Jami na novém zařízení. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
<string name="account_link_export_info_light">Pro použití tohoto účtu na dalších zařízeních jej musíte nejdříve vystavit na Jami. Tím se vytvoří kód PIN, který musíte pro nastavení účtu zadat na novém zařízení. PIN zůstává platný po 0 minut.</string>
<string name="account_export_title">Přidat zařízení</string>
+ <string name="account_connect_prompt_username">Uživatelské jméno</string>
<!--Name registration-->
<string name="error_username_empty">Zadejte uživatelské jméno</string>
<string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
index 5871b2f..6fc76e7 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
@@ -18,7 +18,6 @@
<string name="pref_startOnBoot_title">Spustit Jami po zapnutí</string>
<string name="pref_startOnBoot_summary">Spustit Jami na pozadí systému po jeho spuštění.</string>
<string name="pref_clearHistory_title">Vymazat historii</string>
- <string name="pref_clearHistory_summary">Vymaže celou historii konverzací. Tuto činnost nelze vrátit zpět.</string>
<string name="pref_persistNotification_title">Běžet na pozadí</string>
<string name="pref_persistNotification_summary">Umožnit běh na pozadí pro příjem hovorů a zpráv.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-da/strings_account.xml b/ring-android/app/src/main/res/values-da/strings_account.xml
index b7dab33..ae5b48b 100644
--- a/ring-android/app/src/main/res/values-da/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da/strings_account.xml
@@ -135,6 +135,7 @@
<string name="account_start_export_button">Generer PIN</string>
<string name="account_end_export_button">luk</string>
<string name="account_export_title">Tilføj enheder</string>
+ <string name="account_connect_prompt_username">Brugernavn</string>
<!--Name registration-->
<string name="error_username_empty">Indtast et brugernavn</string>
<string name="no_registered_name_for_account">Intet registreret navn fundet for denne konto</string>
diff --git a/ring-android/app/src/main/res/values-da/strings_preferences.xml b/ring-android/app/src/main/res/values-da/strings_preferences.xml
index d2b612f..802696c 100644
--- a/ring-android/app/src/main/res/values-da/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-da/strings_preferences.xml
@@ -12,5 +12,4 @@
<string name="pref_systemContacts_title">Brug systemkontakter</string>
<string name="pref_systemContacts_summary">Brug systemkontakter til at vise opkaldsdetaljer</string>
<string name="pref_clearHistory_title">Ryd historiken</string>
- <string name="pref_clearHistory_summary">Ryd al samtale-historik. Denne handling kan ikke fortrydes.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index a38c352..d49628c 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -120,6 +120,7 @@
<string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm diesen Vorgang abzuschließen, müssen Sie Jami auf dem neuen Gerät starten. Erzeugen Sie ein neues Konto mittels \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist für 10 Minuten gültig.</string>
<string name="account_link_export_info_light">Um dieses Konto auf anderen Geräten zu verwenden, müssen Sie es zuerst auf Jami veröffentlichen. Dadurch wird ein PIN-Code erzeugt, den Sie auf dem neuen Gerät bei der Einrichtung des Kontos eingeben müssen. Diese PIN ist für 10 Minuten gültig.</string>
<string name="account_export_title">Geräte hinzufügen</string>
+ <string name="account_connect_prompt_username">Benutzername</string>
<!--Name registration-->
<string name="error_username_empty">Einen Benutzernamen eingeben</string>
<string name="username_already_taken">Benutzername bereits vergeben</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 71fdfe1..4e7980e 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
@@ -19,7 +19,6 @@
<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 der Konversationshistorie. 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_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index 2da48d1..03813ca 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">Ihre PIN lautet:\n\n%%\n\nUm den Vorgang abzuschließen öffnen Sie Jami auf dem neuen Gerät. Erstellen Sie ein neues Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
<string name="account_link_export_info_light">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig.</string>
<string name="account_export_title">Gerät hinzufügen</string>
+ <string name="account_connect_prompt_username">Benutzername</string>
<!--Name registration-->
<string name="error_username_empty">Benutzername eingeben</string>
<string name="no_registered_name_for_account">Es wurde kein registrierter Name für dieses Konto gefunden</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_preferences.xml b/ring-android/app/src/main/res/values-de/strings_preferences.xml
index e6f31bc..36d8ddd 100644
--- a/ring-android/app/src/main/res/values-de/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Jami beim Hochfahren starten</string>
<string name="pref_startOnBoot_summary">Jami im Hintergrund laufen lassen wenn das System startet</string>
<string name="pref_clearHistory_title">Verlauf leeren</string>
- <string name="pref_clearHistory_summary">Alle Konversationen aus dem Verlauf löschen. Diese Aktion kann nicht rückgängig gemacht werden.</string>
<string name="pref_persistNotification_title">Im Hintergrund laufen lassen</string>
<string name="pref_persistNotification_summary">Jami erlauben im Hintergrund zu laufen, um Anrufe und Nachrichten zu empfangen.</string>
</resources>
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 2b5eb1f..07c22b8 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
@@ -52,6 +52,7 @@
<string name="account_export_end_network_title">Σφάλμα δικτύου</string>
<string name="account_export_end_error_title">Σφάλμα</string>
<string name="account_link_export_button">Σύνδεση μιας άλλης συσκευής σε αυτόν το λογαριασμό</string>
+ <string name="account_connect_prompt_username">Όνομα χρήστη</string>
<!--Name registration-->
<string name="username_already_taken">Το όνομα χρήστη ήδη χρησιμοποιείται</string>
<string name="invalid_username">Μη έγκυρο όνομα χρήστη</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 4135daf..7809765 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -89,6 +89,7 @@
<string name="export_account_wait_title">Bonvole atendu…</string>
<string name="account_export_end_network_title">Reta eraro</string>
<string name="account_export_end_error_title">Eraro</string>
+ <string name="account_connect_prompt_username">Uzantnomo</string>
<!--Name registration-->
<string name="username_already_taken">Uzantnomo jam prenita</string>
<string name="invalid_username">Nevalida uzantnomo</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_preferences.xml b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
index 5bc8c50..5d3c511 100644
--- a/ring-android/app/src/main/res/values-eo/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">Uzi sistemajn kontaktojn</string>
<string name="pref_systemContacts_summary">Uzi sistemajn kontaktojn por montri detalojn de la vokanto.</string>
<string name="pref_clearHistory_title">Vakigi historion</string>
- <string name="pref_clearHistory_summary">Vakigi la tutan historion de konversacioj. Tiun ĉi agon ne eblos malfari.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
index b97188c..4753d39 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
@@ -88,6 +88,7 @@
<string name="account_no_network_title">No se puede conectar a la red</string>
<string name="account_link_prompt_pin">Introducir PIN</string>
<string name="account_link_export_button">Vincular otro dispositivo a esta cuenta</string>
+ <string name="account_connect_prompt_username">Nombre de usuario</string>
<!--Name registration-->
<string name="account_status_connecting">Conectando</string>
<string name="account_status_unknown">Desconocido</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
index 600e77d..3f4dd94 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
@@ -11,5 +11,4 @@
<string name="pref_systemContacts_title">Usar contactos del sistema</string>
<string name="pref_systemContacts_summary">Usar contactos del sistema para mostrar detalles del interlocutor</string>
<string name="pref_clearHistory_title">Borrar historial</string>
- <string name="pref_clearHistory_summary">Borra todo el historial de conversaciones. Esta acción no se puede deshacer.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 236192f..34f5f50 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">Tu PIN es:\n\n%%\n\nPara completar el proceso, tienes que abrir Jami en el nuevo dispositivo. Crear una nueva cuenta con \"Conectar este dispositivo a una cuenta\". Tu PIN es válido por 10 minutos.</string>
<string name="account_link_export_info_light">Para usar esta cuenta en otros dispositivos, primero debe exponerla en Jami. Esto generará un código PIN que debe introducir en el nuevo dispositivo para configurar la cuenta. El PIN es valido por 10 minutos.</string>
<string name="account_export_title">Agregar dispositivos</string>
+ <string name="account_connect_prompt_username">Nombre de usuario</string>
<!--Name registration-->
<string name="error_username_empty">Ingresa un nombre de usuario</string>
<string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index 8a05aca..b4e093e 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Ejecutar Jami al inicio</string>
<string name="pref_startOnBoot_summary">Ejecutar Jami en segundo plano cuando se inicie el sistema.</string>
<string name="pref_clearHistory_title">Limpiar historial</string>
- <string name="pref_clearHistory_summary">Limpiar todo el historial de conversaciones. Esta acción no se puede deshacer.</string>
<string name="pref_persistNotification_title">Ejecutar en segundo plano</string>
<string name="pref_persistNotification_summary">Permite ejecutar en segundo plano para recibir llamadas y mensajes.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-eu/strings_account.xml b/ring-android/app/src/main/res/values-eu/strings_account.xml
index 1c5c6c6..2a43596 100644
--- a/ring-android/app/src/main/res/values-eu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_account.xml
@@ -107,6 +107,7 @@
<string name="account_start_export_button">Sortu PIN-a</string>
<string name="account_end_export_button">itxi</string>
<string name="account_export_title">Gehitu gailuak</string>
+ <string name="account_connect_prompt_username">Erabiltzaile-izena</string>
<!--Name registration-->
<string name="error_username_empty">Sartu erabiltzaile-izen bat</string>
<string name="username_available">Erabiltzaile-izena eskuragarri dago!</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings_preferences.xml b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
index 031a927..4b3dde9 100644
--- a/ring-android/app/src/main/res/values-eu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Hasi Jami abioan</string>
<string name="pref_startOnBoot_summary">Hasi Jami bigarren planoan sistema abiatzean.</string>
<string name="pref_clearHistory_title">Garbitu historiala</string>
- <string name="pref_clearHistory_summary">Garbitu dei guztien historiala. Ekintza hau ezin da desegin.</string>
<string name="pref_persistNotification_title">Aritu bigarren planoan</string>
<string name="pref_persistNotification_summary">Baimendu bigarren planoan aritzea deiak eta mezuak jasotzeko.</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 2269095..afe29ed 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
@@ -152,6 +152,7 @@
<string name="account_end_export_infos">پین شما:\n\n%%\n\nبرای کامل کردن فرایند، باید جمی را روی افزارهٔ نو گشوده و حساب جدیدی را با انتخاب «پیوند این افزاره به یک حساب» ایجاد کنید. پینتان برای ۱۰ دقیقه معتبر است.</string>
<string name="account_link_export_info_light">برای استفاده از این حساب روی افزارههای دیگر، باید نخست آن را روی جمی آشکار کنید. این کار یک رمز پین تولید خواهد کرد که باید برای برپایی حساب، روی افزارهٔ نو وارد کنید. پین تا ۱۰ دقیقه معتبر است.</string>
<string name="account_export_title">اضافه کردن دستگاه ها</string>
+ <string name="account_connect_prompt_username">نام کاربری</string>
<!--Name registration-->
<string name="error_username_empty">یک نام کاربری وارد کنید</string>
<string name="no_registered_name_for_account">هیچ نام ثبتشدهای برای این حساب پیدا نشد</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
index 2f3075d..db74a08 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">به کار انداختن جمی هنگام شروع به کار</string>
<string name="pref_startOnBoot_summary">اجرای جمی در پسزمینه هنگام آغاز به کار سامانه.</string>
<string name="pref_clearHistory_title">پاکسازی تاریخچه</string>
- <string name="pref_clearHistory_summary">پاکسازی تمام تاریخچهٔ گفتوگوها. این کار قابل بازگشت نیست.</string>
<string name="pref_persistNotification_title">اجرا در پسزمینه</string>
<string name="pref_persistNotification_summary">برای گرفتن تماسها و پیامها، اجرا در پسزمینه را مجاز کنید.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index 20e884c..cd3f0d1 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -82,6 +82,7 @@
<string name="account_no_network_title">Verkkoon ei saada yhteyttä</string>
<string name="account_link_prompt_pin">Syötä PIN-koodi</string>
<string name="account_new_button">Tee Jami-tili</string>
+ <string name="account_connect_prompt_username">Käyttäjänimi</string>
<!--Name registration-->
<string name="invalid_username">Käyttäjätunnus ei kelpaa</string>
<string name="account_status_connecting">Yhdistää</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
index 7151a14..fc2a580 100644
--- a/ring-android/app/src/main/res/values-fi/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">Käytä järjestelmän yhteystietoja</string>
<string name="pref_systemContacts_summary">Käytä järjestelmän yhteystietoja soittajan tietojen esittämisessä</string>
<string name="pref_clearHistory_title">Tyhjennä historia</string>
- <string name="pref_clearHistory_summary">Tyhjennä kaikki keskusteluhistoria. Tätä toimintoa ei voi perua.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index dbd97d4..58c66d3 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -134,6 +134,7 @@
<string name="account_start_export_button">Générer le NIP</string>
<string name="account_end_export_button">fermer</string>
<string name="account_export_title">ajouter un périphérique </string>
+ <string name="account_connect_prompt_username">Nom d\'utilisateur</string>
<!--Name registration-->
<string name="error_username_empty">Entrer le nom d\'utilisateur</string>
<string name="no_registered_name_for_account">Aucun nom enregistré trouvé pour ce compte</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
index ac6f1dd..9f0fcd6 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -8,5 +8,4 @@
<string name="pref_mobileData_title">Données mobiles</string>
<string name="pref_systemContacts_title">Utiliser les contacts du système</string>
<string name="pref_clearHistory_title">Effacer l\'historique</string>
- <string name="pref_clearHistory_summary">Effacer l\'historique des conversations. L\'action est irréversible.</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 6879be1..15505f6 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
@@ -39,6 +39,7 @@
<string name="account_link_prompt_pin">Saisissez le code PIN</string>
<string name="account_new_button">Créer un compte Jami</string>
<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="account_status_unknown">Inconnu</string>
<!--Create account-->
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
index 236e1b7..2456be9 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
@@ -15,7 +15,6 @@
<string name="pref_startOnBoot_title">Lancer Jami au démarrage</string>
<string name="pref_startOnBoot_summary">Exécuter Jami en tâche de fond au démarrage du système.</string>
<string name="pref_clearHistory_title">Vider l\'historique</string>
- <string name="pref_clearHistory_summary">Supprimer l\'historique de toutes les conversations. Cette action est irréversible.</string>
<string name="pref_persistNotification_title">Exécuter en tâche de fond</string>
<string name="pref_persistNotification_summary">Autorisé l\'exécution en tâche de fond pour recevoir les appels et les messages.</string>
</resources>
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 5df29fe..332889d 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -15,9 +15,12 @@
<string name="license">Ce logiciel est offert \"tel quel\", sans aucune garantie. Pour plus d\'informations, voir <u>GNU General Public License version 3 or later</u></string>
<string name="description">Jami est un logiciel libre de communication universel qui respecte la vie privée et l\'intimité de ses utilisateurs.</string>
<string name="credits">Crédits</string>
+ <string name="call_service_description">Ce service est nécessaire pour que vos appels continuent de fonctionner en arrière-plan. Il ne fonctionne que pendant les appels.</string>
+ <string name="data_transfer_service_description">Ce service est nécessaire pour afficher les notifications persistantes pendant un transfert de fichier. Il ne fonctionne que pendant le transfert de fichiers.</string>
<!--About dialog-->
<string name="developed_by">Développé par</string>
<string name="designed_by">Conçu par</string>
+ <string name="ringtones_by">Sonneries d\'appels réalisées par </string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Jami</string>
<string name="error_no_network">Pas d\'accès au réseau</string>
@@ -117,7 +120,9 @@
<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_prompt">Choisir une sonnerie d\'appel</string>
<string name="ringtone_custom_label">Personnalisé</string>
+ <string name="ringtone_jami_tones">Sonneries Jami</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-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 5265aa3..f9aaeb2 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -67,6 +67,8 @@
<string name="account_ringtone_enabled_label">Activer les sonneries</string>
<string name="account_ringtone_path_label">Sonnerie</string>
<string name="account_ringtone_custom_label">Utiliser une sonnerie personnalisée</string>
+ <string name="account_ringtone_title">Choisissez une sonnerie</string>
+ <string name="account_ringtone_summary">Sélectionnez une sonnerie ou choisissez une sonnerie personnelle</string>
<!--Video Details-->
<string name="account_video_label">Vidéo</string>
<string name="account_video_enable">Activer la vidéo</string>
@@ -147,6 +149,7 @@
<string name="account_sip_success_title">Compte SIP enregistré</string>
<string name="account_sip_success_message">Compte SIP enregistré avec succès</string>
<string name="account_sip_register_anyway">Poursuivre l\'inscription</string>
+ <string name="account_link_device">Se connecter à partir d\'un autre appareil</string>
<string name="account_link_button">Se connecter à partir d\'un réseau</string>
<string name="account_link_archive_button">Se Connecter à partir d\'une sauvegarde</string>
<string name="account_link_prompt_pin">Entrer votre NIP</string>
@@ -158,6 +161,12 @@
<string name="account_end_export_infos">Votre NIP est:\n\n%%\n\nPour terminer le processus, vous devez ouvrir Ring sur un autre appareil puis créer un nouveau compte avec \"Lier cet appareil à un compte\". Votre NIP est utilisable pendant 10 minutes.</string>
<string name="account_link_export_info_light">Pour utiliser ce compte sur un autre appareil, vous devez d\'abord l\'exposer sur Jami. Ceci générera un NIP que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le NIP sera valable pendant 10 minutes. </string>
<string name="account_export_title">Ajoutez des appareils</string>
+ <string name="account_connect_server_button">Se connecter à partir d\'un serveur d\'entreprise</string>
+ <string name="account_connect_button">Se connecter</string>
+ <string name="prompt_server">Adresse du serveur de gestion de parc Jami</string>
+ <string name="help_credentials_enter">Entrer votre nom d\'utilisateur d\'entreprise</string>
+ <string name="help_connect_password_enter">Entrer le mot de passe</string>
+ <string name="account_connect_prompt_username">Nom d\'utilisateur</string>
<!--Name registration-->
<string name="error_username_empty">Entrer un nom d\'utilisateur</string>
<string name="no_registered_name_for_account">Aucun nom n\'a été trouvé pour ce compte.</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
index 7cbe804..2ed11e0 100644
--- a/ring-android/app/src/main/res/values-fr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">Autoriser Jami sur les réseaux mobiles en plus du Wi-fi.</string>
<string name="pref_pushNotifications_title">Notifications poussées</string>
<string name="pref_pushNotifications_summary">Utiliser les serveurs Google pour permettre de recevoir des appels et des messages en arrière plan.</string>
+ <string name="pref_video_advanced_title">Paramètres vidéos avancés</string>
+ <string name="pref_video_advanced_summary">Modifier le débit vidéo, la résolution et d\'autres fonctionnalités expérimentales</string>
<string name="pref_hd_summary">Activer l\'envoi de vidéo HD</string>
<string name="pref_hwEncode_title">Activer l\'encodage matériel</string>
<string name="pref_hwEncode_summary">Fonctionnalité expérimentale</string>
@@ -19,7 +21,7 @@
<string name="pref_startOnBoot_title">Lancer Jami au démarrage de la session</string>
<string name="pref_startOnBoot_summary">Lancer Jami en arrière plan au démarrage de l\'appareil.</string>
<string name="pref_clearHistory_title">Effacer l\'historique</string>
- <string name="pref_clearHistory_summary">Effacer les historiques de conversation. L\'action est irréversible.</string>
+ <string name="pref_clearHistory_summary">Effacer tous les historiques de conversation. L\'action est irréversible.</string>
<string name="pref_persistNotification_title">Fonctionne en arrière-plan</string>
<string name="pref_persistNotification_summary">Permet de fonctionner en arrière-plan pour recevoir des appels ou des messages</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index f49bc7b..d29bfac 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -63,6 +63,7 @@
<string name="account_rtp_min_port">נומינלי</string>
<!--restore/backup-->
<string name="account_export_end_error_title">שגיאה</string>
+ <string name="account_connect_prompt_username">שם משתמש</string>
<!--Name registration-->
<string name="account_status_connecting">מתחבר</string>
<string name="account_status_unknown">לא מוכר</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index e7acf8c..9fe132b 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -90,6 +90,7 @@
<string name="account_no_network_title">Ne mogu se spojiti na mrežu</string>
<string name="account_link_prompt_pin">Unesite PIN</string>
<string name="account_new_button">Napravite Jami račun</string>
+ <string name="account_connect_prompt_username">Korisničko ime</string>
<!--Name registration-->
<string name="account_status_connecting">Spajanje</string>
<string name="account_status_unknown">Nepoznato</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_preferences.xml b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
index 9da3637..20b618c 100644
--- a/ring-android/app/src/main/res/values-hr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">Koristi kontakte sustava</string>
<string name="pref_systemContacts_summary">Koristi kontakte sustava za prikaz pojedinosti pozivatelja.</string>
<string name="pref_clearHistory_title">Očisti povijest</string>
- <string name="pref_clearHistory_summary">Očisti povijest svih razgovora. Ova se radnja ne može poništiti.</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 a668205..f348b5b 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -16,6 +16,7 @@
<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>
+ <string name="data_transfer_service_description">Ez a szolgáltatás szükséges az állandó értesítések megjelenítéséhez fájlátvitel közben. Csak fájlátvitelek alatt fut.</string>
<!--About dialog-->
<string name="developed_by">Fejlesztők</string>
<string name="designed_by">Tervezők</string>
@@ -67,7 +68,7 @@
<string name="notif_channel_incoming_calls">Bejövő hívások</string>
<string name="notif_channel_messages">Üzenetek</string>
<string name="notif_channel_requests">Kérések</string>
- <string name="notif_channel_file_transfer">Fájl átvitel</string>
+ <string name="notif_channel_file_transfer">Fájlátvitel</string>
<string name="notif_channel_background_service">Háttérben futó szolgáltatás</string>
<string name="notif_channel_background_service_descr">Bejövő hívások és üzenetek engedélyezése bármikor.</string>
<string name="notif_group_calls">Hívások</string>
@@ -119,7 +120,9 @@
<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_prompt">Egyéni csengőhang beállítása</string>
<string name="ringtone_custom_label">Szokás</string>
+ <string name="ringtone_jami_tones">Jami hangok</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-->
@@ -181,6 +184,7 @@
<string name="share_label">Megosztás </string>
<string name="generic_error_migration">Hiba</string>
<string name="generic_error_migration_message">Hiba történt az átvitel során</string>
+ <string name="title_share_with">Megosztás…</string>
<!--Pending contact requests-->
<string name="accept">Elfogadás</string>
<string name="refuse">Elutasítás</string>
@@ -231,4 +235,5 @@
<string name="menu_message_delete">Üzenet törlése</string>
<string name="menu_message_cancel">Üzenet érvénytelenítése</string>
<string name="menu_delete">Törlés</string>
+ <string name="pref_darkTheme_title">Sötét téma</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
index 0c93944..4f45998 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -67,6 +67,8 @@
<string name="account_ringtone_enabled_label">Csengőhangok aktiválása</string>
<string name="account_ringtone_path_label">Csengőhang útvonal</string>
<string name="account_ringtone_custom_label">Egyéni csengőhang használata</string>
+ <string name="account_ringtone_title">Csengőhang kiválasztása</string>
+ <string name="account_ringtone_summary">Csengőhang tallózása</string>
<!--Video Details-->
<string name="account_video_label">Videó</string>
<string name="account_video_enable">Videó engedélyezése</string>
@@ -158,6 +160,8 @@
<string name="account_end_export_infos">A PIN-kódja:\n\n%%\n\nA folyamat befejezéséhez meg kell nyitnia a Jami-t az új eszközön. Hozzon létre egy új fiókot az „Eszköz összekapcsolása egy fiókhoz” opcióval. A PIN-kódja 10 percig érvényes.</string>
<string name="account_link_export_info_light">Ha ezt a fiókot más eszközökön szeretné használni, először meg kell jeleníteni a Jami-n. Ez létrehoz egy PIN-kódot, amelyet meg kell adnia az új eszközön a fiók beállításához. A PIN-kód 10 percig érvényes.</string>
<string name="account_export_title">Eszközök hozzáadása</string>
+ <string name="account_connect_button">Kapcsolódás</string>
+ <string name="account_connect_prompt_username">Felhasználónév</string>
<!--Name registration-->
<string name="error_username_empty">Felhasználónév megadása</string>
<string name="no_registered_name_for_account">Nincs bejegyzett név talált erre a fiókra</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index afb03b0..f67fc6c 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">A Jami engedélyezése 3G/LTE és Wi-Fi hálózatokon</string>
<string name="pref_pushNotifications_title">Leküldéses értesítések</string>
<string name="pref_pushNotifications_summary">Használja a Google kiszolgálóit a háttérben lévő hívások és üzenetek fogadásához</string>
+ <string name="pref_video_advanced_title">Részletes videó beállításai</string>
+ <string name="pref_video_advanced_summary">Videó bitsebesség és felbontás módosítása. Kísérleti jellemzők elérése.</string>
<string name="pref_hd_summary">Engedélyezze a HD videó küldését</string>
<string name="pref_hwEncode_title">Gyorsított kódolás engedélyezése</string>
<string name="pref_hwEncode_summary">Kísérleti jellemző</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 81111f8..38c2b5b 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -154,6 +154,7 @@
<string name="account_end_export_infos">Il tuo PIN è: \ n \ n%%\ n\nPer completare la procedura, è necessario aprire Jami sul nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo a un account\". Il tuo PIN è valido per 10 minuti.</string>
<string name="account_link_export_info_light">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo sarà un codice che devi configurare. Il PIN è valido per 10 minuti.</string>
<string name="account_export_title">Aggiungi dispositivi</string>
+ <string name="account_connect_prompt_username">Utente</string>
<!--Name registration-->
<string name="error_username_empty">Inserire un nome utente</string>
<string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 658dfa6..c3db16f 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Avvia Jami all\'avvio</string>
<string name="pref_startOnBoot_summary">Esegui Jami in background all\'avvio del sistema.</string>
<string name="pref_clearHistory_title">Elimina cronologia</string>
- <string name="pref_clearHistory_summary">Elimina la cronologia delle conversazioni. Questa operazione non può essere annullata.</string>
<string name="pref_persistNotification_title">Esegui in background</string>
<string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
</resources>
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 061f3b0..a9572ae 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
@@ -127,6 +127,7 @@
<string name="account_start_export_button">Genera PIN</string>
<string name="account_end_export_button">chiudi</string>
<string name="account_export_title">Aggiungi dispositivi</string>
+ <string name="account_connect_prompt_username">Nome utente</string>
<!--Name registration-->
<string name="error_username_empty">Inserisci un nome utente</string>
<string name="username_already_taken">Nome utente già utilizzato</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 b226b19..297affc 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
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Avvia Jami all\'avvio del sistema</string>
<string name="pref_startOnBoot_summary">Esegui Jami in background quando il sistema si avvia.</string>
<string name="pref_clearHistory_title">Cancella cronologia</string>
- <string name="pref_clearHistory_summary">Cancella la cronologia di tutte le conversazioni. Questa azione non può essere annullata.</string>
<string name="pref_persistNotification_title">Esegui in background</string>
<string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</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 2fdeb26..32a10ee 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
@@ -129,6 +129,7 @@
<string name="account_link_prompt_pin">PINを入力してください</string>
<string name="account_link_export_button">別のデバイスをこのアカウントへリンク</string>
<string name="account_end_export_button">閉じる</string>
+ <string name="account_connect_prompt_username">ユーザー名</string>
<!--Name registration-->
<string name="error_username_empty">ユーザー名を入力してください</string>
<string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_preferences.xml b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
index f43e2a3..2e55210 100644
--- a/ring-android/app/src/main/res/values-ja/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">システムの連絡先を使用する</string>
<string name="pref_systemContacts_summary">システムの連絡先を使用して通話先の詳細を表示します。</string>
<string name="pref_clearHistory_title">履歴をクリア</string>
- <string name="pref_clearHistory_summary">会話の履歴をすべてクリアします。 この操作を元に戻すことはできません。</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
index 35c34fe..c3b3c18 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
@@ -29,6 +29,7 @@
<!--SIP-->
<!--TLS Details-->
<!--restore/backup-->
+ <string name="account_connect_prompt_username">사용자명</string>
<!--Name registration-->
<!--Create account-->
<string name="account_creation_profile">프로필 만들기</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index ccb9646..ada3c5a 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -151,6 +151,7 @@
<string name="account_end_export_button">užverti</string>
<string name="account_end_export_infos">Jūsų PIN yra:\n\n%%\n\nNorėdami užbaigti procesą, turite atverti Jami naujame įrenginyje. Susikurkite paskyrą, naudodami \"Susieti šį įrenginį su paskyra\". Jūsų PIN galioja 10 minučių.</string>
<string name="account_export_title">Pridėti įrenginius</string>
+ <string name="account_connect_prompt_username">Naudotojo vardas</string>
<!--Name registration-->
<string name="error_username_empty">Įveskite naudotojo vardą</string>
<string name="no_registered_name_for_account">Šiai paskyrai nerasta jokio registruoto vardo</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_preferences.xml b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
index 4fe0507..67f6db7 100644
--- a/ring-android/app/src/main/res/values-lt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Paleisti Jami paleisties metu</string>
<string name="pref_startOnBoot_summary">Sistemos paleidimo metu, paleisti Jami fone.</string>
<string name="pref_clearHistory_title">Išvalyti istoriją</string>
- <string name="pref_clearHistory_summary">Išvalyti visą pokalbių istoriją. Šio veiksmo negalima bus atšaukti.</string>
<string name="pref_persistNotification_title">Paleisti fone</string>
<string name="pref_persistNotification_summary">Leisti veikti fone, kad būtų priimami skambučiai ir žinutės.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
index 7e1dd76..7a595ba 100644
--- a/ring-android/app/src/main/res/values-ms/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -108,6 +108,7 @@
<string name="account_link_prompt_pin">Masukkan PIN</string>
<string name="account_link_export_button">Sambungkan perangkat lain dengan akaun ini</string>
<string name="account_end_export_button">tutup</string>
+ <string name="account_connect_prompt_username">Nama pengguna</string>
<!--Name registration-->
<string name="error_username_empty">Masukkan nama pengguna</string>
<string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings_preferences.xml b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
index c9ce887..b693dc8 100644
--- a/ring-android/app/src/main/res/values-ms/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">Gunakan buku kenalan sistem</string>
<string name="pref_systemContacts_summary">Gunakan buku kenalan sistem untuk memaparkan maklumat pemanggil</string>
<string name="pref_clearHistory_title">Padamkan sejarah</string>
- <string name="pref_clearHistory_summary">Padamkan semua sejarah perbualan. Aksi ini tidak akan dapat dibuat ulang.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 30e94fb..43fa3fc 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -138,6 +138,7 @@
<string name="account_start_export_button">Oppretter PIN</string>
<string name="account_end_export_button">lukk</string>
<string name="account_export_title">Legg til enheter</string>
+ <string name="account_connect_prompt_username">Brukernavn</string>
<!--Name registration-->
<string name="error_username_empty">Skriv inn et brukernavn</string>
<string name="no_registered_name_for_account">Fant inget registrert navn for denne kontoen</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
index a025623..bc88517 100644
--- a/ring-android/app/src/main/res/values-nb/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Start Jami ved oppstart</string>
<string name="pref_startOnBoot_summary">Kjør Jami i bakgrunnen når systemet starter.</string>
<string name="pref_clearHistory_title">Slett historikk</string>
- <string name="pref_clearHistory_summary">Slett all konversasjonshistorikk. Dette kan ikke endres tilbake.</string>
<string name="pref_persistNotification_title">Kjør i bakgrunnen</string>
<string name="pref_persistNotification_summary">Tillater kjøring i bakgrunnen for å motta samtaler og meldinger.</string>
</resources>
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 6717e3b..4b1e858 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
@@ -16,6 +16,7 @@
<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>
+ <string name="data_transfer_service_description">Deze dienst is vereist om blijvende meldingen weer te geven tijdens bestandsoverdrachten. Hij draait enkel tijdens bestandsoverdrachten.</string>
<!--About dialog-->
<string name="developed_by">Ontwikkeld door</string>
<string name="designed_by">Ontworpen door</string>
@@ -119,7 +120,9 @@
<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_prompt">Stel een aangepaste beltoon in</string>
<string name="ringtone_custom_label">Aangepast</string>
+ <string name="ringtone_jami_tones">Jami-beltonen</string>
<!--Read contacts permission-->
<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-->
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 9c9511f..f50d798 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
@@ -67,6 +67,8 @@
<string name="account_ringtone_enabled_label">Beltonen inschakelen</string>
<string name="account_ringtone_path_label">Beltoonpad</string>
<string name="account_ringtone_custom_label">Eigen beltoon gebruiken</string>
+ <string name="account_ringtone_title">Kies een beltoon</string>
+ <string name="account_ringtone_summary">Selecteer een beltoon of kies uw eigen beltoon</string>
<!--Video Details-->
<string name="account_video_label">Video</string>
<string name="account_video_enable">Video inschakelen</string>
@@ -158,6 +160,7 @@
<string name="account_end_export_infos">Uw pincode is:\n\n%%\n\nOm het proces te voltooien opent u Jami op het nieuwe apparaat. Maak een nieuwe account aan met ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig.</string>
<string name="account_link_export_info_light">Om deze account op andere apparaten te gebruiken moet u deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat ingeeft om de account in te stellen. De pincode is 10 minuten geldig.</string>
<string name="account_export_title">Apparaten toevoegen</string>
+ <string name="account_connect_prompt_username">Gebruikersnaam</string>
<!--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>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
index 0abb5ae..5704f54 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">Sta Jami toe om 3G/LTE-netwerken te gebruiken naast wifi</string>
<string name="pref_pushNotifications_title">Pushmeldingen</string>
<string name="pref_pushNotifications_summary">Gebruik de servers van Google om oproepen/berichten in de achtergrond te kunnen ontvangen</string>
+ <string name="pref_video_advanced_title">Geavanceerde video-instellingen</string>
+ <string name="pref_video_advanced_summary">Wijzig de videobitrate en -resolutie, evenals de toegang tot experimentele functies</string>
<string name="pref_hd_summary">Versturen van video in HD inschakelen</string>
<string name="pref_hwEncode_title">Versnelde codering inschakelen</string>
<string name="pref_hwEncode_summary">Experimentele functie</string>
@@ -19,7 +21,6 @@
<string name="pref_startOnBoot_title">Jami automatisch starten</string>
<string name="pref_startOnBoot_summary">Voer Jami in de achtergrond uit wanneer het systeem gestart wordt.</string>
<string name="pref_clearHistory_title">Geschiedenis wissen</string>
- <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
<string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
<string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
index dcb2e9f..75230234 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -34,6 +34,7 @@
<!--SIP-->
<!--TLS Details-->
<!--restore/backup-->
+ <string name="account_connect_prompt_username">Gebruikersnaam</string>
<!--Name registration-->
<!--Create account-->
<!--Edit profile-->
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 ddfb8ce..eb4e96d 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -16,6 +16,7 @@
<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>
+ <string name="data_transfer_service_description">Deze dienst is vereist om blijvende meldingen te kunnen tonen tijdens bestandsoverdrachten. Ze draait enkel tijdens bestandsoverdrachten.</string>
<!--About dialog-->
<string name="developed_by">Ontwikkeld door</string>
<string name="designed_by">Ontworpen door</string>
@@ -119,7 +120,9 @@
<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_prompt">Stel een aangepaste beltoon in</string>
<string name="ringtone_custom_label">Aangepast</string>
+ <string name="ringtone_jami_tones">Jami-beltonen</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-->
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 edd6a2e..fff6d57 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
@@ -67,6 +67,8 @@
<string name="account_ringtone_enabled_label">Beltonen inschakelen</string>
<string name="account_ringtone_path_label">Beltoonpad</string>
<string name="account_ringtone_custom_label">Eigen beltoon gebruiken</string>
+ <string name="account_ringtone_title">Kies een beltoon</string>
+ <string name="account_ringtone_summary">Selecteer een beltoon of stel uw eigen beltoon in</string>
<!--Video Details-->
<string name="account_video_label">Video</string>
<string name="account_video_enable">Video inschakelen</string>
@@ -158,6 +160,7 @@
<string name="account_end_export_infos">Uw pincode is:\n\n%%\n\nOm het proces te voltooien opent u Jami op het nieuwe apparaat. Maak een nieuw account aan met ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig.</string>
<string name="account_link_export_info_light">Om dit account op andere apparaten te gebruiken dient u deze eerst op Ring bloot te stellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat invoert om het account in te stellen. De pincode is 10 minuten geldig.</string>
<string name="account_export_title">Apparaten toevoegen</string>
+ <string name="account_connect_prompt_username">Gebruikersnaam</string>
<!--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>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index 0abb5ae..5704f54 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">Sta Jami toe om 3G/LTE-netwerken te gebruiken naast wifi</string>
<string name="pref_pushNotifications_title">Pushmeldingen</string>
<string name="pref_pushNotifications_summary">Gebruik de servers van Google om oproepen/berichten in de achtergrond te kunnen ontvangen</string>
+ <string name="pref_video_advanced_title">Geavanceerde video-instellingen</string>
+ <string name="pref_video_advanced_summary">Wijzig de videobitrate en -resolutie, evenals de toegang tot experimentele functies</string>
<string name="pref_hd_summary">Versturen van video in HD inschakelen</string>
<string name="pref_hwEncode_title">Versnelde codering inschakelen</string>
<string name="pref_hwEncode_summary">Experimentele functie</string>
@@ -19,7 +21,6 @@
<string name="pref_startOnBoot_title">Jami automatisch starten</string>
<string name="pref_startOnBoot_summary">Voer Jami in de achtergrond uit wanneer het systeem gestart wordt.</string>
<string name="pref_clearHistory_title">Geschiedenis wissen</string>
- <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
<string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
<string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings_account.xml b/ring-android/app/src/main/res/values-pa/strings_account.xml
index c734ff0..f751beb 100644
--- a/ring-android/app/src/main/res/values-pa/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pa/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">ਤੁਹਾਡਾ ਪਿੰਨ:\n\n%%\n\nਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ Jami ਖੋਲ੍ਹਣ ਦੀ ਲੋੜ ਹੈ। \"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕਰੋ\" ਨਾਲ ਨਵਾਂ ਖਾਤਾ ਬਣਾਓ। ਤੁਹਾਡਾ ਪਿੰਨ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।</string>
<string name="account_link_export_info_light">ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਇਹ ਖਾਤਾ ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ Jami \'ਤੇ ਇਸਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪਵੇਗਾ। ਇੰਝ ਕਰਨ ਨਾਲ ਪਿੰਨ ਕੋਡ ਸਿਰਜਿਆ ਜਾਵੇਗਾ ਜਿਸਨੂੰ ਤੁਹਾਨੂੰ ਖਾਤੇ ਦੇ ਸੈੱਟਅੱਪ ਵੇਲੇ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ ਦਾਖਲ ਕਰਨਾ ਪਵੇਗਾ। ਪਿੰਨ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।</string>
<string name="account_export_title">ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ</string>
+ <string name="account_connect_prompt_username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
<!--Name registration-->
<string name="error_username_empty">ਵਰਤੋਂਕਾਰ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
<string name="no_registered_name_for_account">ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ ਪੰਜੀਕਿਰਤ ਨਾਂ ਨਹੀਂ ਮਿਲਿਆ</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings_preferences.xml b/ring-android/app/src/main/res/values-pa/strings_preferences.xml
index 2a0831c..5bf75ac 100644
--- a/ring-android/app/src/main/res/values-pa/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pa/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">ਸਿਸਟਮ ਸ਼ੁਰੂ ਹੋਣ \'ਤੇ Jami ਸ਼ੁਰੂ ਕਰੋ</string>
<string name="pref_startOnBoot_summary">ਸਿਸਟਮ ਸ਼ੁਰੂ ਹੋਣ \'ਤੇ Jami ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ।</string>
<string name="pref_clearHistory_title">ਇਤਿਹਾਸ ਮਿਟਾਓ</string>
- <string name="pref_clearHistory_summary">ਸਾਰਾ ਗੱਲਬਾਤ ਇਤਿਹਾਸ ਮਿਟਾਓ। ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।</string>
<string name="pref_persistNotification_title">ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ</string>
<string name="pref_persistNotification_summary">ਕਾਲਾਂ ਅਤੇ ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦਿਓ।</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
index e7eff81..81a4ca5 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
@@ -139,6 +139,7 @@
<string name="account_start_export_button">Generuj PIN</string>
<string name="account_end_export_button">zamknij</string>
<string name="account_export_title">Dodaj urządzenia</string>
+ <string name="account_connect_prompt_username">Nazwa użytkownika</string>
<!--Name registration-->
<string name="error_username_empty">Wprowadź nazwę użytkownika</string>
<string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
index f338fdf..18a868e 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
@@ -12,5 +12,4 @@
<string name="pref_systemContacts_title">Użyj kontakty z systemu</string>
<string name="pref_systemContacts_summary">Użyj kontakty z systemu aby pokazać detale tego który dzwoni</string>
<string name="pref_clearHistory_title">Wyczyść historię</string>
- <string name="pref_clearHistory_summary">Wyczyść całą historię konwersacji. Ta czynność nie może być cofnięta.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index 7988457..8969a9f 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos"> Twój PIN to:\n\n%%\n\nAby dokończyć proces, musisz otworzyć Jami na nowym urządzeniu. Stwórz nowe konto przez \"Połącz to urządzenie z kontem\". Twój PIN jest ważny przez 10 minut. </string>
<string name="account_link_export_info_light">Aby korzystać z tego konta na innych urządzeniach, musisz najpierw udostępnić je w Jami. To wygeneruje kod PIN, który musisz wprowadzić na nowym urządzeniu aby dodać konto. PIN jest ważny przez 10 minut. </string>
<string name="account_export_title">Dodaj urządzenia</string>
+ <string name="account_connect_prompt_username">Nazwa użytkownika</string>
<!--Name registration-->
<string name="error_username_empty">Wprowadź nazwę użytkownika</string>
<string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_preferences.xml b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
index 9abd4fe..596d191 100644
--- a/ring-android/app/src/main/res/values-pl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Uruchamiaj Jami przy starcie</string>
<string name="pref_startOnBoot_summary">Uruchom Jami w tle, podczas uruchamiania systemu.</string>
<string name="pref_clearHistory_title">Wyczyść historię</string>
- <string name="pref_clearHistory_summary">Wyczyść całą historię konwersacji. Ta czynność nie może być cofnięta.</string>
<string name="pref_persistNotification_title">Zezwalaj na pracę w tle</string>
<string name="pref_persistNotification_summary">Zezwalaj na pracę w tle, aby odbierać rozmowy i wiadomości</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index f3e6a81..7c74ee6 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -152,6 +152,7 @@
<string name="account_end_export_infos">Seu PIN é:\n\n%%\n\nPara completar o processo, você deve abrir o Jami no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo à uma conta\". Seu PIN é válido por 10 minutos.</string>
<string name="account_link_export_info_light">Para usar esta conta em outros dispositivos, você deve antes expô-la no Jami. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 10 minutos.</string>
<string name="account_export_title">Adicionar dispositivos</string>
+ <string name="account_connect_prompt_username">Nome de usuário</string>
<!--Name registration-->
<string name="error_username_empty">Entre um nome de usuário</string>
<string name="no_registered_name_for_account">Nenhum nome registrado encontrado para esta conta</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
index 4849e37..cfef415 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Inicializar o Jami automaticamente com o sistema</string>
<string name="pref_startOnBoot_summary">Executar o Jami em segundo-plano ao inicializar o sistema.</string>
<string name="pref_clearHistory_title">Limpar histórico</string>
- <string name="pref_clearHistory_summary">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</string>
<string name="pref_persistNotification_title">Executar em segundo-plano</string>
<string name="pref_persistNotification_summary">Permitir execução em segundo-plano para receber chamadas e mensagens.</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 16c253b..21ef441 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
@@ -158,6 +158,7 @@
<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_prompt_username">Nome de utilizador</string>
<!--Name registration-->
<string name="error_username_empty">Introduza um nome de utilizador</string>
<string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</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 3b31f29..0eebc57 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
@@ -19,7 +19,6 @@
<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">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</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-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index 9114495..f7d736e 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -158,6 +158,7 @@
<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_prompt_username">Nome de utilizador</string>
<!--Name registration-->
<string name="error_username_empty">Introduza um nome de utilizador</string>
<string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_preferences.xml b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
index 4f895e7..f14ba64 100644
--- a/ring-android/app/src/main/res/values-pt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
@@ -19,7 +19,6 @@
<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">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</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-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
index 2e121ee..fcd22b6 100644
--- a/ring-android/app/src/main/res/values-ro/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -52,6 +52,7 @@
<!--restore/backup-->
<string name="export_account_wait_title">Așteptați vă rog...</string>
<string name="account_export_end_error_title">Eroare</string>
+ <string name="account_connect_prompt_username">Nume de utilizator</string>
<!--Name registration-->
<string name="account_status_unknown">Necunoscut</string>
<!--Create account-->
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 8a0c69e..9d5de6b 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -90,6 +90,7 @@
<string name="error_passwords_not_equals">Пароли не совпадают</string>
<string name="export_account_wait_title">Пожалуйста, подождите...</string>
<string name="account_export_end_error_title">Ошибка</string>
+ <string name="account_connect_prompt_username">Имя пользователя</string>
<!--Name registration-->
<string name="username_already_taken">Имя пользователя уже занято</string>
<string name="invalid_username">Недопустимое имя пользователя</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 4be4448..b61f18f 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -12,12 +12,15 @@
<string name="no_browser_app_installed">Не найден веб-браузер. Установите его, чтобы просмотреть эту страницу.</string>
<string name="email_chooser_title">Отправить письмо используя…</string>
<string name="website_chooser_title">Просмотреть веб-сайт с помощью…</string>
- <string name="license">Это программное обеспечение предоставляется \"как есть\", без каких-либо гарантий. Для получения дополнительной информации смотрите <u>GNU General Public License версии 3 или выше</u></string>
+ <string name="license">Это программное обеспечение предоставляется «как есть», без каких-либо гарантий. Для получения дополнительной информации смотрите <u>GNU General Public License версии 3 или выше</u></string>
<string name="description">Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.</string>
<string name="credits">Благодарности</string>
+ <string name="call_service_description">Эта служба необходима для поддержания ваших звонков на переднем плане. Она будет запущена только во время звонков.</string>
+ <string name="data_transfer_service_description">Эта служба необходима для отображения постоянных уведомлений во время передачи файлов. Она будет запущена только во время передачи файлов.</string>
<!--About dialog-->
<string name="developed_by">Разработано</string>
<string name="designed_by">Оформлено</string>
+ <string name="ringtones_by">Мелодии звонка</string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Нет подключения к сети</string>
@@ -53,15 +56,18 @@
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--Notifications-->
- <string name="notif_missed_incoming_call">Пропущенный входящий вызов</string>
- <string name="notif_missed_outgoing_call">Непринятый исходящий вызов</string>
- <string name="notif_incoming_call_title">Входящий вызов от %1$s</string>
- <string name="notif_incoming_call">Входящий вызов</string>
- <string name="notif_outgoing_call_title">Исходящий вызов к %1$s</string>
+ <string name="notif_missed_incoming_call">Пропущенный входящий звонок</string>
+ <string name="notif_missed_outgoing_call">Непринятый исходящий звонок</string>
+ <string name="notif_incoming_call_title">Входящий звонок от %1$s</string>
+ <string name="notif_incoming_call">Входящий звонок</string>
+ <string name="notif_outgoing_call_title">Исходящий звонок %1$s</string>
<string name="notif_outgoing_call">Исходящий вызов</string>
- <string name="notif_current_call">Исходящий вызов</string>
+ <string name="notif_current_call_title">Текущий звонок %1$s</string>
+ <string name="notif_current_call">Текущий звонок</string>
+ <string name="notif_channel_call_in_progress">Текущий вызов</string>
<string name="notif_channel_calls">Звонки</string>
- <string name="notif_channel_missed_calls">Пропущенные вызовы</string>
+ <string name="notif_channel_missed_calls">Пропущенные звонки</string>
+ <string name="notif_channel_incoming_calls">Входящие звонки</string>
<string name="notif_channel_messages">Сообщения</string>
<string name="notif_channel_requests">Запросы</string>
<string name="notif_channel_file_transfer">Передача файла</string>
@@ -85,22 +91,22 @@
<string name="hist_in_call">Входящий звонок %1$s</string>
<string name="hist_out_call">Исходящий звонок %1$s</string>
<string name="start_error_title">Невозможно запустить Jami!</string>
- <string name="start_error_mic_required">Jami требуется разрешение на использование микрофона для работы.</string>
- <string name="action_call_accept">Принять вызов</string>
+ <string name="start_error_mic_required">Для работы Jami требуется разрешение на использование микрофона.</string>
+ <string name="action_call_accept">Принять</string>
<string name="action_call_decline">Отклонить</string>
<string name="action_call_mic_mute">Выключить микрофон</string>
- <string name="ab_action_speakerphone">Включить громкоговоритель</string>
+ <string name="ab_action_speakerphone">Включить динамик</string>
<string name="ab_action_contact_add">Добавить в контакты</string>
- <string name="ab_action_contact_add_question">Добавить к контактам?</string>
+ <string name="ab_action_contact_add_question">Добавить в контакты?</string>
<string name="hist_contact_added">Контакт добавлен</string>
<string name="hist_invitation_received">Получено приглашение</string>
- <string name="ab_action_audio_call">Голосовой вызов</string>
+ <string name="ab_action_audio_call">Голосовой звонок</string>
<string name="ab_action_video_call">Видео звонок</string>
- <string name="ab_action_change_screen_orientation">Изменить ориентацию экрана</string>
+ <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="ab_action_flipcamera">Перевернуть камеру</string>
+ <string name="ab_action_flipcamera">Переключить камеру</string>
<!--Text messages-->
<string name="send_message">Отправить сообщение</string>
<string name="message_sending">Отправка сообщения...</string>
@@ -116,14 +122,19 @@
<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_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="error_scan_no_camera_permissions">Для сканирования 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">Мой QR-код</string>
+ <string name="tab_scan">Считать QR-код</string>
<!--Settings-->
<string name="clear_history_dialog_title">Очистить историю?</string>
<string name="clear_history_dialog_message">Это действие невозможно отменить.</string>
@@ -156,9 +167,10 @@
<string name="prompt_new_password_repeat">Повторите новый пароль</string>
<string name="account_create_title">Создать учётную запись Jami</string>
<string name="prompt_new_username">Введите новое имя пользователя</string>
- <string name="help_password_choose">Выберите надёжный пароль, который вы запомните, чтобы защитить ваш аккаунт Jami.</string>
+ <string name="help_password_choose">Выберите надёжный и запоминающийся пароль для защиты вашей учетной записи Jami.</string>
<string name="help_password_enter">Введите пароль от вашего основного аккаунта Jami</string>
- <string name="help_pin_enter">Введите PIN от настроенного аккаунта Jami. Используйте функцию «экспортировать аккаунт в Jami», чтобы получить PIN.</string>
+ <string name="help_server_enter">Введите URL управляющего сервера</string>
+ <string name="help_pin_enter">Введите PIN другого аккаунта Jami. Используйте функцию «экспортировать аккаунт в Jami» для получения PIN.</string>
<string name="wizard_next">Далее</string>
<string name="wizard_back">Назад</string>
<string name="wizard_skip">Пропустить</string>
@@ -175,15 +187,16 @@
<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>
<string name="block">Заблокировать</string>
<string name="contact_request_title">Новый запрос на добавление в контакты</string>
- <string name="contact_request_msg">У вас %1$s запросов на добавление в контакты</string>
+ <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_yet">%s еще не в вашем списке контактов. Вы хотите принять или отклонить этот запрос?</string>
<string name="message_contact_not_trusted">%s отсутствует в ваших контактах.\nДобавить новый контакт?</string>
<!--Send contact requests-->
<string name="send_request_button">Отправить</string>
@@ -194,6 +207,7 @@
<!--Smartlist-->
<string name="no_contact_request">Нет отправленных запросов на добавление в контакты</string>
<string name="contact_request_sent">Запрос на добавление в контакты отправлен</string>
+ <string name="start_conversation">Начать разговор</string>
<string name="search_results">Результаты поиска</string>
<string name="tv_contact_row_header">Контакты</string>
<string name="gallery_error_title">Не найдено приложение Галерея</string>
@@ -202,7 +216,7 @@
<!--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_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>
@@ -225,4 +239,6 @@
<string name="menu_message_delete">Удалить сообщение</string>
<string name="menu_message_cancel">Отменить передачу сообщения</string>
<string name="menu_delete">Удалить</string>
+ <string name="pref_darkTheme_title">Темная тема</string>
+ <string name="pref_darkTheme_summary">Всегда использовать темную тему независимо от системных параметров</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 59c6203..77a5463 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
@@ -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>
@@ -66,6 +67,8 @@
<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>
+ <string name="account_ringtone_summary">Выберите мелодию звонка или установите собственную</string>
<!--Video Details-->
<string name="account_video_label">Видео</string>
<string name="account_video_enable">Включить видео</string>
@@ -146,16 +149,24 @@
<string name="account_sip_success_title">SIP-аккаунт зарегистрирован</string>
<string name="account_sip_success_message">Вы успешно зарегистрировали свой SIP-аккаунт.</string>
<string name="account_sip_register_anyway">Все равно зарегистрироваться</string>
+ <string name="account_link_device">Подключиться с другого устройства</string>
<string name="account_link_button">Подключение из сети</string>
+ <string name="account_link_archive_button">Подключиться из резервной копии</string>
<string name="account_link_prompt_pin">Введите PIN</string>
<string name="account_new_button">Создать учётную запись Jami</string>
<string name="account_link_export_button">Привязать другое устройство к этому аккаунту</string>
<string name="account_link_export_info">Чтобы использовать этот аккаунт на других устройствах, вам необходимо сначала скопировать его в сеть Jami. При этом будет сгенерирован PIN-код, который вы должны будете ввести на новом устройстве для установки аккаунта. PIN-код действителен в течение 10 минут.</string>
<string name="account_start_export_button">Сгенерировать PIN</string>
<string name="account_end_export_button">закрыть</string>
- <string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса нужно открыть Jami на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
+ <string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса откройте Jami на новом устройстве и выберите «Привязать это устройство к аккаунту». Ваш PIN действителен в течение 10 минут.</string>
<string name="account_link_export_info_light">Чтобы использовать этот аккаунт на других устройствах, вам необходимо сначала скопировать его в сеть Jami. При этом будет сгенерирован PIN-код, который вы должны будете ввести на новом устройстве для установки аккаунта. PIN-код действителен в течение 10 минут.</string>
<string name="account_export_title">Добавить устройства</string>
+ <string name="account_connect_server_button">Подключиться к управляющему серверу</string>
+ <string name="account_connect_button">Соединение</string>
+ <string name="prompt_server">URL управляющего сервера Jami</string>
+ <string name="help_credentials_enter">Введите учетные данные вашей организации</string>
+ <string name="help_connect_password_enter">Введите пароль вашей организации</string>
+ <string name="account_connect_prompt_username">Имя пользователя</string>
<!--Name registration-->
<string name="error_username_empty">Введите имя пользователя</string>
<string name="no_registered_name_for_account">Не найдено зарегистрированного имени для этого аккаунта</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
index ad4b5f6..60d6b9b 100644
--- a/ring-android/app/src/main/res/values-ru/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">Разрешить Jami использовать 3G/LTE сети в дополнение к Wi-Fi</string>
<string name="pref_pushNotifications_title">Push-уведомления</string>
<string name="pref_pushNotifications_summary">Использовать серверы Google для получения вызовов/сообщений в фоновом режиме</string>
+ <string name="pref_video_advanced_title">Дополнительные настройки видео</string>
+ <string name="pref_video_advanced_summary">Изменение разрешения и битрейта видео, доступ к экспериментальным функциям</string>
<string name="pref_hd_summary">Разрешить отправку видео высокого разрешения</string>
<string name="pref_hwEncode_title">Включить аппаратное кодирование</string>
<string name="pref_hwEncode_summary">Экспериментальная опция</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
index b49cc33..bf7770a 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nNa dokončenie procesu je potrebné otvoriť aplikáciu Jami na novom zariadení. Vytvorte nový účet pomocou \"Prepojiť toto zariadenie s iným účtom\". Váš PIN bude funkčný 10 minút.</string>
<string name="account_link_export_info_light">Aby ste mohli tento účet používať na viacerých zariadeniach, musíte ho najprv sprístupniť na Jami. Vygeneruje sa PIN kód, ktorý je potrebný zadať na novom zariadení. Tento kód bude funkčný 10 minút.</string>
<string name="account_export_title">Pridať zariadenia</string>
+ <string name="account_connect_prompt_username">Používateľské meno</string>
<!--Name registration-->
<string name="error_username_empty">Zadajte používateľské meno</string>
<string name="no_registered_name_for_account">Pre tento účet nebolo nájdené zaregistrované meno</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
index 1fb2170..fe34a49 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Spustiť Jami pri zapnutí zariadenia</string>
<string name="pref_startOnBoot_summary">Spustiť Jami na pozadí pri štarte systému.</string>
<string name="pref_clearHistory_title">Vymazať históriu</string>
- <string name="pref_clearHistory_summary">Vymazať históriu všetkých konverzácií. Túto akciu nie je možné zvrátiť.</string>
<string name="pref_persistNotification_title">Spustiť na pozadí</string>
<string name="pref_persistNotification_summary">Povoliť spustenie na pozadí na prijímanie hovorov a spáv.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings_account.xml b/ring-android/app/src/main/res/values-sl/strings_account.xml
index 7bf6cdd..5793115 100644
--- a/ring-android/app/src/main/res/values-sl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_account.xml
@@ -114,6 +114,7 @@
<string name="account_link_prompt_pin">Vnesi PIN</string>
<string name="account_link_export_button">Poveži drugo napravo s tem računom</string>
<string name="account_end_export_button">zapri</string>
+ <string name="account_connect_prompt_username">Uporabnik</string>
<!--Name registration-->
<string name="error_username_empty">Vnesi uporabniško ime</string>
<string name="register_name">Prijavi ime</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings_preferences.xml b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
index 034b9d78..4f97760 100644
--- a/ring-android/app/src/main/res/values-sl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
@@ -9,5 +9,4 @@
<string name="pref_systemContacts_title">Uporabi sistemske stike</string>
<string name="pref_systemContacts_summary">Uporabi sistemske stike za prikaz podatkov klicatelja.</string>
<string name="pref_clearHistory_title">Pobriši zgodovino</string>
- <string name="pref_clearHistory_summary">Pobriši vso zgodovino pogovorov. Ta funkcija ne more biti preklicana.</string>
</resources>
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 23ab6a0..d7ede51 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
@@ -160,6 +160,7 @@
<string name="account_end_export_infos">PIN-i juaj është:\n\n%%\n\nQë të plotësohet procesi, lypset të hapni Jami-n në pajisjen e re. Krijoni një llogari të re përmes \"Lidhe këtë pajisje te një llogari\". PIN-i juaj është i vlefshëm për 10 minuta.</string>
<string name="account_link_export_info_light">Që të përdorni këtë llogari në pajisje të tjera, së pari duhet t\ia ekspozoni atë Jami-t. Kështu do të prodhohet një kod PIN që duhet ta jepni te pajisja e re për të rregulluar llogarinë. PIN-i vlen për 10 minuta.</string>
<string name="account_export_title">Shtoni pajisje</string>
+ <string name="account_connect_prompt_username">Emër përdoruesi</string>
<!--Name registration-->
<string name="error_username_empty">Jepni një emër përdoruesi</string>
<string name="no_registered_name_for_account">S\’u gjet emër i regjistruar për këtë llogari</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 35be265..594a5e1 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
@@ -21,7 +21,6 @@
<string name="pref_startOnBoot_title">Nise Jami-n kur niset sistemi</string>
<string name="pref_startOnBoot_summary">Xhirojeni Jami-n në prapaskenë, kur niset sistemi.</string>
<string name="pref_clearHistory_title">Pastroje historikun</string>
- <string name="pref_clearHistory_summary">Pastroni krejt historikun e bisedave, Ky veprim nuk mund të zhbëhet.</string>
<string name="pref_persistNotification_title">Xhiro në prapaskenë</string>
<string name="pref_persistNotification_summary">Lejoni xhirimin në prapaskenë që të merrni thirrje dhe mesazhe.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index 782633e..99bf0bc 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">Din PIN-kod är:\n\n%%\n\nFör att slutföra processen måste du starta Jami på den nya enheten. Skapa ett nytt konto med \"Koppla denna enhet till ett konto\". Din PIN-kod är giltig i 10 minuter.</string>
<string name="account_link_export_info_light">För att använda detta konto på en annan enhet, måste du först exponera det på Jami. Detta genererar en PIN-kod som du måste ange på den nya enheten för att öppna kontot. Pin-koden är giltig i 10 minuter.</string>
<string name="account_export_title">Lägg till enheter</string>
+ <string name="account_connect_prompt_username">Användarnamn</string>
<!--Name registration-->
<string name="error_username_empty">Ange ett användarnamn</string>
<string name="no_registered_name_for_account">Inget registrerat namn hittades för detta konto</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_preferences.xml b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
index b424228..78da727 100644
--- a/ring-android/app/src/main/res/values-sv/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Starta Jami vid systemstart</string>
<string name="pref_startOnBoot_summary">Kör Jami i bakgrunden när systemet startas</string>
<string name="pref_clearHistory_title">Rensa historik</string>
- <string name="pref_clearHistory_summary">Ta bort all samtalshistorik. Denna åtgärd kan inte ångras.</string>
<string name="pref_persistNotification_title">Kör i bakgrunden</string>
<string name="pref_persistNotification_summary">Tillåt bakgrundskörning för inkommande samtal och meddelanden.</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 d5f58bd..98cdef3 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
@@ -152,6 +152,7 @@
<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_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>
diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
index 00e0ea0..a06d485 100644
--- a/ring-android/app/src/main/res/values-tr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">Jami\'yi başlangıçta başlat</string>
<string name="pref_startOnBoot_summary">Sistem başladığında Jami\'yi arkaplanda çalıştır.</string>
<string name="pref_clearHistory_title">Geçmişi temizle</string>
- <string name="pref_clearHistory_summary">Konuşma geçmişini temizle. Bu eylem geri alınamaz.</string>
<string name="pref_persistNotification_title">Arkaplanda çalıştır</string>
<string name="pref_persistNotification_summary">Arka planda çalışan çağrı ve iletileri almak için izin ver</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index 3f2a65e..4f1371b 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -148,6 +148,7 @@
<string name="account_end_export_infos">Ваш PIN-код:\n\n%%\n\nЩоб завершити, відкрийте Джамі на іншому пристрої. Створіть обліковий запис через «Прив\'язати інший пристрій до облікового запису». Ваш PIN-код дійсний протягом 10 хвилин.</string>
<string name="account_link_export_info_light">Для використання цього облікового запису на інших пристроях, вам необхідно надати доступ до нього в Джамі. При цьому буде згенеровано PIN-код, який вам необхідно буде ввести на іншому пристрої, щоб налаштувати обліковий запис. PIN-код дійсний протягом 10 хвилин.</string>
<string name="account_export_title">Додати пристрої</string>
+ <string name="account_connect_prompt_username">Ім’я</string>
<!--Name registration-->
<string name="error_username_empty">Ввести ім\'я користувача</string>
<string name="no_registered_name_for_account">Не знайдено зареєстрованого імені для цього облікового запису</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings_preferences.xml b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
index 9cedbd7..9c20887 100644
--- a/ring-android/app/src/main/res/values-uk/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
@@ -14,5 +14,4 @@
<string name="pref_startOnBoot_title">Запускати Джамі після включення пристрою</string>
<string name="pref_startOnBoot_summary">Дозволити Джамі працювати на задньому плані, коли вмикається пристрій.</string>
<string name="pref_clearHistory_title">Видалити історію</string>
- <string name="pref_clearHistory_summary">Видалити всю історію розмов. Ця дія не може бути скасована.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index e5c4c2c..df61318 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -158,6 +158,7 @@
<string name="account_end_export_infos">您的PIN码是：\n\n%%\n\n要完成此过程，您需要在新设备上打开Jami。 使用“将此设备链接到帐户”创建一个新帐户。你的PIN码有效期为10分钟。</string>
<string name="account_link_export_info_light">要在其他设备上使用此帐户，您必须先在Jami上公开它。这将生成一个PIN码，您必须在新设备上输入该PIN码才能设置帐户。PIN有效期为10分钟。</string>
<string name="account_export_title">添加设备</string>
+ <string name="account_connect_prompt_username">用户名</string>
<!--Name registration-->
<string name="error_username_empty">输入用户名</string>
<string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
index 2bc47b5..38bd3f8 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -19,7 +19,6 @@
<string name="pref_startOnBoot_title">启动时运行Jami</string>
<string name="pref_startOnBoot_summary">系统启动时在后台运行Jami。</string>
<string name="pref_clearHistory_title">清除历史记录</string>
- <string name="pref_clearHistory_summary">清除所有会话历史记录。该操作无法撤销。</string>
<string name="pref_persistNotification_title">后台运行</string>
<string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</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 8d8dc9a..6013cf8 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
@@ -16,6 +16,7 @@
<string name="description">Jami 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。</string>
<string name="credits">榮譽</string>
<string name="call_service_description">此服務是為了讓您的通話保持在前景執行所需。它只會在通話期間執行。</string>
+ <string name="data_transfer_service_description">此服務是在檔案傳輸期間顯示持續通知所必須。其僅在檔案傳輸時執行。</string>
<!--About dialog-->
<string name="developed_by">開發由</string>
<string name="designed_by">設計由</string>
@@ -118,7 +119,9 @@
<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_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-->
@@ -163,6 +166,7 @@
<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 碼。使用「在 Jami 上匯出帳號」功能來取得 PIN 碼。</string>
<string name="wizard_next">下一個</string>
<string name="wizard_back">前一個</string>
@@ -180,6 +184,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>
@@ -199,6 +204,7 @@
<!--Smartlist-->
<string name="no_contact_request">未有送出的聯絡人請求</string>
<string name="contact_request_sent">聯絡人請求已傳送</string>
+ <string name="start_conversation">開啟對話</string>
<string name="search_results">搜尋結果</string>
<string name="tv_contact_row_header">聯絡人</string>
<string name="gallery_error_title">找不到相簿應用程式</string>
@@ -230,4 +236,6 @@
<string name="menu_message_delete">刪除訊息</string>
<string name="menu_message_cancel">取消訊息</string>
<string name="menu_delete">刪除</string>
+ <string name="pref_darkTheme_title">深色主題</string>
+ <string name="pref_darkTheme_summary">總是啟用深色主題而非系統行為</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index 37ba5be..086e8d8 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -67,6 +67,8 @@
<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>
+ <string name="account_ringtone_summary">選取鈴聲或選擇您自己的</string>
<!--Video Details-->
<string name="account_video_label">視訊</string>
<string name="account_video_enable">啟用視訊</string>
@@ -147,6 +149,7 @@
<string name="account_sip_success_title">SIP 帳號已註冊</string>
<string name="account_sip_success_message">您已成功註冊您的 SIP 帳號。</string>
<string name="account_sip_register_anyway">無論如何都要註冊</string>
+ <string name="account_link_device">從其他裝置連線</string>
<string name="account_link_button">從網路連線</string>
<string name="account_link_archive_button">從備份連線</string>
<string name="account_link_prompt_pin">輸入 PIN 碼</string>
@@ -158,6 +161,12 @@
<string name="account_end_export_infos">您的 PIN 碼是：\n\n%%\n\n要完成過程，您需要在新裝置上開啟 Jami。以「連結這個裝置到一個帳號」來建立新帳號。您的 PIN 碼在 10 分鐘內有效。</string>
<string name="account_link_export_info_light">要在其他裝置上使用這個帳號，您必須先在 Jami 上揭露它。這將會生成一個您必須在新裝置上輸入以設定帳號的 PIN 碼。PIN 碼在 10 分鐘內有效。</string>
<string name="account_export_title">新增裝置</string>
+ <string name="account_connect_server_button">連線到管理伺服器</string>
+ <string name="account_connect_button">連線</string>
+ <string name="prompt_server">Jami 管理伺服器 URL</string>
+ <string name="help_credentials_enter">輸入您的組織憑證</string>
+ <string name="help_connect_password_enter">輸入您的組織密碼</string>
+ <string name="account_connect_prompt_username">使用者名稱</string>
<!--Name registration-->
<string name="error_username_empty">輸入使用者名稱</string>
<string name="no_registered_name_for_account">找不到這個帳號已註冊的名稱</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 3989e37..dcbc189 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -9,6 +9,8 @@
<string name="pref_mobileData_summary">除了 Wi-Fi 之外，允許 Jami 在 3G/LTE 網路上使用</string>
<string name="pref_pushNotifications_title">推播通知</string>
<string name="pref_pushNotifications_summary">使用 Google 的伺服器以讓您可以在背景收到通話／訊息</string>
+ <string name="pref_video_advanced_title">進階視訊設定</string>
+ <string name="pref_video_advanced_summary">變更視訊位元率、解析度並存取實驗性功能</string>
<string name="pref_hd_summary">啟用傳送高畫質視訊</string>
<string name="pref_hwEncode_title">啟用加速編碼</string>
<string name="pref_hwEncode_summary">實驗性功能</string>
@@ -19,7 +21,7 @@
<string name="pref_startOnBoot_title">開機時啟動 Jami</string>
<string name="pref_startOnBoot_summary">開機時在背景啟動 Jami</string>
<string name="pref_clearHistory_title">清除記錄</string>
- <string name="pref_clearHistory_summary">清除所有的對話記錄，這個動作無法被復原。</string>
+ <string name="pref_clearHistory_summary">清除所有對話歷史。此動作無法復原。</string>
<string name="pref_persistNotification_title">在背景執行</string>
<string name="pref_persistNotification_summary">允許在背景中執行以接收通話與訊息。</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index 1936f17..6c71f4d 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -36,6 +36,7 @@
<!--SIP-->
<!--TLS Details-->
<!--restore/backup-->
+ <string name="account_connect_prompt_username">使用者名</string>
<!--Name registration-->
<string name="account_status_unknown">未知</string>
<!--Create account-->