diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 19fc487..53ce8b1 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -82,6 +82,7 @@
   <string name="send_message">إبعث رسالة</string>
   <string name="time_just_now">للتوّ</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">خطأ</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -91,4 +92,5 @@
   <!--Contacts-->
   <!--MenuHeaderView-->
   <string name="unknown">مجهول</string>
+  <!--Share fragment-->
 </resources>
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 86cdd54..8490584 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
@@ -70,7 +70,7 @@
   <string name="account_rtp_max_port">الحد الاقصى</string>
   <string name="account_rtp_min_port">الحد الأدنى</string>
   <string name="account_rtp_port_range">نطاق المنفذ RTP الصوتي</string>
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export">تصدير</string>
   <string name="account_export_end_error_title">خطأ</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index 17dfd02..78ec7a3 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -91,6 +91,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Право за използване на камерата</string>
   <string name="permission_dialog_camera_message">Разговорите с видео изискват правото за използване на камерата. Моля, дайте това право на приложението.</string>
+  <string name="ringtone_error_title">Грешка</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring се нуждае от правото за четене на контактите, за да работи тази функционалност. Моля, разрешете го.</string>
   <!--Write call log permission-->
@@ -111,4 +112,5 @@
   <string name="prompt_new_password">Нова парола</string>
   <!--MenuHeaderView-->
   <string name="unknown">Неизвестно</string>
+  <!--Share fragment-->
 </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 67ed321..5f48b96 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
@@ -18,7 +18,7 @@
   <string name="share_number">Споделяне на номера</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Изтриване на акаунта?</string>
-  <string name="account_delete_dialog_message">Това действие е необратимо. Ако не сте го направили вече, ще е добре да изнесете данните за акаунта си, преди да го изтриете.</string>
+  <string name="account_delete_dialog_message">Това действие е необратимо.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Няма регистриран акаунт</string>
   <string name="normal_accounts_titles">Акаунти</string>
@@ -78,26 +78,17 @@
   <string name="account_tls_negotiation_timeout_sec">Време за изчакване на договарянето (сек)</string>
   <string name="account_rtp_max_port">Максимален</string>
   <string name="account_rtp_min_port">Минимален</string>
-  <!--Import/export-->
-  <string name="account_export">Изнасяне</string>
-  <string name="account_import_account">Внасяне на акаунт</string>
-  <string name="account_export_title">Изнасяне на акаунт</string>
-  <string name="account_import_title">Внасяне на акаунти</string>
-  <string name="account_import_explanation">Можете да внесете предварително изнесените данни за акаунти.</string>
-  <string name="account_export_message">Запазете настройките на акаунта и данните за удостоверяване, шифрирани с парола.</string>
-  <string name="account_export_new_password">Нова парола</string>
-  <string name="account_export_confirm_password">Потвърдете паролата</string>
-  <string name="account_import_message">Въведете парола за дешифриране на файла.</string>
-  <string name="account_import_decryption_password">Парола за дешифриране</string>
-  <string name="import_dialog_title">Внасяне</string>
-  <string name="import_export_wait">Моля, изчакайте…</string>
-  <string name="export_dialog_title">Изнасяне на акаунта</string>
-  <string name="account_export_result">Данните за акаунта бяха изнесени в %1$s</string>
-  <string name="export_failed_dialog_title">Неуспешно изнасяне</string>
-  <string name="export_failed_dialog_msg">Възникна грешка</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Запазете настройките на акаунта и данните за удостоверяване, шифрирани с парола.</string>
+  <string name="account_backup_new_password">Нова парола</string>
+  <string name="account_backup_confirm_password">Потвърдете паролата</string>
+  <string name="account_restore_message">Въведете парола за дешифриране на файла.</string>
+  <string name="account_restore_decryption_password">Парола за дешифриране</string>
+  <string name="restore_backup_wait">Моля, изчакайте…</string>
+  <string name="backup_failed_dialog_msg">Възникна грешка</string>
   <string name="error_password_char_count">Най-малко 6 знака</string>
   <string name="error_passwords_not_equals">Паролите не съвпадат</string>
-  <string name="import_failed_dialog_title">Неуспешно внасяне</string>
-  <string name="import_failed_dialog_msg">Възникна грешка</string>
+  <string name="restore_failed_dialog_msg">Възникна грешка</string>
+  <string name="account_export">Изнасяне</string>
   <string name="account_export_end_error_title">Грешка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 24101a7..b787597 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -27,4 +27,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 46669bd..5d24ee4 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
@@ -29,5 +29,5 @@
   <string name="account_preferences_security_tab">Seguretat</string>
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 861a195..7b27766 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -88,6 +88,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Povolení ke kameře</string>
   <string name="permission_dialog_camera_message">Video konverzace vyžadují povolení ke kameře. Prosím zvažte jeho povolení.</string>
+  <string name="ringtone_error_title">Chyba</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring potřebuje povolení číst kontakty pro umožnění této vlastnosti. Prosím povolte jej.</string>
   <!--Write call log permission-->
@@ -110,4 +111,5 @@
   <string name="prompt_new_password">Nové heslo</string>
   <!--MenuHeaderView-->
   <string name="unknown">Neznámý</string>
+  <!--Share fragment-->
 </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 7a4a765..5934933 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
@@ -27,12 +27,13 @@
   <string name="share_number">Sdílet číslo</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Odstranit účet ?</string>
-  <string name="account_delete_dialog_message">Tuto činnost nelze vrátit zpět. Poked jste tak ještě neučinili, měli byste zvážit export vašeho účtu, než ho odstraníte.</string>
+  <string name="account_delete_dialog_message">Tuto činnost nelze vrátit zpět.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Žádný registrovaný účet</string>
   <string name="normal_accounts_titles">Účty</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Obecné</string>
+  <string name="account_preferences_devices_tab">Zařízení</string>
   <string name="account_basic_category">Základní Nastavení</string>
   <string name="account_alias_label">Název účtu</string>
   <string name="account_hostname_label">Hostitelské jméno</string>
@@ -90,26 +91,17 @@
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Rozsah Portů Zvukového RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Export</string>
-  <string name="account_import_account">Importovat účet</string>
-  <string name="account_export_title">Exportovat účet</string>
-  <string name="account_import_title">Importovat účty</string>
-  <string name="account_import_explanation">Můžete importovat dříve exportované účty.</string>
-  <string name="account_export_message">Uložit nastavení a ověřovací údaje účtu, heslo zašifrované.</string>
-  <string name="account_export_new_password">Nové heslo</string>
-  <string name="account_export_confirm_password">Potvrdit heslo</string>
-  <string name="account_import_message">Vložte heslo pro dešifrování souboru.</string>
-  <string name="account_import_decryption_password">Heslo dešifrování</string>
-  <string name="import_dialog_title">Importuji</string>
-  <string name="import_export_wait">Please vyčkejte…</string>
-  <string name="export_dialog_title">Exportuji účet</string>
-  <string name="account_export_result">Účet exportován do %1$s</string>
-  <string name="export_failed_dialog_title">Export selhal</string>
-  <string name="export_failed_dialog_msg">Nastala chyba</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Uložit nastavení a ověřovací údaje účtu, heslo zašifrované.</string>
+  <string name="account_backup_new_password">Nové heslo</string>
+  <string name="account_backup_confirm_password">Potvrdit heslo</string>
+  <string name="account_restore_message">Vložte heslo pro dešifrování souboru.</string>
+  <string name="account_restore_decryption_password">Heslo dešifrování</string>
+  <string name="restore_backup_wait">Please vyčkejte…</string>
+  <string name="backup_failed_dialog_msg">Nastala chyba</string>
   <string name="error_password_char_count">Minimálně 6 znaků</string>
   <string name="error_passwords_not_equals">Hesla se neshodují</string>
-  <string name="import_failed_dialog_title">Import selhal</string>
-  <string name="import_failed_dialog_msg">Nastala chyba</string>
+  <string name="restore_failed_dialog_msg">Nastala chyba</string>
+  <string name="account_export">Export</string>
   <string name="account_export_end_error_title">Chyba</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 4d5dfb0..66b645e 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-tilladelse</string>
   <string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
+  <string name="ringtone_error_title">Fejl</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring har brug for \"Læs kontakter\"-tilladelse for at kunne udføre denne funktion. Vær venlig at tillade den.</string>
   <!--Write call log permission-->
@@ -116,4 +117,5 @@
   <string name="prompt_new_password">Nyt kodeord</string>
   <!--MenuHeaderView-->
   <string name="unknown">Ukendt</string>
+  <!--Share fragment-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
index e4775f7..2926197 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
@@ -26,7 +26,7 @@
   <string name="share_number">Del nummer</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Slet konto ?</string>
-  <string name="account_delete_dialog_message">Dette kan ikke fortrydes. Hvis du ikke har gjort det endnu, bør du overveje at eksportere din konto før du sletter den.</string>
+  <string name="account_delete_dialog_message">Denne handling kan ikke fortrydes.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registreret</string>
   <string name="normal_accounts_titles">Konti</string>
@@ -90,26 +90,17 @@
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Portinterval for Lyd-RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Eksporter</string>
-  <string name="account_import_account">Importer en konto</string>
-  <string name="account_export_title">Eksporter en konto</string>
-  <string name="account_import_title">Importer konti</string>
-  <string name="account_import_explanation">Du kan importere en tidligere eksporteret konto.</string>
-  <string name="account_export_message">Gem konto-indstillinger og autorisationer, beskyttet af kodeord.</string>
-  <string name="account_export_new_password">Nyt kodeord</string>
-  <string name="account_export_confirm_password">Bekræft kodeord</string>
-  <string name="account_import_message">Indtast kodeord for at dekryptere filen.</string>
-  <string name="account_import_decryption_password">Dekrypteringskodeord</string>
-  <string name="import_dialog_title">Importerer</string>
-  <string name="import_export_wait">Vent venligt...</string>
-  <string name="export_dialog_title">Eksporterer konto</string>
-  <string name="account_export_result">Konto eksporteret til %1$s</string>
-  <string name="export_failed_dialog_title">Fejl under eksport</string>
-  <string name="export_failed_dialog_msg">Der skete en fejl</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Gem konto-indstillinger og autorisationer, beskyttet af kodeord.</string>
+  <string name="account_backup_new_password">Nyt kodeord</string>
+  <string name="account_backup_confirm_password">Bekræft kodeord</string>
+  <string name="account_restore_message">Indtast kodeord for at dekryptere filen.</string>
+  <string name="account_restore_decryption_password">Dekrypteringskodeord</string>
+  <string name="restore_backup_wait">Vent venligt...</string>
+  <string name="backup_failed_dialog_msg">Der skete en fejl</string>
   <string name="error_password_char_count">Mindst 6 tegn</string>
   <string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
-  <string name="import_failed_dialog_title">Import fejlede</string>
-  <string name="import_failed_dialog_msg">Der skete en fejl</string>
+  <string name="restore_failed_dialog_msg">Der skete en fejl</string>
+  <string name="account_export">Eksporter</string>
   <string name="account_export_end_error_title">Fejl</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 5561b44..7df3ddf 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -83,6 +83,7 @@
   <string name="time_just_now">Vorhin</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
+  <string name="ringtone_error_title">Fehler</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -103,4 +104,5 @@
   <string name="prompt_new_password">Neues Kennwort</string>
   <!--MenuHeaderView-->
   <string name="unknown">Unbekannt</string>
+  <!--Share fragment-->
 </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 22b8abe..3f3e6f8 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
@@ -19,6 +19,7 @@
   <string name="share_number">Telefonnummer teilen</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Konto löschen?</string>
+  <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Kontos</string>
   <!--Basic Details-->
@@ -70,23 +71,15 @@
   <string name="account_tls_verify_client_label">Client überprüfen</string>
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
-  <!--Import/export-->
-  <string name="account_export">Exportieren</string>
-  <string name="account_import_account">Importieren ein Konto</string>
-  <string name="account_export_title">Exportieren ein Konto</string>
-  <string name="account_import_title">Kontos importieren</string>
-  <string name="account_export_new_password">Neues Kennwort</string>
-  <string name="account_export_confirm_password">Konto bestätigen</string>
-  <string name="account_import_decryption_password">Entschlüsselungskennwort</string>
-  <string name="import_dialog_title">Importieren</string>
-  <string name="import_export_wait">Bitte warten...</string>
-  <string name="export_dialog_title">Konto wird exportiert</string>
-  <string name="account_export_result">Konto nach %1$s exportiert</string>
-  <string name="export_failed_dialog_title">Fehler beim Exportieren</string>
-  <string name="export_failed_dialog_msg">Fehler aufgetreten</string>
+  <!--restore/backup-->
+  <string name="account_backup_new_password">Neues Kennwort</string>
+  <string name="account_backup_confirm_password">Konto bestätigen</string>
+  <string name="account_restore_decryption_password">Entschlüsselungskennwort</string>
+  <string name="restore_backup_wait">Bitte warten...</string>
+  <string name="backup_failed_dialog_msg">Fehler aufgetreten</string>
   <string name="error_password_char_count">Mindestens 6 Zeichen</string>
   <string name="error_passwords_not_equals">Kennwörter stimmen nicht überein</string>
-  <string name="import_failed_dialog_title">Fehler beim Import</string>
-  <string name="import_failed_dialog_msg">Fehler aufgetreten</string>
+  <string name="restore_failed_dialog_msg">Fehler aufgetreten</string>
+  <string name="account_export">Exportieren</string>
   <string name="account_export_end_error_title">Fehler</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 8e5266f..8dc725e 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
   <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte geben Sie diese Berechtigung frei.</string>
+  <string name="ringtone_error_title">Fehler</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte geben Sie sie frei.</string>
   <!--Write call log permission-->
@@ -114,6 +115,14 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</string>
   <string name="prompt_new_password">Neues Passwort</string>
+  <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
+  <string name="account_device_updated_message">Sie haben erfolgreich ihr Ring-Konto aktualisiert</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mein Profil</string>
+  <string name="profile_message_warning">Dies wird mit ihren Kontakten geteilt</string>
+  <string name="open_the_gallery">Gallerie öffnen</string>
+  <string name="take_a_photo">Foto machen</string>
+  <string name="unknowm_if_empty">\'Unbekannt\' falls leer...</string>
   <string name="unknown">Unbekannt</string>
+  <!--Share fragment-->
 </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 678eb04..1704832 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
@@ -10,7 +10,12 @@
   <string name="error_field_required">Dieses Feld ist erforderlich</string>
   <string name="dialog_wait_create">Konto hinzufügen</string>
   <string name="dialog_wait_create_details">Bitte warten Sie während Ihr neues Konto eingerichtet wird...</string>
+  <string name="dialog_wait_update">Konto wird aktualisiert</string>
+  <string name="dialog_wait_update_details">Bitte warten sie während ihr Konto aktualisiert wird</string>
   <string name="dialog_warn_ip2ip_account_title">Ein leeres SIP-Konto erstellen?</string>
+  <string name="dialog_warn_ip2ip_account_message">Sie sind im Begriff ein SIP-Konto ohne gültigen Hostnamen anzulegen
+Es wird ihnen nur möglich sein direkte IP-Anrufe zu machen und empfangen
+Sie können ihr Konto später bearbeiten</string>
   <string-array name="accountType">
     <item>RING</item>
     <item>SIP</item>
@@ -23,12 +28,14 @@
   <string name="share_number">Nummer weitergeben</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Konto lôschen</string>
-  <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden. Falls sie sie noch nicht ausgeführt haben sollten sie in Betracht ziehen das Konto zu exportieren bevor sie es löschen.</string>
+  <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kein Konto registriert</string>
   <string name="normal_accounts_titles">Konten</string>
+  <string name="normal_devices_titles">Bekannte Geräte die mit diesem Ring Konto verknüpft sind</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allgemein</string>
+  <string name="account_preferences_devices_tab">Geräte</string>
   <string name="account_basic_category">Grundlegende Einstellungen</string>
   <string name="account_alias_label">Kontoname</string>
   <string name="account_hostname_label">Rechnername</string>
@@ -87,26 +94,49 @@
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Audio RTP Portbereich</string>
-  <!--Import/export-->
-  <string name="account_export">Export</string>
-  <string name="account_import_account">Ein Konto importieren</string>
-  <string name="account_export_title">Ein Konto exportieren</string>
-  <string name="account_import_title">Konten importieren</string>
-  <string name="account_import_explanation">Du kannst zuvor exportierte Konten wieder importieren.</string>
-  <string name="account_export_message">Speichere Kontoeinstellungen und Zugangsdaten, verschlüsselt mit Passwort</string>
-  <string name="account_export_new_password">Neues Passwort</string>
-  <string name="account_export_confirm_password">Passwort bestätigen</string>
-  <string name="account_import_message">Passwort eingeben um die Datei zu entschlüsseln</string>
-  <string name="account_import_decryption_password">Passwort zum Entschlüsseln</string>
-  <string name="import_dialog_title">Import</string>
-  <string name="import_export_wait">Bitte warten…</string>
-  <string name="export_dialog_title">Konto wird exportiert</string>
-  <string name="account_export_result">Konto wurde nach %1$s exportiert</string>
-  <string name="export_failed_dialog_title">Der Export ist fehlgeschlagen</string>
-  <string name="export_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Speichere Kontoeinstellungen und Zugangsdaten, verschlüsselt mit Passwort</string>
+  <string name="account_backup_new_password">Neues Passwort</string>
+  <string name="account_backup_confirm_password">Passwort bestätigen</string>
+  <string name="account_restore_message">Passwort eingeben um die Datei zu entschlüsseln</string>
+  <string name="account_restore_decryption_password">Passwort zum Entschlüsseln</string>
+  <string name="account_new_device">Neues Gerät hinzufügen</string>
+  <string name="account_new_device_message">Ring-Konto entsperren um mit neuem Gerät zu verbinden</string>
+  <string name="account_new_device_password">Passwort für das Hauptkonto eingeben</string>
+  <string name="restore_backup_wait">Bitte warten…</string>
+  <string name="backup_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
   <string name="error_password_char_count">Mindestens 6 Zeichen</string>
   <string name="error_passwords_not_equals">Die Passwörter stimmen nicht überein</string>
-  <string name="import_failed_dialog_title">Der Import ist fehlgeschlagen</string>
-  <string name="import_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
+  <string name="restore_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
+  <string name="account_export">Export</string>
+  <string name="export_account_wait_title">Bitte warten…</string>
+  <string name="export_account_wait_message">Neue Konto-Informationen veröffentlichen</string>
+  <string name="account_export_end_pin_title">PIN:</string>
+  <string name="account_export_end_pin_message">Benutzen sie diese PIN zusammen mit ihrem Passwort für ihr Hauptkonto um ihr neues Gerät mit ihrem Ring-Konto in den nächsten 10 Minuten zu verbinden</string>
+  <string name="account_export_end_decryption_title">Entschlüsselungsfehler</string>
+  <string name="account_export_end_decryption_message">Ihr Konto konnte mit dem angegebenen Passwort nicht entsperrt werden</string>
+  <string name="account_export_end_network_title">Netzwerkfehler</string>
+  <string name="account_export_end_network_message">Das Konto konnte nicht in das Netzwerk exportiert werden. Überprüfen sie ihre Verbindung.</string>
   <string name="account_export_end_error_title">Fehler</string>
+  <string name="account_export_end_error_message">Konto konnte nicht exportiert werden. Ein unbekannter Fehler ist aufgetreten.</string>
+  <string name="account_enter_password">Passwort eingeben</string>
+  <string name="account_share_body">Kontaktieren sie mich mit %1$s auf der verteilten Kommunikationsplatform Ring: http://ring.cx</string>
+  <string name="account_contact_me">Kontaktieren sie mich mit Ring!</string>
+  <string name="update_account">Konto aktualisieren</string>
+  <string name="account_migration">Ihr Ring-Konto kann nun zwischen all ihren Geräten geteilt werden.  Sie müssen nur ein Passwort angeben.</string>
+  <string name="ring_account">Ring-Konto</string>
+  <string name="account_migration_title_dialog">Konto-Migration</string>
+  <string name="account_migration_message_dialog">Damit sie auf mehreren Geräten verwendet werden können müssen ihren Konten aktualisert werden. Wollen sie die Konto-Verwaltung anzeigen, um die Operation durchzuführen.</string>
+  <string name="account_update_needed">Aktualisierung durchführen</string>
+  <string name="account_creation_file_too_big">Datei ist zu gross</string>
+  <string name="account_cannot_read">Kann %1$s nicht lesen</string>
+  <string name="account_creation_error">Fehler beim Erstellen des Kontos</string>
+  <string name="account_cannot_be_found_title">Kann Konto nicht finden</string>
+  <string name="account_cannot_be_found_message">Konto kann im Ring-Netzwerk nicht gefunden werden.\nStellen sie sicher das es von einem existierenden Konto in Ring exportiert wurde und das die angegebenen Zugansdaten korrekt sind.</string>
+  <string name="account_no_network_title">Verbindung mit dem Netzwerk nicht möglich</string>
+  <string name="account_no_network_message">Konto konnte nicht hinzugefügt werden, da Ring sich nicht mit dem verteilten Netzwerk verbinden konnte. Überprüfen sie die Verbindung ihres Gerätes.</string>
+  <string name="account_device_added_title">Geräte-Konto hinzugefügt</string>
+  <string name="account_device_added_message">Sie haben erfolgreich ihr Ring-Konto auf diesem Gerät erstellt.</string>
+  <string name="account_device_updated_title">Geräte-Konto aktualisiert</string>
+  <string name="account_wizard_title">Ring-Konto</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/ring-android/app/src/main/res/values-de/strings_call.xml
index 9951329..b3f4d59 100644
--- a/ring-android/app/src/main/res/values-de/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de/strings_call.xml
@@ -32,5 +32,13 @@
     <string name="call_human_state_hold">Halten</string>
     <string name="call_human_state_unhold">Halten aufheben</string>
     <string name="call_human_state_over">Über</string>
+    <string name="call_human_state_none">Kein</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktiv angefügt</string>
+    <string name="conference_human_state_active_detached">Aktiv getrennt</string>
+    <string name="conference_human_state_active_attached_rec">Aktiv angefügt aufnehmend</string>
+    <string name="conference_human_state_active_detached_rec">Aktiv getrennt aufnehmend</string>
     <string name="conference_human_state_hold">Halten</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Aufnehmend halten</string>
+    <string name="conference_human_state_default">Kein</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 6166568..2611ca1 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -88,6 +88,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string>
   <string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά  για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</string>
+  <string name="ringtone_error_title">Σφάλμα</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Η εφαρμογή Ring χρειάζεται να διαβάσει τις επαφές σας ώστε να ενεργοποιήσει αυτή την λειτουργία. Παρακαλώ δώστε την.</string>
   <!--Write call log permission-->
@@ -108,4 +109,5 @@
   <string name="add_call_contact_number_to_contacts">Προσθήκη %1$s ;</string>
   <!--MenuHeaderView-->
   <string name="unknown">Άγνωστοι</string>
+  <!--Share fragment-->
 </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 1fb4120..466197b 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
@@ -8,6 +8,7 @@
   <string name="action_create">Προσθήκη λογαριασμού</string>
   <string name="action_create_short">Εγγραφή</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Η ενέργεια αυτή δεν μπορεί να ανακληθεί.</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Λογαριασμοί</string>
   <!--Basic Details-->
@@ -33,8 +34,7 @@
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_rtp_port_range">Εύρος θυρών RTP ήχου</string>
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export">Εξαγωγή</string>
-  <string name="account_import_title">Εισαγωγή λογαριασμών</string>
   <string name="account_export_end_error_title">Σφάλμα</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index 3d5b328..9248d5e 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -87,6 +87,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permeso je kamerao</string>
   <string name="permission_dialog_camera_message">Video-konversacioj bezonas permeson je kamerao por funkcii. Bonvole pripensu permesi ĝin.</string>
+  <string name="ringtone_error_title">Eraro</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring bezonas la \"Legu kontaktojn\" permeson por ŝalti tiu ĉi funkcion. Bonvole permesu ĝin.</string>
   <!--Write call log permission-->
@@ -109,4 +110,5 @@
   <string name="prompt_new_password">Nova pasvorto</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nekonata</string>
+  <!--Share fragment-->
 </resources>
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 d84d370..c709367 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
@@ -27,12 +27,13 @@
   <string name="share_number">Kunhavi numeron</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Ĉu forigi konton ?</string>
-  <string name="account_delete_dialog_message">Tiu ĉi ago ne povos malfariĝi. Se vi ne faris ĝin jam, eble pripensu elporti vian konton antaŭ forigi ĝin.</string>
+  <string name="account_delete_dialog_message">Tiu ĉi ago ne povos malfariĝi.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Sen registrita konto</string>
   <string name="normal_accounts_titles">Kontoj</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Ĝenerala</string>
+  <string name="account_preferences_devices_tab">Aparatoj</string>
   <string name="account_basic_category">Bazaj Agordoj</string>
   <string name="account_alias_label">Nomo de konto</string>
   <string name="account_hostname_label">Nomo de gastiga komputilo</string>
@@ -90,26 +91,17 @@
   <string name="account_rtp_max_port">Maksimumo</string>
   <string name="account_rtp_min_port">Minimumo</string>
   <string name="account_rtp_port_range">Intervalo de Aŭdia RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Elporti</string>
-  <string name="account_import_account">Enporti konton</string>
-  <string name="account_export_title">Elporti konton</string>
-  <string name="account_import_title">Enporti kontojn</string>
-  <string name="account_import_explanation">Vi povas enporti elportitajn kontojn.</string>
-  <string name="account_export_message">Savi agordojn kaj ensalutilojn de konto, pasvorto ĉifrita.</string>
-  <string name="account_export_new_password">Nova pasvorto</string>
-  <string name="account_export_confirm_password">Konfirmu pasvorton</string>
-  <string name="account_import_message">Entajpu pasvorton por malĉifri la dosieron.</string>
-  <string name="account_import_decryption_password">Malĉifra pasvorto</string>
-  <string name="import_dialog_title">Enportanta</string>
-  <string name="import_export_wait">Bonvole atendu…</string>
-  <string name="export_dialog_title">Elportanta konton</string>
-  <string name="account_export_result">Konto elportita al %1$s</string>
-  <string name="export_failed_dialog_title">Elporto fiaskis</string>
-  <string name="export_failed_dialog_msg">Eraro okazis</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Savi agordojn kaj ensalutilojn de konto, pasvorto ĉifrita.</string>
+  <string name="account_backup_new_password">Nova pasvorto</string>
+  <string name="account_backup_confirm_password">Konfirmu pasvorton</string>
+  <string name="account_restore_message">Entajpu pasvorton por malĉifri la dosieron.</string>
+  <string name="account_restore_decryption_password">Malĉifra pasvorto</string>
+  <string name="restore_backup_wait">Bonvole atendu…</string>
+  <string name="backup_failed_dialog_msg">Eraro okazis</string>
   <string name="error_password_char_count">6 signoj minimume</string>
   <string name="error_passwords_not_equals">Pasvortoj ne kongruas</string>
-  <string name="import_failed_dialog_title">Enporto fiaskis</string>
-  <string name="import_failed_dialog_msg">Eraro okazis</string>
+  <string name="restore_failed_dialog_msg">Eraro okazis</string>
+  <string name="account_export">Elporti</string>
   <string name="account_export_end_error_title">Eraro</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 6fdf457..0953d16 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
+  <string name="ringtone_error_title">Error</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring necesita permiso para leer los contactos. Por favor, concede este permiso.</string>
   <!--Write call log permission-->
@@ -116,4 +117,5 @@
   <string name="prompt_new_password">Contraseña nueva</string>
   <!--MenuHeaderView-->
   <string name="unknown">Desconocido</string>
+  <!--Share fragment-->
 </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 c44e4b2..9b880cc 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
@@ -26,7 +26,7 @@
   <string name="share_number">Compartir número</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">¿Borrar cuenta?</string>
-  <string name="account_delete_dialog_message">Esta acción no puede deshacerse. Si no lo has hecho ya, deberías considerar exportar tu cuenta antes de borrarla.</string>
+  <string name="account_delete_dialog_message">Esta acción no puede deshacerse.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">No hay cuentas registradas</string>
   <string name="normal_accounts_titles">Cuentas</string>
@@ -90,26 +90,17 @@
   <string name="account_rtp_max_port">Máximo</string>
   <string name="account_rtp_min_port">Mínimo</string>
   <string name="account_rtp_port_range">Intervalo de puertos de audio RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Exportar</string>
-  <string name="account_import_account">Importar una cuenta</string>
-  <string name="account_export_title">Exportar una cuenta</string>
-  <string name="account_import_title">Importar cuentas</string>
-  <string name="account_import_explanation">Puedes importar cuentas exportadas previamente.</string>
-  <string name="account_export_message">Guardar configuración y credenciales de la cuenta, contraseña cifrada.</string>
-  <string name="account_export_new_password">Contraseña nueva</string>
-  <string name="account_export_confirm_password">Confirmar contraseña</string>
-  <string name="account_import_message">Introduce la contraseña para descifrar el archivo.</string>
-  <string name="account_import_decryption_password">Contraseña de descifrado</string>
-  <string name="import_dialog_title">Importando</string>
-  <string name="import_export_wait">Por favor, espera...</string>
-  <string name="export_dialog_title">Exportando cuenta</string>
-  <string name="account_export_result">Cuenta exportada a %1$s</string>
-  <string name="export_failed_dialog_title">Error de exportación</string>
-  <string name="export_failed_dialog_msg">Ha ocurrido un error</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Guardar configuración y credenciales de la cuenta, contraseña cifrada.</string>
+  <string name="account_backup_new_password">Contraseña nueva</string>
+  <string name="account_backup_confirm_password">Confirmar contraseña</string>
+  <string name="account_restore_message">Introduce la contraseña para descifrar el archivo.</string>
+  <string name="account_restore_decryption_password">Contraseña de descifrado</string>
+  <string name="restore_backup_wait">Por favor, espera...</string>
+  <string name="backup_failed_dialog_msg">Ha ocurrido un error</string>
   <string name="error_password_char_count">6 caracteres mínimo</string>
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
-  <string name="import_failed_dialog_title">Error de importación</string>
-  <string name="import_failed_dialog_msg">Ha ocurrido un error</string>
+  <string name="restore_failed_dialog_msg">Ha ocurrido un error</string>
+  <string name="account_export">Exportar</string>
   <string name="account_export_end_error_title">Error</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index feb5c5a..d03fcd1 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -79,6 +79,7 @@
   <string name="message_sending">در حال ارسال پیام…</string>
   <string name="time_just_now">هم‌اکنون</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">خطا</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -86,4 +87,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 76a4617..02bb100 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
@@ -76,7 +76,6 @@
   <string name="account_rtp_max_port">بیشینه</string>
   <string name="account_rtp_min_port">کمینه</string>
   <string name="account_rtp_port_range">دامنهٔ درگاه RTP صدا</string>
-  <!--Import/export-->
-  <string name="account_import_title">درون‌ریزی حساب‌ها</string>
+  <!--restore/backup-->
   <string name="account_export_end_error_title">خطا</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index db4d55c..270fe06 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera oikeudet</string>
   <string name="permission_dialog_camera_message">Videopuhelut vaativat toimiakseen kameran käyttöoikeudet.</string>
+  <string name="ringtone_error_title">Virhe</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring tarvitsee yhteystietojen lukuoikeudet tätä toimintoa varten.</string>
   <!--Write call log permission-->
@@ -116,4 +117,5 @@
   <string name="prompt_new_password">Uusi salasana</string>
   <!--MenuHeaderView-->
   <string name="unknown">Tuntematon</string>
+  <!--Share fragment-->
 </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 8318b9c..7eab7f2 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
@@ -20,7 +20,7 @@
   <string name="share_number">Jaa numero</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Poistetaanko tunnus?</string>
-  <string name="account_delete_dialog_message">Tätä toimintoa ei voi perua. Jos et ole vielä varmuuskopioinut tunnustasi niin tässä on hyvä paikka tehdä niin.</string>
+  <string name="account_delete_dialog_message">Tätä toimintoa ei voi perua.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ei rekistöröityjä tunnuksia</string>
   <string name="normal_accounts_titles">Tunnukset</string>
@@ -72,26 +72,17 @@
   <string name="account_rtp_max_port">Maksimi</string>
   <string name="account_rtp_min_port">Minimi</string>
   <string name="account_rtp_port_range">RTP porttiväli</string>
-  <!--Import/export-->
-  <string name="account_export">Vie</string>
-  <string name="account_import_account">Tuo tunnus</string>
-  <string name="account_export_title">Vie tunnus</string>
-  <string name="account_import_title">Tuo tunnuksia</string>
-  <string name="account_import_explanation">Voit tuoda aikaisemmin viemiäsi tunnuksia.</string>
-  <string name="account_export_message">Tallenna tunnuksen asetukset ja käyttäjäoikeudet, salasana salattuna.</string>
-  <string name="account_export_new_password">Uusi salasana</string>
-  <string name="account_export_confirm_password">Varmista salasana</string>
-  <string name="account_import_message">Syötä salasana purkaaksesi tiedoton salauksen.</string>
-  <string name="account_import_decryption_password">Salauksen purku salasana</string>
-  <string name="import_dialog_title">Tuonti</string>
-  <string name="import_export_wait">Odota hetki...</string>
-  <string name="export_dialog_title">Tunnuksen vienti</string>
-  <string name="account_export_result">Tunnus viety %1$s</string>
-  <string name="export_failed_dialog_title">Vienti epäonnistui</string>
-  <string name="export_failed_dialog_msg">Virhe tapahtui</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Tallenna tunnuksen asetukset ja käyttäjäoikeudet, salasana salattuna.</string>
+  <string name="account_backup_new_password">Uusi salasana</string>
+  <string name="account_backup_confirm_password">Varmista salasana</string>
+  <string name="account_restore_message">Syötä salasana purkaaksesi tiedoton salauksen.</string>
+  <string name="account_restore_decryption_password">Salauksen purku salasana</string>
+  <string name="restore_backup_wait">Odota hetki...</string>
+  <string name="backup_failed_dialog_msg">Virhe tapahtui</string>
   <string name="error_password_char_count">Vähintään 6 merkkiä</string>
   <string name="error_passwords_not_equals">Salasanat eivät täsmää</string>
-  <string name="import_failed_dialog_title">Tuonti epäonnistui</string>
-  <string name="import_failed_dialog_msg">Virhe tapahtui</string>
+  <string name="restore_failed_dialog_msg">Virhe tapahtui</string>
+  <string name="account_export">Vie</string>
   <string name="account_export_end_error_title">Virhe</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 0948882..707cc99 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -40,4 +40,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 3f75156..b8c96f8 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
@@ -14,5 +14,5 @@
   <!--SRTP Details-->
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
 </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 c10823b..d4d5a15 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permission d\'accès au caméra</string>
   <string name="permission_dialog_camera_message">Les conversation vidéo nécessitent la permission d\'utiliser l\'objectif. Merci de l\'autoriser.</string>
+  <string name="ringtone_error_title">Erreur</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring a besoin d\'accéder en lecture à votre liste de contact. SVP autorisez-le.</string>
   <!--Write call log permission-->
@@ -116,4 +117,5 @@
   <string name="prompt_new_password">Nouveau mot de passe</string>
   <!--MenuHeaderView-->
   <string name="unknown">Inconnu</string>
+  <!--Share fragment-->
 </resources>
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 60d3fe5..2da9128 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
@@ -26,7 +26,7 @@
   <string name="share_number">Partager votre identifiant Ring</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Supprimer le compte ?</string>
-  <string name="account_delete_dialog_message">Cette action est irréversible. Si vous ne l\'avez pas déjà fait, nous vous sugérons d\'exporter votre compte avant de poursuivre.</string>
+  <string name="account_delete_dialog_message">Cette action est irréversible.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Aucun compte enregistré</string>
   <string name="normal_accounts_titles">Comptes</string>
@@ -90,26 +90,17 @@
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Plage de port RTP pour l\'audio</string>
-  <!--Import/export-->
-  <string name="account_export">Exporter</string>
-  <string name="account_import_account">Importer un compte</string>
-  <string name="account_export_title">Exporter un compte</string>
-  <string name="account_import_title">Importer compte</string>
-  <string name="account_import_explanation">Vous pouvez importer des comptes que vous avez précédemment exportés.</string>
-  <string name="account_export_message">Enregistre les paramètres du compte et les identifiants, en chiffrant le mot de passe.</string>
-  <string name="account_export_new_password">Nouveau mot de passe</string>
-  <string name="account_export_confirm_password">Confirmer le mot de passe</string>
-  <string name="account_import_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
-  <string name="account_import_decryption_password">Mot de passe en clair</string>
-  <string name="import_dialog_title">Importer</string>
-  <string name="import_export_wait">Veuillez patienter</string>
-  <string name="export_dialog_title">Compte exporté</string>
-  <string name="account_export_result">Compte exporté vers %1$s</string>
-  <string name="export_failed_dialog_title">Échec d\'exportation</string>
-  <string name="export_failed_dialog_msg">Une erreur s\'est produite</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Enregistre les paramètres du compte et les identifiants, en chiffrant le mot de passe.</string>
+  <string name="account_backup_new_password">Nouveau mot de passe</string>
+  <string name="account_backup_confirm_password">Confirmer le mot de passe</string>
+  <string name="account_restore_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
+  <string name="account_restore_decryption_password">Mot de passe en clair</string>
+  <string name="restore_backup_wait">Veuillez patienter</string>
+  <string name="backup_failed_dialog_msg">Une erreur s\'est produite</string>
   <string name="error_password_char_count">6 caractères maximales</string>
   <string name="error_passwords_not_equals">Mot de passe erronné</string>
-  <string name="import_failed_dialog_title">Échec d\'importation</string>
-  <string name="import_failed_dialog_msg">Une erreur s\'est produite</string>
+  <string name="restore_failed_dialog_msg">Une erreur s\'est produite</string>
+  <string name="account_export">Exporter</string>
   <string name="account_export_end_error_title">Erreur</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index fce9392..29141b0 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -42,6 +42,7 @@
   <!--Text messages-->
   <string name="send_message">שלח הודעה</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">שגיאה</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -50,4 +51,5 @@
   <string name="conversation_action_copy_peer_number">העתק מספר</string>
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 fcad40d..6722eb1 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
@@ -60,6 +60,6 @@
   <string name="account_tls_verify_client_label">אמת לקוח</string>
   <string name="account_rtp_max_port">מרבי</string>
   <string name="account_rtp_min_port">נומינלי</string>
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export_end_error_title">שגיאה</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 1222eb6..170c37c 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -89,6 +89,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Dozvola kamere</string>
   <string name="permission_dialog_camera_message">Video pozivi zahtjevaju dozvolu korištenja kamere. Molimo dozvolite aplikaciji korištenje kamere.</string>
+  <string name="ringtone_error_title">Greška</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -109,4 +110,5 @@
   <string name="prompt_new_password">Nova lozinka</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nepoznato</string>
+  <!--Share fragment-->
 </resources>
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 aaa137b..a91a9a3 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
@@ -21,6 +21,7 @@
   <string name="share_number">Dijeli broj</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Izbrisati račun?</string>
+  <string name="account_delete_dialog_message"> Ova se radnja ne može poništiti.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nema registriranih računa</string>
   <string name="normal_accounts_titles">Računi</string>
@@ -69,25 +70,16 @@
   <string name="account_tls_verify_client_label">Provjeri klijent</string>
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
-  <!--Import/export-->
-  <string name="account_export">Izvezi</string>
-  <string name="account_import_account">Uvezi račun</string>
-  <string name="account_export_title">Izvezi račun</string>
-  <string name="account_import_title">Uvezi račune</string>
-  <string name="account_import_explanation">Možete uvesti prethodno izvezene račune.</string>
-  <string name="account_export_new_password">Nova lozinka</string>
-  <string name="account_export_confirm_password">Potvrdi lozinku</string>
-  <string name="account_import_message">Unesite lozinku za dešifriranje datoteke.</string>
-  <string name="account_import_decryption_password">Lozinka za dešifriranje</string>
-  <string name="import_dialog_title">Uvozim</string>
-  <string name="import_export_wait">Molim pričekajte...</string>
-  <string name="export_dialog_title">izvozim račun</string>
-  <string name="account_export_result">Račun izvezen u %1$s</string>
-  <string name="export_failed_dialog_title">Neuspjeli izvoz</string>
-  <string name="export_failed_dialog_msg">Došlo je do greške</string>
+  <!--restore/backup-->
+  <string name="account_backup_new_password">Nova lozinka</string>
+  <string name="account_backup_confirm_password">Potvrdi lozinku</string>
+  <string name="account_restore_message">Unesite lozinku za dešifriranje datoteke.</string>
+  <string name="account_restore_decryption_password">Lozinka za dešifriranje</string>
+  <string name="restore_backup_wait">Molim pričekajte...</string>
+  <string name="backup_failed_dialog_msg">Došlo je do greške</string>
   <string name="error_password_char_count">6 znakova minimum</string>
   <string name="error_passwords_not_equals">Lozinke se ne podudaraju</string>
-  <string name="import_failed_dialog_title">Neuspjeli uvoz</string>
-  <string name="import_failed_dialog_msg">Došlo je do greške</string>
+  <string name="restore_failed_dialog_msg">Došlo je do greške</string>
+  <string name="account_export">Izvezi</string>
   <string name="account_export_end_error_title">Greška</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 45bf3c9..f256212 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -104,4 +104,5 @@
   <!--Contacts-->
   <!--MenuHeaderView-->
   <string name="unknown">Ismeretlen</string>
+  <!--Share fragment-->
 </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 ce37c95..86ff063 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
@@ -30,6 +30,6 @@
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_rtp_port_range">Hang RTP port korlát</string>
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export">Exportálás</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index b1d1cd7..0b0731a 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -17,6 +17,7 @@
   <string name="me">Saya</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">Eror</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -25,4 +26,5 @@
   <!--Contacts-->
   <!--MenuHeaderView-->
   <string name="unknown">Tidak diketahui</string>
+  <!--Share fragment-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index b8dd5aa..17808c2 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -64,4 +64,5 @@
   <string name="conversation_action_select_peer_number">Seleziona un numero</string>
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </resources>
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 b3bd484..049cff9 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
@@ -27,5 +27,5 @@
   <string name="account_preferences_security_tab">Sicurezza</string>
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index b982065..8de542d 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Attivare videocamera</string>
   <string name="permission_dialog_camera_message">La videochiamata richiede l\'attivazione della videocamera. Concedi il permesso.</string>
+  <string name="ringtone_error_title">Errore</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring richiede permesso di \"Lettura dei contatti\" per abilitare questa funzione. Concedi il permesso.</string>
   <!--Write call log permission-->
@@ -116,4 +117,5 @@
   <string name="prompt_new_password">Nuovo password</string>
   <!--MenuHeaderView-->
   <string name="unknown">Sconosciuto</string>
+  <!--Share fragment-->
 </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 abb55a8..14ef700 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
@@ -22,7 +22,7 @@
   <string name="share_number">Condividere il numero</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Rimuovere l\'account?</string>
-  <string name="account_delete_dialog_message">Quest\'azione non può essere annullata. Se non è stato ancora fatto, si dovrebbe considerar fare un export del account prima di rimuoverlo.</string>
+  <string name="account_delete_dialog_message">Questa azione è irreversibilie.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nessun account registrato</string>
   <string name="normal_accounts_titles">Accounts</string>
@@ -86,26 +86,17 @@
   <string name="account_rtp_max_port">Massimo</string>
   <string name="account_rtp_min_port">Minimo</string>
   <string name="account_rtp_port_range">Intervallo porti audio RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Esportare</string>
-  <string name="account_import_account">Importare un account</string>
-  <string name="account_export_title">Esportare un account</string>
-  <string name="account_import_title">Importare più account</string>
-  <string name="account_import_explanation">È possibile importare degli account che erano stati esportati.</string>
-  <string name="account_export_message">Salvare le impostazioni dell\'account et gli identificanti con la password cifrata.</string>
-  <string name="account_export_new_password">Nuovo password</string>
-  <string name="account_export_confirm_password">Confermare password</string>
-  <string name="account_import_message">Digitare la password per decifrare il file.</string>
-  <string name="account_import_decryption_password">Password per decifrare</string>
-  <string name="import_dialog_title">Importazione in corso</string>
-  <string name="import_export_wait">Aspettare</string>
-  <string name="export_dialog_title">Esportazione account in corso</string>
-  <string name="account_export_result">Account esportato in %1$s</string>
-  <string name="export_failed_dialog_title">L\'esportazione è fallita</string>
-  <string name="export_failed_dialog_msg">C\'è stato un errore</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Salvare le impostazioni dell\'account et gli identificanti con la password cifrata.</string>
+  <string name="account_backup_new_password">Nuovo password</string>
+  <string name="account_backup_confirm_password">Confermare password</string>
+  <string name="account_restore_message">Digitare la password per decifrare il file.</string>
+  <string name="account_restore_decryption_password">Password per decifrare</string>
+  <string name="restore_backup_wait">Aspettare</string>
+  <string name="backup_failed_dialog_msg">C\'è stato un errore</string>
   <string name="error_password_char_count">6 caratteri minimo</string>
   <string name="error_passwords_not_equals">Le password no corrispondono</string>
-  <string name="import_failed_dialog_title">L\'importazione è fallita</string>
-  <string name="import_failed_dialog_msg">C\'è stato un errore</string>
+  <string name="restore_failed_dialog_msg">C\'è stato un errore</string>
+  <string name="account_export">Esportare</string>
   <string name="account_export_end_error_title">Errore</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 43c30c7..3786265 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -71,6 +71,7 @@
   <string name="message_sending">Siunčiama žinutė...</string>
   <string name="time_just_now">Ką tik</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">Klaida</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -90,4 +91,5 @@
   <string name="prompt_new_password">Naujas slaptažodis</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nežinomas</string>
+  <!--Share fragment-->
 </resources>
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 116175b..37da884 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
@@ -24,7 +24,7 @@
   <string name="create_sip_account">Pridėti</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Ištrinti paskyrą ?</string>
-  <string name="account_delete_dialog_message">Šio veiksmo negalima bus atšaukti. Jeigu dar to nepadarėte, prieš ištrinant paskyrą, turėtumėte pagalvoti apie jos eksportavimą.</string>
+  <string name="account_delete_dialog_message">Šio veiksmo negalima bus atšaukti.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nėra užregistruotų paskyrų</string>
   <string name="normal_accounts_titles">Paskyros</string>
@@ -87,26 +87,17 @@
   <string name="account_rtp_max_port">Didžiausias</string>
   <string name="account_rtp_min_port">Mažiausias</string>
   <string name="account_rtp_port_range">Garso RTP prievadų rėžis</string>
-  <!--Import/export-->
-  <string name="account_export">Eksportuoti</string>
-  <string name="account_import_account">Importuoti paskyrą</string>
-  <string name="account_export_title">Eksportuoti paskyrą</string>
-  <string name="account_import_title">Importuoti paskyras</string>
-  <string name="account_import_explanation">Galite importuoti anksčiau eksportuotas paskyras.</string>
-  <string name="account_export_message">Įrašykite paskyros nustatymus ir prisijungimo duomenis, užšifruotus slaptažodžiu.</string>
-  <string name="account_export_new_password">Naujas slaptažodis</string>
-  <string name="account_export_confirm_password">Patvirtinkite slaptažodį</string>
-  <string name="account_import_message">Įrašykite slaptažodį, kad iššifruotumėte failą.</string>
-  <string name="account_import_decryption_password">Iššifravimo slaptažodis</string>
-  <string name="import_dialog_title">Importuojama</string>
-  <string name="import_export_wait">Prašome palaukti...</string>
-  <string name="export_dialog_title">Eksportuojama paskyra</string>
-  <string name="account_export_result">Paskyra eksportuota į %1$s</string>
-  <string name="export_failed_dialog_title">Eksportavimas nepavyko</string>
-  <string name="export_failed_dialog_msg">Įvyko klaida</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Įrašykite paskyros nustatymus ir prisijungimo duomenis, užšifruotus slaptažodžiu.</string>
+  <string name="account_backup_new_password">Naujas slaptažodis</string>
+  <string name="account_backup_confirm_password">Patvirtinkite slaptažodį</string>
+  <string name="account_restore_message">Įrašykite slaptažodį, kad iššifruotumėte failą.</string>
+  <string name="account_restore_decryption_password">Iššifravimo slaptažodis</string>
+  <string name="restore_backup_wait">Prašome palaukti...</string>
+  <string name="backup_failed_dialog_msg">Įvyko klaida</string>
   <string name="error_password_char_count">Mažiausiai 6 simboliai</string>
   <string name="error_passwords_not_equals">Slaptažodžiai nesutampa</string>
-  <string name="import_failed_dialog_title">Importavimas nepavyko</string>
-  <string name="import_failed_dialog_msg">Įvyko klaida</string>
+  <string name="restore_failed_dialog_msg">Įvyko klaida</string>
+  <string name="account_export">Eksportuoti</string>
   <string name="account_export_end_error_title">Klaida</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index e938f7a..a2bcffa 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -91,6 +91,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamerarettigheter</string>
   <string name="permission_dialog_camera_message">Videosamtaler krever tilgang til kameraet for å virke.  Vurder å aktivere det.</string>
+  <string name="ringtone_error_title">Feil</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring trenger tillatelsen \"Lese kontakter\" for å aktivere denne egenskapet.  Vær så snill å tillat dette.</string>
   <!--Write call log permission-->
@@ -110,4 +111,5 @@
   <string name="prompt_new_password">Nytt passord</string>
   <!--MenuHeaderView-->
   <string name="unknown">Ukjent</string>
+  <!--Share fragment-->
 </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 6088abf..c58278e 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
@@ -26,7 +26,7 @@
   <string name="share_number">Del nummer</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Slett konto?</string>
-  <string name="account_delete_dialog_message">Denne handlingen kan ikke gjøres om.  Hvis du ikke allerede har gjort det, så bør du vurdere å eksportere kontoen din før du sletter den.</string>
+  <string name="account_delete_dialog_message">Denne handlingen kan ikke gjøres om.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registrert</string>
   <string name="normal_accounts_titles">Kontoer</string>
@@ -87,25 +87,16 @@
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">RTP-portintervall for tale</string>
-  <!--Import/export-->
-  <string name="account_export">Eksporter</string>
-  <string name="account_import_account">Importer en konto</string>
-  <string name="account_export_title">Eksporter en konto</string>
-  <string name="account_import_title">Importer kontoer</string>
-  <string name="account_import_explanation">Du kan importere kontoer du tidligere har eksportert</string>
-  <string name="account_export_new_password">Nytt passord</string>
-  <string name="account_export_confirm_password">Bekreft passord</string>
-  <string name="account_import_message">Skriv inn passord for å dekryptere filen.</string>
-  <string name="account_import_decryption_password">Dekrypteringspassord</string>
-  <string name="import_dialog_title">Importerer</string>
-  <string name="import_export_wait">Vennligst vent...</string>
-  <string name="export_dialog_title">Eksporterer konto</string>
-  <string name="account_export_result">Konto eksportert til %1$s</string>
-  <string name="export_failed_dialog_title">Eksport feilet</string>
-  <string name="export_failed_dialog_msg">Det skjedde en feil</string>
+  <!--restore/backup-->
+  <string name="account_backup_new_password">Nytt passord</string>
+  <string name="account_backup_confirm_password">Bekreft passord</string>
+  <string name="account_restore_message">Skriv inn passord for å dekryptere filen.</string>
+  <string name="account_restore_decryption_password">Dekrypteringspassord</string>
+  <string name="restore_backup_wait">Vennligst vent...</string>
+  <string name="backup_failed_dialog_msg">Det skjedde en feil</string>
   <string name="error_password_char_count">minimum 6 tegn</string>
   <string name="error_passwords_not_equals">Passordene stemmer ikke</string>
-  <string name="import_failed_dialog_title">Importen feilet</string>
-  <string name="import_failed_dialog_msg">Det skjedde en feil</string>
+  <string name="restore_failed_dialog_msg">Det skjedde en feil</string>
+  <string name="account_export">Eksporter</string>
   <string name="account_export_end_error_title">Feil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 3e1bb97..1a60eee 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -53,4 +53,5 @@
   <string name="conversation_action_select_peer_number">Selecteer een nummer</string>
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 c083a6f..62dc70d 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
@@ -11,6 +11,7 @@
   <string name="share_number">Telefoonnummer delen</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Account verwijderen?</string>
+  <string name="account_delete_dialog_message">Deze actie kan niet ongedaan worden</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Accounts</string>
   <!--Basic Details-->
@@ -31,5 +32,5 @@
   <string name="account_preferences_security_tab">Beveiliging</string>
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
 </resources>
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 72709d5..78990a6 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="section_licence">Licentie</string>
-  <string name="sponsor_section">Ring is een vrije software ontwikkelend en ondersteund door</string>
+  <string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
   <string name="copyright_section">Auteursrecht</string>
   <string name="contribute_section">Bijdragen</string>
   <string name="version_section">Versie</string>
-  <string name="no_email_app_installed">Geen e-mailapplicatie gevonden, installeer er één om ons een rapport te kunnen sturen</string>
+  <string name="no_email_app_installed">Geen e-mailapplicatie gevonden, installeer er een om ons een rapport te kunnen sturen</string>
   <string name="email_chooser_title">E-mail versturen met...</string>
   <!--RingActivity-->
   <string name="title_section0">Kiezen</string>
@@ -24,6 +24,7 @@
   <string name="menu_item_home">Thuis</string>
   <string name="menu_item_accounts">Accounts beheren</string>
   <string name="menu_item_settings">Instellingen</string>
+  <string name="menu_item_share">Deel mijn contact</string>
   <string name="menu_item_about">Over Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_action_call">Oproep</string>
@@ -40,7 +41,7 @@
     <item quantity="one">%d gesprek</item>
     <item quantity="other">%d gesprekken</item>
   </plurals>
-  <string name="home_transfering">Versturen van %1$s naar %1$s</string>
+  <string name="home_transfering">%1$s wordt verstuurd naar %1$s</string>
   <string name="home_transfer_complet">Overdracht compleet</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">Geen contacten gevonden</string>
@@ -63,7 +64,7 @@
   <string name="notif_current_call">Huidige oproep</string>
   <!--Call Fragment-->
   <string name="me">Ik</string>
-  <string name="you_txt_prefix">U:</string>
+  <string name="you_txt_prefix">Jij:</string>
   <string name="action_call_attended_transfer">Bijgewoonde overdracht</string>
   <string name="action_call_conference">Vergadering</string>
   <string name="action_call_hangup">Ophangen</string>
@@ -89,17 +90,20 @@
   <string name="send_message">Bericht versturen</string>
   <string name="message_sending">Bericht wordt verstuurd...</string>
   <string name="time_just_now">Zojuist</string>
-  <string name="permission_read_denied">De applicatie heeft geen machtiging om uw opslag te lezen, deze kan daardoor niet correct functioneren. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
-  <string name="permission_write_denied">De applicatie heeft geen machtiging om naar uw opslag te schrijven, deze kan daardoor niet correct functioneren. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_read_denied">De applicatie heeft geen machtiging om je opslag te lezen en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging alsnog toe te kennen</string>
+  <string name="permission_write_denied">De applicatie heeft geen machtiging om naar je opslag te schrijven en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging alsnog toe te kennen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
-  <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
+  <string name="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$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring vereist de \"Contacten\"-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Ring vereist de \"Oproepgeschiedenis\"-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">Scan de QR-code van het toe te voegen account.</string>
+  <string name="scan_qr_account_message">Scan de QR-code van de toe te voegen account.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
   <string name="clear_history_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string>
@@ -114,6 +118,17 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s toevoegen?</string>
   <string name="prompt_new_password">Nieuw wachtwoord</string>
+  <string name="prompt_new_password_repeat">Herhaal nieuw wachtwoord</string>
+  <string name="account_device_updated_message">Je Ring-account is met succes bijgewerkt.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mijn profiel</string>
+  <string name="profile_message_warning">Dit wordt gedeeld met je contacten</string>
+  <string name="open_the_gallery">Galerij openen</string>
+  <string name="take_a_photo">Foto nemen</string>
+  <string name="unknowm_if_empty">Onbekend wanneer leeg</string>
   <string name="unknown">Onbekend</string>
+  <!--Share fragment-->
+  <string name="share_label">Tik op de Ring-ID om te delen</string>
+  <string name="share_message">Scan deze QR-code met de ingebouwde scanner van de Ring-toepassing die met je wil communiceren.</string>
+  <string name="share_your_account_information">Deel mijn contactinformatie</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index cdd652c..23f3c76 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -7,31 +7,35 @@
   <string name="prompt_password">Wachtwoord</string>
   <string name="action_create">Account toevoegen</string>
   <string name="action_create_short">Registreren</string>
-  <string name="error_field_required">Verplicht veld</string>
+  <string name="error_field_required">Dit veld is verplicht</string>
   <string name="dialog_wait_create">Account wordt toegevoegd</string>
-  <string name="dialog_wait_create_details">Uw nieuwe account wordt toegevoegd, even geduld...</string>
+  <string name="dialog_wait_create_details">Je nieuwe account wordt toegevoegd, even geduld...</string>
+  <string name="dialog_wait_update">Account wordt bijgewerkt</string>
+  <string name="dialog_wait_update_details">Je account wordt bijgewerkt, even geduld...</string>
   <string name="dialog_warn_ip2ip_account_title">Lege SIP-account aanmaken?</string>
-  <string name="dialog_warn_ip2ip_account_message">U staat op het punt een SIP-account zonder geldige hostnaam toe te voegen.
-U zal er enkel directe IP-oproepen mee kunnen maken en ontvangen.
-U kan uw account later bewerken</string>
+  <string name="dialog_warn_ip2ip_account_message">Je staat op het punt een SIP-account zonder geldige hostnaam toe te voegen.
+Je zal er enkel directe IP-oproepen mee kunnen maken en ontvangen.
+Je kan je account later bewerken</string>
   <string-array name="accountType">
     <item>RING</item>
     <item>SIP</item>
   </string-array>
   <string name="help_ring_title">Een Ring-account aanmaken</string>
-  <string name="help_ring">Een Ring-account stelt u in staat andere mensen veilig te bereiken in peer to peer middels een volledig gedistribueerd netwerk.</string>
-  <string name="help_sip_title">Uw SIP-account toevoegen</string>
-  <string name="help_sip">Een bestaand SIP-account configureren</string>
+  <string name="help_ring">Een Ring-account stelt je in staat andere mensen veilig te bereiken in peer-to-peer middels een volledig gedistribueerd netwerk.</string>
+  <string name="help_sip_title">Je SIP-account toevoegen</string>
+  <string name="help_sip">Een bestaande SIP-account configureren</string>
   <string name="create_sip_account">Toevoegen</string>
   <string name="share_number">Nummer delen</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Account verwijderen?</string>
-  <string name="account_delete_dialog_message">Deze handeling kan niet ongedaan gemaakt worden. In het geval u uw account nog niet geëxporteerd heeft, raden wij u aan dat eerst te doen. </string>
+  <string name="account_delete_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Geen account geregistreerd</string>
   <string name="normal_accounts_titles">Accounts</string>
+  <string name="normal_devices_titles">Bekende apparaten gekoppeld aan deze Ring-account</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
+  <string name="account_preferences_devices_tab">Apparaten</string>
   <string name="account_basic_category">Basisinstellingen</string>
   <string name="account_alias_label">Accountnaam</string>
   <string name="account_hostname_label">Hostnaam</string>
@@ -58,7 +62,7 @@
   <string name="account_local_interface_label">Lokale interface</string>
   <string name="account_local_port_label">Lokale poort</string>
   <string name="account_stun_enable_label">Stun gebruiken</string>
-  <string name="account_stun_server_label">Stun-server</string>
+  <string name="account_stun_server_label">Stunserver</string>
   <string name="account_turn_enable_label">TURN gebruiken</string>
   <string name="account_turn_server_label">TURN-server</string>
   <string name="account_turn_username_label">TURN-gebruikersnaam</string>
@@ -89,27 +93,50 @@
   <string name="account_tls_negotiation_timeout_sec">Tijdslimiet onderhandeling (sec)</string>
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
-  <string name="account_rtp_port_range">Audio RTP poortenreeks</string>
-  <!--Import/export-->
-  <string name="account_export">Exporteren</string>
-  <string name="account_import_account">Account importeren</string>
-  <string name="account_export_title">Account exporteren</string>
-  <string name="account_import_title">Accounts importeren</string>
-  <string name="account_import_explanation">U kunt voorheen geëxporteerde accounts importeren.</string>
-  <string name="account_export_message">Accountinstellingen, legitimatie en wachtwoord versleuteld opslaan.</string>
-  <string name="account_export_new_password">Nieuw wachtwoord</string>
-  <string name="account_export_confirm_password">Wachtwoord bevestigen</string>
-  <string name="account_import_message">Wachtwoord ingeven om bestand te ontsleutelen</string>
-  <string name="account_import_decryption_password">Ontsleutelingswachtwoord</string>
-  <string name="import_dialog_title">Importeren</string>
-  <string name="import_export_wait">Even geduld...</string>
-  <string name="export_dialog_title">Account exporteren</string>
-  <string name="account_export_result">Account geëxporteerd naar %1$s</string>
-  <string name="export_failed_dialog_title">Exporteren mislukt</string>
-  <string name="export_failed_dialog_msg">Er is een fout opgetreden</string>
-  <string name="error_password_char_count">Minimaal 6 karakters</string>
+  <string name="account_rtp_port_range">Audio RTP-poortenreeks</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Accountinstellingen, legitimatie en wachtwoord versleuteld opslaan.</string>
+  <string name="account_backup_new_password">Nieuw wachtwoord</string>
+  <string name="account_backup_confirm_password">Wachtwoord bevestigen</string>
+  <string name="account_restore_message">Voer wachtwoord in om het bestand te ontsleutelen.</string>
+  <string name="account_restore_decryption_password">Ontsleutelingswachtwoord</string>
+  <string name="account_new_device">Nieuw apparaat toevoegen</string>
+  <string name="account_new_device_message">Ontgrendel Ring-account om een nieuw apparaat te koppelen.</string>
+  <string name="account_new_device_password">Voer hoofdwachtwoord van account in</string>
+  <string name="restore_backup_wait">Even geduld...</string>
+  <string name="backup_failed_dialog_msg">Er is een fout opgetreden</string>
+  <string name="error_password_char_count">Minimaal 6 tekens</string>
   <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
-  <string name="import_failed_dialog_title">Importeren mislukt</string>
-  <string name="import_failed_dialog_msg">Er is een fout opgetreden</string>
+  <string name="restore_failed_dialog_msg">Er is een fout opgetreden</string>
+  <string name="account_export">Exporteren</string>
+  <string name="export_account_wait_title">Even geduld...</string>
+  <string name="export_account_wait_message">Nieuwe accountinformatie wordt gepubliceerd</string>
+  <string name="account_export_end_pin_title">PIN:</string>
+  <string name="account_export_end_pin_message">Je kan deze PIN samen met het hoofdwachtwoord van je account gedurende 10 minuten gebruiken om een nieuw apparaat aan je Ring-account te koppelen.</string>
+  <string name="account_export_end_decryption_title">Ontsleutelfout</string>
+  <string name="account_export_end_decryption_message">Kon je account niet ontgrendelen met het opgegeven wachtwoord.</string>
+  <string name="account_export_end_network_title">Netwerkfout</string>
+  <string name="account_export_end_network_message">Kon account niet exporteren over het netwerk. Controleer je netwerkverbinding.</string>
   <string name="account_export_end_error_title">Fout</string>
+  <string name="account_export_end_error_message">Kon account niet exporteren. Er is een onbekende fout opgetreden.</string>
+  <string name="account_enter_password">Voer wachtwoord in</string>
+  <string name="account_share_body">Contacteer mij met %1$s op Ring, het gedistribueerde communicatieplatform: http://ring.cx</string>
+  <string name="account_contact_me">Contacteer mij op Ring!</string>
+  <string name="update_account">Account bijwerken</string>
+  <string name="account_migration">Je Ring-account kan nu gedeeld worden tussen al je apparaten. Je hoeft enkel een wachtwoord op te geven.</string>
+  <string name="ring_account">Ring-account</string>
+  <string name="account_migration_title_dialog">Accountmigratie</string>
+  <string name="account_migration_message_dialog">Om je accounts op meerdere apparaten te gebruiken moeten ze bijgewerkt worden. Wil je naar het accountbeheerscherm gaan om deze handeling uit te voeren?</string>
+  <string name="account_update_needed">Update vereist</string>
+  <string name="account_creation_file_too_big">Bestand is te groot</string>
+  <string name="account_cannot_read">Kan %1$s niet lezen</string>
+  <string name="account_creation_error">Fout bij aanmaken van account</string>
+  <string name="account_cannot_be_found_title">Account kan niet gevonden worden</string>
+  <string name="account_cannot_be_found_message">Account kon niet gevonden worden op het Ring-netwerk.\nControleer of de account geëxporteerd is van een bestaand apparaat en dat de opgegeven gebruikersreferenties correct zijn.</string>
+  <string name="account_no_network_title">Kan geen verbinding maken met het netwerk</string>
+  <string name="account_no_network_message">Kon de account niet toevoegen omdat Ring geen verbinding kon maken met het gedistribueerde netwerk. Controleer de netwerkverbinding van je apparaat.</string>
+  <string name="account_device_added_title">Accountapparaat toegevoegd</string>
+  <string name="account_device_added_message">Je Ring-account is met succes op dit apparaat ingesteld.</string>
+  <string name="account_device_updated_title">Accountapparaat bijgewerkt</string>
+  <string name="account_wizard_title">Ring-account</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 1d05491..3fb82ea 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -31,4 +31,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 0d01d6c..58d13b2 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -26,4 +26,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 2ea4248..105f66f 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -95,6 +95,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
   <string name="permission_dialog_camera_message">Wideorozmowa wymaga przyznania uprawnień dla aparatu. Proszę rozważyć odblokowanie jej.</string>
+  <string name="ringtone_error_title">Błąd</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring potrzebuje pozwolenia \"Kontakty\" żeby odblokować tą funkcję. Proszę udzielić go.</string>
   <!--Write call log permission-->
@@ -117,4 +118,5 @@
   <string name="prompt_new_password">Nowe hasło</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nieznane</string>
+  <!--Share fragment-->
 </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 ed1a3e3..44974ae 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
@@ -26,7 +26,7 @@
   <string name="share_number">Podziel się numerem</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Usuń konto ?</string>
-  <string name="account_delete_dialog_message">Ta akcja nie może być cofnięta. Jeśli tego jeszcze nie zrobiłeś, powinieneś rozważyć eksportowanie konta, zanim je usuniesz.</string>
+  <string name="account_delete_dialog_message">Tego działania nie można cofnąć.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nie masz zarejestrowanego konta</string>
   <string name="normal_accounts_titles">Konta</string>
@@ -90,26 +90,17 @@
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Zakres Portów Audio RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Wyeksportuj</string>
-  <string name="account_import_account">Importuj konto</string>
-  <string name="account_export_title">Wyeksportuj konto</string>
-  <string name="account_import_title">Importuj konta</string>
-  <string name="account_import_explanation">Możesz importować poprzednio wyeksportowane konta.</string>
-  <string name="account_export_message">Zapisz ustawienia konta i detale, oraz szyfrowane hasło.</string>
-  <string name="account_export_new_password">Nowe hasło</string>
-  <string name="account_export_confirm_password">Potwierdź hasło</string>
-  <string name="account_import_message">Wprowadź hasło, aby odszyfrować plik.</string>
-  <string name="account_import_decryption_password">Hasło rozszyfrowania</string>
-  <string name="import_dialog_title">Importowanie</string>
-  <string name="import_export_wait">Proszę czekać…</string>
-  <string name="export_dialog_title">Eksportuję konto</string>
-  <string name="account_export_result">Konto zostało wyeksportowane do %1$s</string>
-  <string name="export_failed_dialog_title">Błąd w eksportowaniu</string>
-  <string name="export_failed_dialog_msg">Wystąpił błąd</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Zapisz ustawienia konta i detale, oraz szyfrowane hasło.</string>
+  <string name="account_backup_new_password">Nowe hasło</string>
+  <string name="account_backup_confirm_password">Potwierdź hasło</string>
+  <string name="account_restore_message">Wprowadź hasło, aby odszyfrować plik.</string>
+  <string name="account_restore_decryption_password">Hasło rozszyfrowania</string>
+  <string name="restore_backup_wait">Proszę czekać…</string>
+  <string name="backup_failed_dialog_msg">Wystąpił błąd</string>
   <string name="error_password_char_count">minimum 6 znaków</string>
   <string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
-  <string name="import_failed_dialog_title">Błąd w importowaniu</string>
-  <string name="import_failed_dialog_msg">Wystąpił błąd</string>
+  <string name="restore_failed_dialog_msg">Wystąpił błąd</string>
+  <string name="account_export">Wyeksportuj</string>
   <string name="account_export_end_error_title">Błąd</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 1f44978..f73b886 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permissão de câmera</string>
   <string name="permission_dialog_camera_message">Conversas de vídeo requerem permissão para acesso à câmera. Considere habilitá-la.</string>
+  <string name="ringtone_error_title">Erro</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">O Ring precisa de permissão para \"Acessar contatos\" para habilitar esta função. Permita, por favor.</string>
   <!--Write call log permission-->
@@ -114,6 +115,14 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
   <string name="prompt_new_password">Nova senha</string>
+  <string name="prompt_new_password_repeat">Repita a nova senha</string>
+  <string name="account_device_updated_message">Você atualizou sua conta Ring com sucesso.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Meu perfil</string>
+  <string name="profile_message_warning">Isto é compartilhado com seus contatos.</string>
+  <string name="open_the_gallery">Abrir a galeria</string>
+  <string name="take_a_photo">Tirar uma foto</string>
+  <string name="unknowm_if_empty">Desconhecido se vazio</string>
   <string name="unknown">Desconhecido</string>
+  <!--Share fragment-->
 </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 46597d0..d328316 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
@@ -10,6 +10,8 @@
   <string name="error_field_required">Este campo é obrigatório</string>
   <string name="dialog_wait_create">Adicionando conta</string>
   <string name="dialog_wait_create_details">Por favor, aguarde enquanto sua nova conta é adicionada...</string>
+  <string name="dialog_wait_update">Atualizando conta</string>
+  <string name="dialog_wait_update_details">Por favor, aguarde enquanto sua nova conta é atualizada...</string>
   <string name="dialog_warn_ip2ip_account_title">Criar uma conta SIP vazia?</string>
   <string name="dialog_warn_ip2ip_account_message">Você está prestes a criar uma conta SIP com nenhum nome de host válido.
 Você só será capaz de fazer e receber chamadas IP diretos.
@@ -26,12 +28,14 @@
   <string name="share_number">Compartilhar o número</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Deletar conta?</string>
-  <string name="account_delete_dialog_message">Esta ação não pode ser revista. Se você ainda não o fez, considere exportar sua conta antes de deletá-la.</string>
+  <string name="account_delete_dialog_message">Esta ação não pode ser revista.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registrada</string>
   <string name="normal_accounts_titles">Contas</string>
+  <string name="normal_devices_titles">Dispositivos conhecidos conectados à esta conta Ring</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Geral</string>
+  <string name="account_preferences_devices_tab">Dispositivos</string>
   <string name="account_basic_category">Configurações básicas</string>
   <string name="account_alias_label">Nome da conta</string>
   <string name="account_hostname_label">Servidor</string>
@@ -90,26 +94,49 @@
   <string name="account_rtp_max_port">Máximo</string>
   <string name="account_rtp_min_port">Mínimo</string>
   <string name="account_rtp_port_range">Variação de portas de audio RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Exportar</string>
-  <string name="account_import_account">Importar conta</string>
-  <string name="account_export_title">Exportar conta</string>
-  <string name="account_import_title">Importar contas</string>
-  <string name="account_import_explanation">Você pode importar contas já exportadas.</string>
-  <string name="account_export_message">Salvar configurações de conta e credenciais, senha criptografada.</string>
-  <string name="account_export_new_password">Nova senha</string>
-  <string name="account_export_confirm_password">Confirmar senha</string>
-  <string name="account_import_message">Digite a senha para descriptografar o arquivo.</string>
-  <string name="account_import_decryption_password">Senha de descriptografia</string>
-  <string name="import_dialog_title">Importando</string>
-  <string name="import_export_wait">Por favor, aguarde...</string>
-  <string name="export_dialog_title">Exportando conta</string>
-  <string name="account_export_result">Conta exportada para %1$s</string>
-  <string name="export_failed_dialog_title">Falha ao exportar</string>
-  <string name="export_failed_dialog_msg">Um erro ocorreu</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Salvar configurações de conta e credenciais, senha criptografada.</string>
+  <string name="account_backup_new_password">Nova senha</string>
+  <string name="account_backup_confirm_password">Confirmar senha</string>
+  <string name="account_restore_message">Digite a senha para descriptografar o arquivo.</string>
+  <string name="account_restore_decryption_password">Senha de descriptografia</string>
+  <string name="account_new_device">Adicionar novo dispositivo</string>
+  <string name="account_new_device_message">Desbloquear conta Ring para associar novo dispositivo.</string>
+  <string name="account_new_device_password">Entre com a senha da conta principal</string>
+  <string name="restore_backup_wait">Por favor, aguarde...</string>
+  <string name="backup_failed_dialog_msg">Um erro ocorreu</string>
   <string name="error_password_char_count">Pelo menos 6 caracteres</string>
   <string name="error_passwords_not_equals">Senhas não correspondem</string>
-  <string name="import_failed_dialog_title">Falha ao importar</string>
-  <string name="import_failed_dialog_msg">Um erro ocorreu</string>
+  <string name="restore_failed_dialog_msg">Um erro ocorreu</string>
+  <string name="account_export">Exportar</string>
+  <string name="export_account_wait_title">Por favor, aguarde...</string>
+  <string name="export_account_wait_message">Propagando informação da nova conta</string>
+  <string name="account_export_end_pin_title">PIN :</string>
+  <string name="account_export_end_pin_message">Use este PIN junto com a senha de sua conta principal para conectar seu novo dispositivo à sua conta Ring dentro dos próximos 10 minutos.</string>
+  <string name="account_export_end_decryption_title">Erro de decriptação</string>
+  <string name="account_export_end_decryption_message">Não foi possível desbloquear sua conta utilizando a senha fornecida.</string>
+  <string name="account_export_end_network_title">Erro de rede</string>
+  <string name="account_export_end_network_message">Não foi possível exportar a conta na rede. Verifique sua conexão.</string>
   <string name="account_export_end_error_title">Erro</string>
+  <string name="account_export_end_error_message">Não foi possível exportar a conta. Um erro desconhecido ocorreu.</string>
+  <string name="account_enter_password">Entre a senha</string>
+  <string name="account_share_body">Entre em contato comigo utilizando %1$s na plataforma Ring de comunicação distribuída: http://ring.cx</string>
+  <string name="account_contact_me">Encontre-me no Ring !</string>
+  <string name="update_account">Atualize a conta</string>
+  <string name="account_migration">Agora sua conta Ring pode ser compartilhada entre todos os seus dispositivos. Você só precisa fornecer uma senha.</string>
+  <string name="ring_account">Conta Ring</string>
+  <string name="account_migration_title_dialog">Migração de conta</string>
+  <string name="account_migration_message_dialog">Para ser utilizada em múltiplos dispositivos, suas contas precisam ser atualizadas. Você quer ir à tela de administração de conta para realizar esta operação?</string>
+  <string name="account_update_needed">Atualização necessária</string>
+  <string name="account_creation_file_too_big">Arquivo muito grande</string>
+  <string name="account_cannot_read">Não foi possível ler %1$s</string>
+  <string name="account_creation_error">Erro ao criar conta</string>
+  <string name="account_cannot_be_found_title">Não foi possível localizar conta</string>
+  <string name="account_cannot_be_found_message">Não foi possível localizar a conta na rede Ring.\nCertifique-se de que foi exportada no Ring de um dispositivo existente, e que as informações fornecidas estão corretas.</string>
+  <string name="account_no_network_title">Não foi possível conectar-se à rede.</string>
+  <string name="account_no_network_message">Não foi possível adicionar a conta porque o Ring não pôde conectar-se à rede distribuída. Verifique a conexão do seu dispositivo.</string>
+  <string name="account_device_added_title">Dispositivo adicionado à conta</string>
+  <string name="account_device_added_message">Você configurou sua conta Ring neste dispositivo com sucesso.</string>
+  <string name="account_device_updated_title">Dispositivo da conta atualizado</string>
+  <string name="account_wizard_title">Conta Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index 45a11b8..e899c58 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -28,4 +28,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 c398cb2..7354b94 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
@@ -29,5 +29,5 @@
   <string name="account_preferences_security_tab">Segurança</string>
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index db7ff79..55cbfd3 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -96,6 +96,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Разрешение на использование камеры</string>
   <string name="permission_dialog_camera_message">Необходимо доступ к камере для работы с видеозвонками. Пожалуйста, предоставьте их.</string>
+  <string name="ringtone_error_title">Ошибка</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Приложению необходимы права на чтение контактов для включения данной опции</string>
   <!--Write call log permission-->
@@ -118,4 +119,5 @@
   <string name="prompt_new_password">Новый пароль</string>
   <!--MenuHeaderView-->
   <string name="unknown">Неизвестно</string>
+  <!--Share fragment-->
 </resources>
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 8ce530d..c845e9e 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
@@ -19,7 +19,7 @@
   <string name="share_number">Расшарить номер</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Удалить аккаунт?</string>
-  <string name="account_delete_dialog_message">Это действие не может быть отменено. Если вы еще не сделали этого, следует рассмотреть возможность экспортировать свою учетную запись перед её удалением.</string>
+  <string name="account_delete_dialog_message">Это действие не может быть отменено</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Аккаунт не зарегистрирован</string>
   <string name="normal_accounts_titles">Учетные записи</string>
@@ -83,26 +83,17 @@
   <string name="account_rtp_max_port">Максимум</string>
   <string name="account_rtp_min_port">Минимум</string>
   <string name="account_rtp_port_range">Диапазон портов RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Экспорт</string>
-  <string name="account_import_account">Импорт аккаунта</string>
-  <string name="account_export_title">Экспорт аккаунта</string>
-  <string name="account_import_title">Импорт аккаунтов</string>
-  <string name="account_import_explanation">Вы можете импортировать ранее экспортированные аккаунты.</string>
-  <string name="account_export_message">Сохранить настройки аккаунта и учетные данные, пароль в зашифрованном виде.</string>
-  <string name="account_export_new_password">Новый пароль</string>
-  <string name="account_export_confirm_password">Подтвердите пароль</string>
-  <string name="account_import_message">Введите пароль для расшифровки файла.</string>
-  <string name="account_import_decryption_password">Дешифрование паролья</string>
-  <string name="import_dialog_title">Импортирование</string>
-  <string name="import_export_wait">Пожалуйста, подождите...</string>
-  <string name="export_dialog_title">Экспорт аккаунта</string>
-  <string name="account_export_result">Аккаунт экспортируется в %1$s</string>
-  <string name="export_failed_dialog_title">Ошибка экспорта</string>
-  <string name="export_failed_dialog_msg">Произошла ошибка</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Сохранить настройки аккаунта и учетные данные, пароль в зашифрованном виде.</string>
+  <string name="account_backup_new_password">Новый пароль</string>
+  <string name="account_backup_confirm_password">Подтвердите пароль</string>
+  <string name="account_restore_message">Введите пароль для расшифровки файла.</string>
+  <string name="account_restore_decryption_password">Дешифрование паролья</string>
+  <string name="restore_backup_wait">Пожалуйста, подождите...</string>
+  <string name="backup_failed_dialog_msg">Произошла ошибка</string>
   <string name="error_password_char_count">Минимум 6 символов</string>
   <string name="error_passwords_not_equals">Пароли не совпадают</string>
-  <string name="import_failed_dialog_title">Ошибка импорта</string>
-  <string name="import_failed_dialog_msg">Произошла ошибка</string>
+  <string name="restore_failed_dialog_msg">Произошла ошибка</string>
+  <string name="account_export">Экспорт</string>
   <string name="account_export_end_error_title">Ошибка</string>
 </resources>
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 1e464f8..d1c03f8 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -84,6 +84,7 @@
   <string name="send_message">Отправить сообщение</string>
   <string name="message_sending">Отправка сообщения...</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">Ошибка</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -97,4 +98,5 @@
   <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
   <!--MenuHeaderView-->
   <string name="unknown">Неизвестно</string>
+  <!--Share fragment-->
 </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 be5f397..1ba8ac7 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
@@ -71,6 +71,6 @@
   <string name="account_rtp_max_port">Максимум</string>
   <string name="account_rtp_min_port">Минимум</string>
   <string name="account_rtp_port_range">Диапазон портов для RTP аудио</string>
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export_end_error_title">Ошибка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 654414f..5860246 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -29,4 +29,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 9990efa..44c5595 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -24,6 +24,7 @@
   <string name="menu_item_home">Hem</string>
   <string name="menu_item_accounts">Hantera konton</string>
   <string name="menu_item_settings">Inställningar</string>
+  <string name="menu_item_share">Dela min kontakt</string>
   <string name="menu_item_about">Om Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_action_call">Ring upp</string>
@@ -94,6 +95,9 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamerarättighet</string>
   <string name="permission_dialog_camera_message">Videokonversationer kräver kamerarättigheter. Överväg att aktivera det.</string>
+  <string name="ringtone_error_title">Fel</string>
+  <string name="ringtone_error_format_not_supported">Detta format saknar stöd.</string>
+  <string name="ringtone_error_size_too_big">Denna fil är för stor. Maximal storlek är %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring behöver rättighet att läsa kontakter för att aktivera den här funktionen. Överväg att tilldela rättigheter.</string>
   <!--Write call log permission-->
@@ -114,6 +118,17 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Vill du lägga till %1$s ?</string>
   <string name="prompt_new_password">Nytt lösenord</string>
+  <string name="prompt_new_password_repeat">Upprepa nytt lösenord</string>
+  <string name="account_device_updated_message">Du har lyckats uppdatera ditt Ring-konto.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Min profil</string>
+  <string name="profile_message_warning">Detta delas med dina kontakter</string>
+  <string name="open_the_gallery">Öppna galleriet</string>
+  <string name="take_a_photo">Ta ett foto</string>
+  <string name="unknowm_if_empty">Okänd om tom</string>
   <string name="unknown">Okänd</string>
+  <!--Share fragment-->
+  <string name="share_label">Tryck på Ring-ID för att dela</string>
+  <string name="share_message">Skanna denna QR-kod med den inbyggda skanner som finns i det Ring-program som vill kommunicera med dig.</string>
+  <string name="share_your_account_information">Dela min kontaktinformation</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 1d4bed8..4c291b3 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
@@ -10,6 +10,8 @@
   <string name="error_field_required">Det här fältet är obligatoriskt</string>
   <string name="dialog_wait_create">Lägger till konto</string>
   <string name="dialog_wait_create_details">Vänta medan ditt nya konto läggs till...</string>
+  <string name="dialog_wait_update">Uppdaterar konto</string>
+  <string name="dialog_wait_update_details">Vänta medan ditt nya konto uppdateras...</string>
   <string name="dialog_warn_ip2ip_account_title">Vill du skapa ett tomt SIP-konto?</string>
   <string name="dialog_warn_ip2ip_account_message">Du håller på att skapa ett SIP-konto utan giltigt värdnamn.
 Du kommer bara att kunna ringa och ta emot direkta IP-samtal.
@@ -26,12 +28,14 @@
   <string name="share_number">Dela nummer</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Vill du ta bort kontot?</string>
-  <string name="account_delete_dialog_message">Denna åtgärd kan inte ångras. Om du inte redan gjort det, bör du överväga att exportera ditt konto innan du tar bort det.</string>
+  <string name="account_delete_dialog_message">Denna åtgärd kan inte ångras.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Inget konto registrerat</string>
   <string name="normal_accounts_titles">Konton</string>
+  <string name="normal_devices_titles">Kända enheter, länkade till detta Ring-konto</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allmänt</string>
+  <string name="account_preferences_devices_tab">Enheter</string>
   <string name="account_basic_category">Grundläggande inställningar</string>
   <string name="account_alias_label">Kontonamn</string>
   <string name="account_hostname_label">Värdnamn</string>
@@ -90,26 +94,49 @@
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Audio RTP portintervall</string>
-  <!--Import/export-->
-  <string name="account_export">Exportera</string>
-  <string name="account_import_account">Importera ett konto</string>
-  <string name="account_export_title">Exportera ett konto</string>
-  <string name="account_import_title">Importera konton</string>
-  <string name="account_import_explanation">Du kan importera tididigare exporterade konton.</string>
-  <string name="account_export_message">Spara kontoinställningar och autentiseringsuppgifter, lösenordet krypterat.</string>
-  <string name="account_export_new_password">Nytt lösenord</string>
-  <string name="account_export_confirm_password">Bekräfta lösenord</string>
-  <string name="account_import_message">Ange lösenord för att dekryptera filen</string>
-  <string name="account_import_decryption_password">Dekrypteringslösenord</string>
-  <string name="import_dialog_title">Importerar</string>
-  <string name="import_export_wait">Vänta...</string>
-  <string name="export_dialog_title">Exporterar konto</string>
-  <string name="account_export_result">Konto exporterat till %1$s</string>
-  <string name="export_failed_dialog_title">Exporten misslyckades</string>
-  <string name="export_failed_dialog_msg">Et fel inträffade</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Spara kontoinställningar och autentiseringsuppgifter, lösenordet krypterat.</string>
+  <string name="account_backup_new_password">Nytt lösenord</string>
+  <string name="account_backup_confirm_password">Bekräfta lösenord</string>
+  <string name="account_restore_message">Ange lösenord för att dekryptera filen</string>
+  <string name="account_restore_decryption_password">Dekrypteringslösenord</string>
+  <string name="account_new_device">Lägg till ny enhet</string>
+  <string name="account_new_device_message">Lås upp Ring-kontot för att associera ny enhet.</string>
+  <string name="account_new_device_password">Ange kontots lösenord</string>
+  <string name="restore_backup_wait">Vänta...</string>
+  <string name="backup_failed_dialog_msg">Et fel inträffade</string>
   <string name="error_password_char_count">6 tecken minimum</string>
   <string name="error_passwords_not_equals">Lösenorden stämmer inte</string>
-  <string name="import_failed_dialog_title">Importen misslyckades</string>
-  <string name="import_failed_dialog_msg">Et fel inträffade</string>
+  <string name="restore_failed_dialog_msg">Et fel inträffade</string>
+  <string name="account_export">Exportera</string>
+  <string name="export_account_wait_title">Vänta...</string>
+  <string name="export_account_wait_message">Publicerar ny kontoinformation</string>
+  <string name="account_export_end_pin_title">PIN : </string>
+  <string name="account_export_end_pin_message">Använd PIN-koden tillsammans med ditt kontolösenord för att associera den nya enheten med ditt Ring-konto, de närmaste 10 minuterna.</string>
+  <string name="account_export_end_decryption_title">Dekrypteringsfel</string>
+  <string name="account_export_end_decryption_message">Kunde inte låsa upp ditt konto med det givna lösenordet.</string>
+  <string name="account_export_end_network_title">Nätverksfel</string>
+  <string name="account_export_end_network_message">Kunde inte exportera kontot över nätverket. Kontrollera din uppkoppling.</string>
   <string name="account_export_end_error_title">Fel</string>
+  <string name="account_export_end_error_message">Kunde inte exportera kontot. Ett okänt fel har inträffat.</string>
+  <string name="account_enter_password">Ange lösenord</string>
+  <string name="account_share_body">Kontakta mig via %1$s på kommunikationsplattformen Ring: http://ring.cx</string>
+  <string name="account_contact_me">Kontakta mig på Ring !</string>
+  <string name="update_account">Uppdatera konto</string>
+  <string name="account_migration">Ditt Ring-konto kan nu delas mellan alla dina enheter. Allt du behöver göra, är att ange ett lösenord.</string>
+  <string name="ring_account">Ring-konto</string>
+  <string name="account_migration_title_dialog">Kontodelning</string>
+  <string name="account_migration_message_dialog">Ditt konto måste uppdateras för att kunna användas på flera enheter. Vill du gå till kontohanteringen för att utföra denna åtgärd?</string>
+  <string name="account_update_needed">Uppdatering behövs</string>
+  <string name="account_creation_file_too_big">Filen är för stor</string>
+  <string name="account_cannot_read">Kan inte läsa %1$s</string>
+  <string name="account_creation_error">Fel vid kontoskapande</string>
+  <string name="account_cannot_be_found_title">Kan inte hitta kontot</string>
+  <string name="account_cannot_be_found_message">Kontot kunde inte hittas i Ring-nätverket.\nTillse att det har exporterats från en befintlig enhet och att angivna kontouppgifter är korrekt.</string>
+  <string name="account_no_network_title">Kan inte ansluta till nätverket</string>
+  <string name="account_no_network_message">Kunde inte lägga till kontot, eftersom Ring inte kunde ansluta till det distribuerade nätverket. Kontrollera enhetens anslutning.</string>
+  <string name="account_device_added_title">Kontoenhet tillagd</string>
+  <string name="account_device_added_message">Du har lyckats konfigurera ditt Ring-konto på denna enhet.</string>
+  <string name="account_device_updated_title">Kontoenhet uppdaterad</string>
+  <string name="account_wizard_title">Ring-konto</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_call.xml b/ring-android/app/src/main/res/values-sv/strings_call.xml
index 9e87409..8faf417 100644
--- a/ring-android/app/src/main/res/values-sv/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_call.xml
@@ -34,5 +34,6 @@
     <string name="call_human_state_over">Över</string>
     <string name="call_human_state_none">Ingen</string>
     <string name="conference_human_state_hold">Parkera</string>
+    <string name="conference_human_state_hold_rec">Parkera insp.</string>
     <string name="conference_human_state_default">Ingen</string>
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 8ef2b3b..182094e 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -94,6 +94,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera izni</string>
   <string name="permission_dialog_camera_message">Görüntülü görüşme için kamera çalıştırma izni gereklidir.Lütfen etkinleştirmeyi gözden kaçırmayın.</string>
+  <string name="ringtone_error_title">Hata</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring bu özelliği etkinleştirmek için \"Kişileri okuma\" iznine gereksiniyor. Lütfen verin.</string>
   <!--Write call log permission-->
@@ -114,6 +115,14 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s eklensin mi ?</string>
   <string name="prompt_new_password">Yeni parola</string>
+  <string name="prompt_new_password_repeat">Yeni parola tekrar</string>
+  <string name="account_device_updated_message">Ring hesabınızı başarıyla güncellediniz.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Profilim</string>
+  <string name="profile_message_warning">Bu, kişileriniz ile paylaşıldı</string>
+  <string name="open_the_gallery">Galeriyi aç</string>
+  <string name="take_a_photo">Fotograf çek</string>
+  <string name="unknowm_if_empty">Boş ise bilinmiyor</string>
   <string name="unknown">Bilinmeyen</string>
+  <!--Share fragment-->
 </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 c6c1cd7..dcf266c 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
@@ -10,6 +10,8 @@
   <string name="error_field_required">Bu alan gerekli</string>
   <string name="dialog_wait_create">Hesap ekleniyor</string>
   <string name="dialog_wait_create_details">Yeni hesabınız eklenirken lütfen bekleyin...</string>
+  <string name="dialog_wait_update">Hesap güncelleniyor</string>
+  <string name="dialog_wait_update_details">Yeni hesabınız güncellenirken lütfen bekleyin...</string>
   <string name="dialog_warn_ip2ip_account_title">Boş SIP hesabı oluşturulsun mu?</string>
   <string name="dialog_warn_ip2ip_account_message">Bir SIP hesabı oluşturabilmeniz için makine adınız geçersiz.
 Sadece ip çağrıları alabilirsiniz.
@@ -25,13 +27,15 @@
   <string name="create_sip_account">Ekle</string>
   <string name="share_number">Numara paylaş</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Hesabı sil ?</string>
-  <string name="account_delete_dialog_message">Bu eylem geri alınamaz. Eğer daha bitirmediyseniz silmeden önce hesabınızı dışa aktarmayı düşünmelisiniz.</string>
+  <string name="account_delete_dialog_title">Hesabı silinsin mi ?</string>
+  <string name="account_delete_dialog_message">Bu eylem geri alınamaz.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kayıtlı hesap yok</string>
   <string name="normal_accounts_titles">Hesaplar</string>
+  <string name="normal_devices_titles">Bu Ring hesabına bilinen aygıtlar bağlı</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Genel</string>
+  <string name="account_preferences_devices_tab">Aygıtlar</string>
   <string name="account_basic_category">Temel Ayarlar</string>
   <string name="account_alias_label">Hesap adı</string>
   <string name="account_hostname_label">Sunucu adı</string>
@@ -40,7 +44,7 @@
   <string name="account_password_label">Parola</string>
   <string name="account_optionnal_category">İsteğe Bağlı Ayarlar</string>
   <string name="account_useragent_label">Kullanıcı Kimliği</string>
-  <string name="account_autoanswer_label">Otomatik Cevapla</string>
+  <string name="account_autoanswer_label">Kendiliğinden Yanıtla</string>
   <string name="account_upnp_label">UPnP\'yi etkinleştir</string>
   <string name="account_proxy_field">Vekil</string>
   <!--Audio Details-->
@@ -63,9 +67,9 @@
   <string name="account_turn_server_label">TURN sunucusu</string>
   <string name="account_turn_username_label">TURN kullanıcı adı</string>
   <string name="account_turn_password_label">TURN parolası</string>
-  <string name="account_published_same_as_local_label">Yayınlanan yerel ile aynı</string>
-  <string name="account_published_port_label">Yayınlanan Delik</string>
-  <string name="account_published_address_label">Yayınlanan Yer</string>
+  <string name="account_published_same_as_local_label">Yayımlanan yerel ile aynı</string>
+  <string name="account_published_port_label">Yayımlanan Delik</string>
+  <string name="account_published_address_label">Yayımlanan Yer</string>
   <!--Security Details-->
   <string name="account_credentials_label">Kimlik Bilgileri</string>
   <string name="account_credentials_edit">Kimlik bilgilerini düzenle</string>
@@ -86,30 +90,49 @@
   <string name="account_tls_server_name_label">Sunucu Adı</string>
   <string name="account_tls_verify_server_label">Sunucu Doğrula</string>
   <string name="account_tls_verify_client_label">İstemciyi Doğrula</string>
-  <string name="account_tls_negotiation_timeout_sec">Müzakere Zaman Aşımı (saniye)</string>
+  <string name="account_tls_negotiation_timeout_sec">Görüşme Zaman Aşımı (saniye)</string>
   <string name="account_rtp_max_port">Azami</string>
   <string name="account_rtp_min_port">Asgari</string>
   <string name="account_rtp_port_range">Ses RTP Delik Aralığı</string>
-  <!--Import/export-->
-  <string name="account_export">Dışa aktar</string>
-  <string name="account_import_account">Hesabı içe aktar</string>
-  <string name="account_export_title">Hesabı dışa aktar</string>
-  <string name="account_import_title">Hesapları içe aktar</string>
-  <string name="account_import_explanation">Daha önceden dışa aktarılan hesapları içe aktarabilirsiniz.</string>
-  <string name="account_export_message">Hesap ayarlarını ve kimlik bilgilerini parola ile şifrelenmiş olarak kaydet.</string>
-  <string name="account_export_new_password">Yeni parola</string>
-  <string name="account_export_confirm_password">Parolayı onayla</string>
-  <string name="account_import_message">Dosya şifresini çözmek için parolayı girin.</string>
-  <string name="account_import_decryption_password">Şifre çözme parolası</string>
-  <string name="import_dialog_title">İçe aktarılıyor</string>
-  <string name="import_export_wait">Lütfen bekleyin...</string>
-  <string name="export_dialog_title">Hesap dışa aktarılıyor</string>
-  <string name="account_export_result">Hesap %1$s\'e aktarıldı</string>
-  <string name="export_failed_dialog_title">Dışa aktarma başarısız</string>
-  <string name="export_failed_dialog_msg">Bir hata oluştu</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Hesap ayarlarını ve kimlik bilgilerini parola ile şifrelenmiş olarak kaydet.</string>
+  <string name="account_backup_new_password">Yeni parola</string>
+  <string name="account_backup_confirm_password">Parolayı onayla</string>
+  <string name="account_restore_message">Dosya şifresini çözmek için parolayı girin.</string>
+  <string name="account_restore_decryption_password">Şifre çözme parolası</string>
+  <string name="account_new_device">Yeni aygıt ekle</string>
+  <string name="account_new_device_message">Yeni aygıtla ilişkilendirmek için Ring hesabının kilidini açın.</string>
+  <string name="account_new_device_password">Ana hesap parolasını girin</string>
+  <string name="restore_backup_wait">Lütfen bekleyin...</string>
+  <string name="backup_failed_dialog_msg">Bir hata oluştu</string>
   <string name="error_password_char_count">En az 6 harf</string>
   <string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
-  <string name="import_failed_dialog_title">İçe aktarma başarısız</string>
-  <string name="import_failed_dialog_msg">Bir hata oluştu</string>
+  <string name="restore_failed_dialog_msg">Bir hata oluştu</string>
+  <string name="account_export">Dışa aktar</string>
+  <string name="export_account_wait_title">Lütfen bekleyin...</string>
+  <string name="export_account_wait_message">Yeni hesap bilgisi yayınlanıyor</string>
+  <string name="account_export_end_pin_title">PIN : </string>
+  <string name="account_export_end_decryption_title">Şifre çözme hatası</string>
+  <string name="account_export_end_decryption_message">Hesabınızın açılamıyor buradan aldığınız parolayı kullanın.</string>
+  <string name="account_export_end_network_title">Ağ hatası</string>
+  <string name="account_export_end_network_message">Hesap ağdan dışarı aktarılamadı. Bağlanabilirliğinizi denetleyin.</string>
   <string name="account_export_end_error_title">Hata</string>
+  <string name="account_export_end_error_message">Hesap dışa aktarılamadı.Bilinmeyen bir hata oluştu.</string>
+  <string name="account_enter_password">Parolayı girin</string>
+  <string name="account_contact_me">Benimle Ring üzerinden iletişime geç</string>
+  <string name="update_account">Hesabı güncelle</string>
+  <string name="account_migration">Hesabınız şimdi bütün aygıtlarınızda kullanılabilir. Bütün bunlar için parolanız olması yeterli.</string>
+  <string name="ring_account">Ring Hesabı</string>
+  <string name="account_migration_title_dialog">Hesabın yerini değiştirme</string>
+  <string name="account_update_needed">Güncelleme gerekli</string>
+  <string name="account_creation_file_too_big">Dosya çok büyük</string>
+  <string name="account_cannot_read">%1$s okunamıyor</string>
+  <string name="account_creation_error">Hesap oluşturma hatası</string>
+  <string name="account_cannot_be_found_title">Hesap bulunamadı</string>
+  <string name="account_no_network_title">Ağa bağlanılamıyor</string>
+  <string name="account_no_network_message">Hesap eklenemiyor çünkü Ring ağ bağlantısından yararlanamıyor. Bağlanabilirliğinizi denetleyin.</string>
+  <string name="account_device_added_title">Hesap aygıtı eklendi</string>
+  <string name="account_device_added_message">Bu aygıttaki Ring hesabı ayarlarını başarıyla tamamladınız.</string>
+  <string name="account_device_updated_title">Hesap aygıtı güncellendi</string>
+  <string name="account_wizard_title">Ring Hesabı</string>
 </resources>
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 8b74053..ac28c07 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
@@ -6,8 +6,8 @@
   <string name="pref_category_privacy">Gizlilik</string>
   <string name="pref_mobileData_title">Hücresel veri</string>
   <string name="pref_mobileData_summary">Ring\'i Wi-Fi\'ye ek olarak 3G/LTE ağlarında da çalıştır</string>
-  <string name="pref_systemContacts_title">Düzen kişilerini kullan</string>
-  <string name="pref_systemContacts_summary">Arayan detaylarını göstermek için düzen kişilerini kullan</string>
+  <string name="pref_systemContacts_title">Sistem bağlantılarını kullan</string>
+  <string name="pref_systemContacts_summary">Arayan detaylarını göstermek için sistem bağlantılarını kullan</string>
   <string name="pref_systemDialer_title">Ring kullanarak sistem aramalarını yerleştirin.</string>
   <string name="pref_systemDialer_summary">Mümkün olduğunda Sistem aramalarını yerleştirmek için Ring\'i kullanın.</string>
   <string name="pref_startOnBoot_title">Ring\'i başlangıçta çalıştır</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 3a006ed..dd0031f 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -95,6 +95,7 @@
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Дозволи для камери</string>
   <string name="permission_dialog_camera_message">Для здійснення відерозмови необхідно надати дозвіл на роботу камери. Будь ласка, розглянути можливість її увімкнення.</string>
+  <string name="ringtone_error_title">Помилка</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring потребує права \"Зчитування контактів\" для включення цього функціоналу. Будь ласка надайте це право.</string>
   <!--Write call log permission-->
@@ -117,4 +118,5 @@
   <string name="prompt_new_password">Новий пароль</string>
   <!--MenuHeaderView-->
   <string name="unknown">Невідомий</string>
+  <!--Share fragment-->
 </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 afc3fe7..883c73d 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
@@ -26,7 +26,7 @@
   <string name="share_number">Поділитися номером</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Видалити акаунт?</string>
-  <string name="account_delete_dialog_message">Ця дія не може бути скасована. Якщо ви ще не зробили цього, слід розглянути можливість експортувати свій обліковий запис перед його видаленням.</string>
+  <string name="account_delete_dialog_message">Ця дія не може бути скасована.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Немає зареєстрованного аккаунту</string>
   <string name="normal_accounts_titles">Аккаунти</string>
@@ -90,26 +90,17 @@
   <string name="account_rtp_max_port">Максимум</string>
   <string name="account_rtp_min_port">Мінімум</string>
   <string name="account_rtp_port_range">Порти для передачі аудіо по RTP</string>
-  <!--Import/export-->
-  <string name="account_export">Експортувати</string>
-  <string name="account_import_account">Імпортувати акаунт</string>
-  <string name="account_export_title">Експортувати акаунт</string>
-  <string name="account_import_title">Імпортувати акаунти</string>
-  <string name="account_import_explanation">Ви можете імпортувати попередньо експортовані акаунти.</string>
-  <string name="account_export_message">Зберегти налаштування облікового запису та облікові дані, пароль в зашифрованому вигляді.</string>
-  <string name="account_export_new_password">Новий пароль</string>
-  <string name="account_export_confirm_password">Підтвердити пароль</string>
-  <string name="account_import_message">Введіть пароль для розшифрування файлу.</string>
-  <string name="account_import_decryption_password">Розшифрування паролю</string>
-  <string name="import_dialog_title">Імпортування</string>
-  <string name="import_export_wait">Будь ласка зачекайте</string>
-  <string name="export_dialog_title">Експортувати акаунт</string>
-  <string name="account_export_result">Акаунт експортовано до %1$s</string>
-  <string name="export_failed_dialog_title">Невдалий експорт</string>
-  <string name="export_failed_dialog_msg">Виникла помилка</string>
+  <!--restore/backup-->
+  <string name="account_backup_message">Зберегти налаштування облікового запису та облікові дані, пароль в зашифрованому вигляді.</string>
+  <string name="account_backup_new_password">Новий пароль</string>
+  <string name="account_backup_confirm_password">Підтвердити пароль</string>
+  <string name="account_restore_message">Введіть пароль для розшифрування файлу.</string>
+  <string name="account_restore_decryption_password">Розшифрування паролю</string>
+  <string name="restore_backup_wait">Будь ласка зачекайте</string>
+  <string name="backup_failed_dialog_msg">Виникла помилка</string>
   <string name="error_password_char_count">мінімум 6 символів</string>
   <string name="error_passwords_not_equals">Паролі не збігаються</string>
-  <string name="import_failed_dialog_title">Невдалий імпорт</string>
-  <string name="import_failed_dialog_msg">Виникла помилка</string>
+  <string name="restore_failed_dialog_msg">Виникла помилка</string>
+  <string name="account_export">Експортувати</string>
   <string name="account_export_end_error_title">Помилка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index c0a0bd2..d9464aa 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -29,4 +29,5 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 eb0d3ae..bdabddb 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
@@ -88,4 +88,5 @@
   <string name="add_call_contact_number_to_contacts">加入 %1$s 嗎？</string>
   <string name="prompt_new_password">新密碼</string>
   <!--MenuHeaderView-->
+  <!--Share fragment-->
 </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 6d32b94..435e224 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
@@ -21,6 +21,7 @@
   <string name="share_number">分享號碼</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">刪除帳號嗎？</string>
+  <string name="account_delete_dialog_message">這個動作無法被復原。</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">沒有註冊的帳號</string>
   <string name="normal_accounts_titles">帳號</string>
@@ -60,24 +61,15 @@
   <string name="account_rtp_max_port">最大值</string>
   <string name="account_rtp_min_port">最小值</string>
   <string name="account_rtp_port_range">音訊 RTP 連接埠範圍</string>
-  <!--Import/export-->
-  <string name="account_export">匯出</string>
-  <string name="account_import_account">匯入一個帳號</string>
-  <string name="account_export_title">匯出一個帳號</string>
-  <string name="account_import_title">匯入帳號</string>
-  <string name="account_import_explanation">你可以匯入之前匯出的帳號。</string>
-  <string name="account_export_new_password">新密碼</string>
-  <string name="account_export_confirm_password">確認密碼</string>
-  <string name="account_import_message">輸入密碼來解密檔案。</string>
-  <string name="account_import_decryption_password">解密密碼</string>
-  <string name="import_dialog_title">匯入中</string>
-  <string name="import_export_wait">請等待...</string>
-  <string name="export_dialog_title">正在匯出帳號</string>
-  <string name="account_export_result">帳號匯出到 %1$s</string>
-  <string name="export_failed_dialog_title">匯出失敗</string>
-  <string name="export_failed_dialog_msg">發生錯誤</string>
+  <!--restore/backup-->
+  <string name="account_backup_new_password">新密碼</string>
+  <string name="account_backup_confirm_password">確認密碼</string>
+  <string name="account_restore_message">輸入密碼來解密檔案。</string>
+  <string name="account_restore_decryption_password">解密密碼</string>
+  <string name="restore_backup_wait">請等待...</string>
+  <string name="backup_failed_dialog_msg">發生錯誤</string>
   <string name="error_password_char_count">最小6個字元</string>
   <string name="error_passwords_not_equals">密碼不相符</string>
-  <string name="import_failed_dialog_title">匯入失敗</string>
-  <string name="import_failed_dialog_msg">發生錯誤</string>
+  <string name="restore_failed_dialog_msg">發生錯誤</string>
+  <string name="account_export">匯出</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index ba4e7f2..82873ad 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -33,4 +33,5 @@
   <!--Contacts-->
   <!--MenuHeaderView-->
   <string name="unknown">未知</string>
+  <!--Share fragment-->
 </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 47fd8bd..e64a4a9 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
@@ -31,6 +31,6 @@
   <string name="account_preferences_security_tab">安全</string>
   <!--SIP-->
   <!--TLS Details-->
-  <!--Import/export-->
+  <!--restore/backup-->
   <string name="account_export">輸出</string>
 </resources>