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 fdaa7f0..1bf2e9b 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring برمجية حرّة طوّرت ودعمت بواسطة</string>
   <string name="copyright_section">الحقوق محفوظة</string>
   <string name="contribute_section">مساهمة</string>
   <string name="version_section">الإصدار</string>
   <string name="email_chooser_title">إرسال بريد إلكتروني باستخدام...</string>
+  <string name="credits">الأطراف المصممة</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">الاتصال بالشبكة غير متوفر</string>
@@ -89,4 +92,6 @@
   <string name="refuse">أرفض</string>
   <!--Send contact requests-->
   <string name="send_request_button">أرسل</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 e755011..89ff74d 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring е безплатен софтуер, разработван и поддържан от</string>
   <string name="copyright_section">Авторски права</string>
   <string name="contribute_section">Принос</string>
   <string name="version_section">Версия</string>
   <string name="no_email_app_installed">Не е открито приложение за е-поща. Инсталирайте такова и ни изпратете доклад.</string>
   <string name="email_chooser_title">Изпращане на е-писмо чрез…</string>
+  <string name="credits">Заслуги</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Няма връзка с мрежата</string>
@@ -118,4 +121,6 @@
   <string name="refuse">Отказ</string>
   <!--Send contact requests-->
   <string name="send_request_button">Изпращане</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 3750f6e..04d8081 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring és software lliure desenvolupat i mantingut per</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribueix</string>
   <string name="version_section">Versió</string>
   <string name="no_email_app_installed">No s\'ha trobat cap aplicació de correu, instal·leu una per enviar-nos un informe </string>
   <string name="email_chooser_title">Enviar correu fent servir...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">No hi ha connexió a la xarxa</string>
@@ -123,4 +125,6 @@
   <!--Pending contact requests-->
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 b0f516b..3cafe9c 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
@@ -1,11 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring je svobodný software, jejž vyvíjí a podporuje</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Přispět</string>
   <string name="version_section">Verze</string>
   <string name="no_email_app_installed">Nenalezena mailová aplikace, nějakou si nainstalujte, abyste nám poslali hlášení</string>
   <string name="email_chooser_title">Poslat zprávu pomocí…</string>
+  <string name="description">Ring je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů.</string>
+  <string name="credits">Zásluhy</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Chybí připojení</string>
@@ -126,4 +130,6 @@
   <string name="refuse">Odmítnout</string>
   <!--Send contact requests-->
   <string name="send_request_button">Odeslat</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 9675919..2523535 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Tilbagemelding</string>
   <string name="report">&lt;u&gt;Send os en email&lt;/u&gt;</string>
   <string name="section_license">Licens</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Vis hjemmeside med...</string>
   <string name="license">Denne software er gjort tilgængelig \"som beset\", uden nogen former for garantier. For flere detaljer, se
 &lt;u&gt;GNU General Public License version 3 eller senere&lt;/u&gt;</string>
+  <string name="description">Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv.</string>
+  <string name="credits">Krediteringer</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ingen netværksforbindelse</string>
@@ -139,4 +143,6 @@
   <string name="refuse">Afvis</string>
   <!--Send contact requests-->
   <string name="send_request_button">Send</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 a463974..0e86bb2 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Feedback</string>
   <string name="report">&lt;u&gt;Schreiben Sie uns eine E-Mail&lt;/u&gt;</string>
   <string name="section_license">Lizenz</string>
@@ -13,6 +14,8 @@
   <string name="website_chooser_title">Darstellung der Homepage mit...</string>
   <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter
 &lt;u&gt;GNU General Public License Version 3 oder später&lt;/u&gt;</string>
+  <string name="credits">Abspann</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkkonnektivität</string>
@@ -136,4 +139,6 @@
   <string name="generic_error_migration_message">Ein Fehler ist während der Datenübernahme aufgetreten</string>
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 b270605..2b13eee 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Feedback</string>
   <string name="report">&lt;u&gt;Sende uns eine E-Mail an&lt;/u&gt;</string>
   <string name="section_license">Lizenz</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Webseite anzeigen mit...</string>
   <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter
 &lt;u&gt;GNU General Public License Version 3 oder höher&lt;/u&gt;</string>
+  <string name="description">Ring ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.</string>
+  <string name="credits">Würdigung</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkverbindung</string>
@@ -26,9 +30,11 @@
   <string name="drawer_close">Navigationsleiste schließen</string>
   <!--Sections-->
   <string name="menu_item_home">Start</string>
+  <string name="menu_item_contact_request">Kontaktanfragen</string>
   <string name="menu_item_accounts">Konten verwalten</string>
   <string name="menu_item_settings">Einstellungen</string>
   <string name="menu_item_share">Meinen Kontakt teilen</string>
+  <string name="menu_item_blacklist">Gesperrte Kontakte</string>
   <string name="menu_item_about">Über Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Nummer wählen</string>
@@ -51,9 +57,11 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <string name="transfer_to_another_call">Auf einen anderen aktuellen Anruf weiterleiten</string>
-  <string name="transfer_no_other_call">Kein anderer Anrufe wartend</string>
+  <string name="transfer_no_other_call">Keine anderen Anrufe wartend</string>
   <string name="transfer_type_number">Nummer für Übertragung eingeben:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Verpasster eingehender Anruf</string>
+  <string name="notif_missed_outgoing_call">Verpasster ausgehender Anruf</string>
   <string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
   <string name="notif_incoming_call">Eingehender Anruf</string>
   <string name="notif_outgoing_call_title">Ausgehender Anruf von %1$s</string>
@@ -69,12 +77,12 @@
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehender Anruf von %1$s</string>
   <string name="start_error_title">Ring konnte nicht gestartet werden!</string>
-  <string name="start_error_mic_required">Ring benötigt Erlaubnis auf das Mikrofon zuzugreifen.</string>
+  <string name="start_error_mic_required">Ring benötigt die Erlaubnis auf das Mikrofon zuzugreifen.</string>
   <string name="action_call_accept">Anruf annehmen</string>
   <string name="action_call_decline">Ablehnen</string>
   <string name="ab_action_speakerphone">Lautsprecher einschalten</string>
   <string name="ab_action_contact_add">Kontakte hinzufügen</string>
-  <string name="ab_action_contact_add_question">Zu Kontakten hinzufügen</string>
+  <string name="ab_action_contact_add_question">Zu Kontakten hinzufügen?</string>
   <string name="ab_action_audio_call">Audioanruf</string>
   <string name="ab_action_video_call">Videoanruf</string>
   <string name="ab_action_change_screen_orientation">Bildschirmausrichtung ändern</string>
@@ -98,7 +106,7 @@
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Ring benötigt die Berechtigung \"Anruflisten schreiben\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">Scanne den QR-Code des Kontos, das du hinzufügen möchtest.</string>
+  <string name="scan_qr_account_message">Scannen Sie den QR-Code des Kontos, das Sie hinzufügen möchten.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Verlauf löschen?</string>
   <string name="clear_history_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
@@ -110,14 +118,15 @@
   <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s in die Zwischenablage kopiert</string>
   <string name="conversation_action_select_peer_number">Suche eine Nummer aus</string>
+  <string name="conversation_action_block_this">Kontakt sperren</string>
   <!--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_create_title">Ein Ring-Konto erstellen</string>
   <string name="prompt_new_username">Neuen Benutzernamen eingeben</string>
-  <string name="help_password_choose">Wähle ein sicheres Passwort, an das du dich erinnern kannst, um deinen Ring-Konto zu schützen.</string>
-  <string name="help_password_enter">Geben Sie Ihr Haupt-Ring-Kontopasswort ein</string>
+  <string name="help_password_choose">Wählen Sie ein sicheres Passwort, an das Sie sich erinnern können, um ihr Ring-Konto zu schützen.</string>
+  <string name="help_password_enter">Geben Sie ihr Haupt-Ring-Kontopasswort ein</string>
   <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Ring-Kontos ein. Benutzen Sie die Funktion \"Exportiere Konto auf Ring\", um die PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
@@ -137,6 +146,16 @@
   <!--Pending contact requests-->
   <string name="accept">Akzeptieren</string>
   <string name="refuse">Verweigern</string>
+  <string name="block">Sperren</string>
+  <string name="contact_request_title">Ausstehende Kontaktanfrage</string>
+  <string name="contact_request_msg">Sie haben %1$s ausstehende Kontaktanfragen</string>
+  <string name="contact_request_account">Für %1$s</string>
+  <string name="no_requests">0 Kontaktanfragen</string>
   <!--Send contact requests-->
   <string name="send_request_button">Senden</string>
+  <string name="send_request_title">Sende eine Kontaktanfrage</string>
+  <string name="send_request_msg">Sie müssen eine Kontaktanfrage senden, um mit diesem Benutzer zu kommunizieren. Solange Ihr Kontakt die Anforderung nicht akzeptiert hat, können Sie Nachrichten senden, aber Ihr Kontakt kann diese nicht lesen.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 gesperrte Kontakte</string>
+  <!--Smartlist-->
 </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 377bc4a..7c69dfc 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
@@ -3,9 +3,11 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Löschen</string>
   <string name="ic_advanced_menu">Erweiterte Einstellungen</string>
+  <string name="ic_blacklist_menu">Gesperrte Kontakte</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Ring-Konto hinzufügen</string>
   <string name="add_sip_account_title">SIP-Konto hinzufügen</string>
+  <string name="ring_account_default_name">Ring-Konto %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Rechnername</string>
   <string name="prompt_username">Benutzername</string>
@@ -33,6 +35,13 @@
   <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>
+  <string name="account_device_revoke">Gerät widerrufen</string>
+  <string name="account_device_revocation_success_title">Erfolgreich</string>
+  <string name="account_device_revocation_success">Gerät wird jetzt widerrufen!</string>
+  <string name="account_device_revocation_error_title">Gerät konnte nicht widerrufen werden</string>
+  <string name="account_device_revocation_wrong_password">Falsches Passwort.</string>
+  <string name="account_device_revocation_unknown_device">Unbekanntes Gerät.</string>
+  <string name="account_device_revocation_error_unknown">Unbekannter Fehler.</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allgemein</string>
   <string name="account_basic_category">Grundlegende Einstellungen</string>
@@ -58,6 +67,7 @@
   <string name="account_video_enable">Video aktivieren</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Erweitert</string>
+  <string name="account_dht_public_in_calls_label">Erlaube alle Anrufe/Nachrichten</string>
   <string name="account_registration_exp_label">Registrierung abgelaufen</string>
   <string name="account_local_interface_label">Lokale Schnittstelle</string>
   <string name="account_local_port_label">Lokaler Port</string>
@@ -160,6 +170,7 @@
   <string name="register_username">Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</string>
   <string name="username_already_taken">Dieser Benutzername ist bereits vergeben</string>
   <string name="invalid_username">Ungültiger Benutzername</string>
+  <string name="looking_for_username_availability">Prüfe, ob der Benutzername verfügbar ist...</string>
   <string name="account_status_connecting">Verbindet</string>
   <string name="account_status_connection_error">Verbindungsfehler</string>
   <string name="account_status_online">Online</string>
@@ -172,6 +183,16 @@
   <string name="account_link_title">Verbinde diese Gerät</string>
   <string name="account_sip_cannot_be_registered">Konto kann nicht registriert werden</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">Passwort zur Bestätigung eingeben</string>
   <string name="enter_password">Passwort eingeben</string>
+  <string name="revoke_device_title">Gerät widerrufen</string>
+  <string name="revoke_device_message">Sind Sie sich sicher, dass Sie %1$s widerrufen wollen?</string>
   <string name="revoke_device_wait_title">Bitte warten…</string>
+  <string name="revoke_device_wait_message">Gerät wird widerrufen</string>
+  <string name="rename_device_title">Gerät umbenennen</string>
+  <string name="rename_device_message">Wählen Sie einen neuen Namen für dieses Gerätes zur Zuordnung in ihrem Ring-Konto</string>
+  <string name="rename_device_button">Gerät umbenennen</string>
+  <string name="account_rename_device_hint">Wählen Sie einen neuen Gerätenamen</string>
+  <string name="account_device_name_empty">Geräte darf nicht leer sein</string>
+  <string name="account_device_this_indicator">dieses Gerät</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_content_description.xml b/ring-android/app/src/main/res/values-de/strings_content_description.xml
index ff740b8..ed09b0d 100644
--- a/ring-android/app/src/main/res/values-de/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-de/strings_content_description.xml
@@ -3,5 +3,6 @@
   <!--Strings for xml content description of images-->
   <string name="contact_quick_call_description">Jetzt anrufen</string>
   <string name="contact_picture_description">Profilbild</string>
-  <string name="dial_numeric_pad">Numerische Wähltastatur</string>
+  <string name="dial_numeric_pad">Nummerische Wähltastatur</string>
+  <string name="contact_unblock">Entsperren</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 32a4f49..f4bc5e4 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Το Ring είναι δωρεάν/ελεύθερο λογισμικό αναπτυγμένο και υποστηριζόμενο από</string>
   <string name="copyright_section">Πνευματική ιδιοκτησία</string>
   <string name="contribute_section">Πρόσφερε</string>
   <string name="version_section">Έκδοση</string>
   <string name="no_email_app_installed">Δεν βρέθηκε κάποια εφαρμογή email, εγκαταστήστε μια για μας στείλετε μια αναφορά</string>
   <string name="email_chooser_title">Αποστολή email σε χρήση...</string>
+  <string name="credits">Μονάδες</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Καμία σύνδεση στο δίκτυο</string>
@@ -111,4 +114,6 @@
   <!--Pending contact requests-->
   <!--Send contact requests-->
   <string name="send_request_button">Αποστολή</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 8361975..557ea13 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -1,6 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="version_section">Eldono</string>
+  <string name="description">Ring estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj.</string>
+  <string name="credits">Kredito</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Sen reta konekto</string>
@@ -106,4 +110,6 @@
   <string name="refuse">Rifuzi</string>
   <!--Send contact requests-->
   <string name="send_request_button">Sendi</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 3f0b8b1..dae6d82 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="section_license">Licencia</string>
   <string name="sponsor_section">Ring es un software libre desarrollado y mantenido por</string>
   <string name="copyright_section">Copyright</string>
@@ -8,6 +9,9 @@
   <string name="no_email_app_installed">No se ha encontrado ninguna aplicación de correo. Instala una para enviarnos el informe</string>
   <string name="no_browser_app_installed">No se ha encontrado un navegador, instale uno para poder ver esta página</string>
   <string name="email_chooser_title">Enviar correo usando...</string>
+  <string name="description">Ring es software libre de comunicaciones que respeta las libertades y privacidad de sus usuarios.</string>
+  <string name="credits">Créditos</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Sin conexión a la red</string>
@@ -130,4 +134,6 @@
   <string name="refuse">No aceptar</string>
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 eb7679b..7d648b3 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">بازخورد</string>
   <string name="report">برایمان رایانامه‌ای بفرستید</string>
   <string name="section_license">مجوز</string>
@@ -13,6 +14,8 @@
   <string name="website_chooser_title">دیدن پایگاه وب با…</string>
   <string name="license">این نرم‌افزار همان‌گونه که هست، بدون هرنوع ضمانت فراهم شده است،
 برای جزئیات، نگارش ۳ یا بالاتر پروانهٔ جامع همگانی گنو را ببینید</string>
+  <string name="description">رینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد.</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">رینگ</string>
   <string name="error_no_network">بدون اتصال شبکه</string>
@@ -29,6 +32,7 @@
   <string name="menu_item_accounts">مدیریت حساب‌ها</string>
   <string name="menu_item_settings">تنظیمات</string>
   <string name="menu_item_share">هم‌رسانی اطّلاعات تماس</string>
+  <string name="menu_item_blacklist">مخاطبین مسدود شده</string>
   <string name="menu_item_about">دربارهٔ رینگ</string>
   <!--Dialing Fragment-->
   <string name="dial_number">تماس با یک شماره</string>
@@ -131,4 +135,6 @@
   <string name="generic_error_migration_message">هنگام مهاجرت، خطایی رخ داد</string>
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 473ce48..a1cd0d3 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
@@ -3,9 +3,11 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">حذف</string>
   <string name="ic_advanced_menu">تنظیمات پیش‌رفته</string>
+  <string name="ic_blacklist_menu">مخاطبین مسدود شده</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">افزودن حساب کاربری رینگ</string>
   <string name="add_sip_account_title">افزودن حساب کاربری سیپ</string>
+  <string name="ring_account_default_name">حساب کاربری رینگ %1$s</string>
   <string name="prompt_alias">نام مستعار</string>
   <string name="prompt_hostname">نام میزبان</string>
   <string name="prompt_username">نام کاربری</string>
@@ -33,6 +35,13 @@
   <string name="empty_account_list">هیچ حسابی ثبت نشده</string>
   <string name="normal_accounts_titles">حساب‌ها</string>
   <string name="normal_devices_titles">افزاره‌های شناخته شدهٔ پیوسته به این حساب رینگ</string>
+  <string name="account_device_revoke">باطل کردن دستگاه</string>
+  <string name="account_device_revocation_success_title">با موفقیت انجام شد</string>
+  <string name="account_device_revocation_success">دستگاه در حال حاضر باطل شد!</string>
+  <string name="account_device_revocation_error_title">نمی توان دستگاه را باطل کرد!</string>
+  <string name="account_device_revocation_wrong_password">کلمه عبور اشتباه است.</string>
+  <string name="account_device_revocation_unknown_device">دستگاه ناشناس.</string>
+  <string name="account_device_revocation_error_unknown">خطای ناشناخته.</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">عمومی</string>
   <string name="account_basic_category">تنظیمات پایه</string>
@@ -58,6 +67,7 @@
   <string name="account_video_enable">فعّال کردن ویدیو</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">پیش‌رفته</string>
+  <string name="account_dht_public_in_calls_label">دسترسی همه تماس ها / پیام ها</string>
   <string name="account_registration_exp_label">ثبت‌نام منقضی شد</string>
   <string name="account_local_interface_label">واسط محلّی</string>
   <string name="account_local_port_label">درگاه محلّی</string>
@@ -133,6 +143,7 @@
   <string name="account_device_added_message">حساب رینگتان را موفقّیت روی این افزاره برپا کردید.</string>
   <string name="account_device_updated_title">حساب افزاره به‌روز شد</string>
   <string name="account_device_updated_message">با موفّقیت حساب رینگتان را به‌روز کردید.</string>
+  <string name="account_cannot_be_updated_message">دستگاه نمی تواند به روز رسانی شود. لطفا کلمه عبور خود را چک نمایید.</string>
   <string name="account_sip_success_title">حساب سیپ ثبت شد</string>
   <string name="account_sip_success_message">حساب سیپتان را با موفّقیت ثبت کردید</string>
   <string name="account_sip_register_anyway">در هر صورت ثبت نام کن</string>
@@ -159,6 +170,7 @@
   <string name="register_username">ثبت نام کاربری عمومی (آزمایشی)</string>
   <string name="username_already_taken">نام کاربری قبلاً برداشته شده</string>
   <string name="invalid_username">نام کاربری نامعتبر</string>
+  <string name="looking_for_username_availability">در حال جستجو برای در دسترس بودن نام کاربری ...</string>
   <string name="account_status_connecting">در حال اتّصال</string>
   <string name="account_status_connection_error">خطای ارتباط</string>
   <string name="account_status_online">برخط</string>
@@ -171,6 +183,16 @@
   <string name="account_link_title">پیوند این افزاره</string>
   <string name="account_sip_cannot_be_registered">نمی‌توان حساب را ثبت کرد</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">رمز عبور خود را مجددا وارد نمایید</string>
   <string name="enter_password">گذرواژه را وارد کنید</string>
+  <string name="revoke_device_title">باطل کردن دستگاه</string>
+  <string name="revoke_device_message">شماره مطمعن هستید که میخواهید %1$s را باطل کنید ؟</string>
   <string name="revoke_device_wait_title">لطفاً صبر کنید…</string>
+  <string name="revoke_device_wait_message">در حال باطل کردن دستگاه</string>
+  <string name="rename_device_title">تغییر نام این دستگاه</string>
+  <string name="rename_device_message">یک نام جدید را انتخاب کنید برای شناسایی این دستگاه در حساب کاربری رینگ</string>
+  <string name="rename_device_button">تغییر نام دستگاه</string>
+  <string name="account_rename_device_hint">انتخاب نام جدید برای دستگاه </string>
+  <string name="account_device_name_empty">نام دستگاه نمیتواند خالی باشد</string>
+  <string name="account_device_this_indicator">این دستگاه</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
index 690650e..1606879 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
@@ -31,6 +31,9 @@
     <string name="call_human_state_hold">نگه داشتن</string>
     <string name="call_human_state_unhold">در حال انتظار</string>
     <string name="call_human_state_none">هیچ‌کدام</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">اتصال برقرار شد</string>
+    <string name="conference_human_state_active_detached">اتصال قطع شد</string>
     <string name="conference_human_state_hold">نگه داشتن</string>
     <string name="conference_human_state_default">هیچ‌کدام</string>
 </resources>
\ No newline at end of file
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 a9347d7..ab791a2 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring on vapaa ohjelma jonka on kehittänyt ja jota tukee</string>
   <string name="copyright_section">Tekijänoikeus</string>
   <string name="contribute_section">Tuo panoksesi</string>
   <string name="version_section">Versio</string>
   <string name="no_email_app_installed">Sähköpostiohjelmaa ei löydetty, asenna sellainen lähettääksesi meille raportin</string>
   <string name="email_chooser_title">Lähetä sähköpostia käyttäen...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ei verkkoyhteyttä</string>
@@ -112,4 +114,6 @@
   <string name="refuse">Kieltäydy</string>
   <!--Send contact requests-->
   <string name="send_request_button">Lähetä</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 d0451d3..1c9e5af 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Commentaires</string>
   <string name="report">Contactez-nous par courriel</string>
   <string name="section_license">Licence</string>
@@ -13,6 +14,8 @@
   <string name="website_chooser_title">Visualiser le site web en utilisant...</string>
   <string name="license">Ce logiciel est fourni \"tel quel\", sans garantie d\'aucune sorte. Pour les détails, consulter
 &lt;u&gt;GNU General Public License version 3 ou plus&lt;/u&gt;</string>
+  <string name="credits">Crédits</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Aucune connectivité réseau</string>
@@ -136,4 +139,6 @@
   <string name="generic_error_migration_message">Une erreur s\'est produite durant la migration.</string>
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index 764d058..2675568 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring est un logiciel open-source développé et supporté par </string>
   <string name="copyright_section">droit d\'auteur</string>
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
   <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, merci d\'installer un logiciel de messagerie pour nous envoyer un rapport</string>
   <string name="email_chooser_title">Envoyer un courriel en utilisant...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Aucune connexion au réseau n\'est possible</string>
@@ -127,4 +129,6 @@
   <string name="accept">Accepter</string>
   <string name="refuse">Refuser</string>
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 5d57cee..7ce5fa7 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -1,11 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring est un logiciel libre développé et soutenu par</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
   <string name="no_email_app_installed">Application d\'envoi de courriel non-trouvée, installez-en un et renvoyez-nous votre rapport</string>
   <string name="email_chooser_title">Envoi du courriel à travers ...</string>
+  <string name="description">Ring est un logiciel libre de communication universelle qui respecte les libertés et la vie privée de ses utilisateurs.</string>
+  <string name="credits">Crédits</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Pas d\'accès au réseau</string>
@@ -125,4 +129,6 @@
   <string name="refuse">Refuser</string>
   <!--Send contact requests-->
   <string name="send_request_button">Envoyer</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 a12692f..480ecd1 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="version_section">גרסא</string>
+  <string name="credits">תודות</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">אין חיבוריות רשת</string>
@@ -52,4 +55,6 @@
   <string name="accept">קבל</string>
   <!--Send contact requests-->
   <string name="send_request_button">שלח</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 a3c74a4..e623322 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Povratna informacija</string>
   <string name="report">&lt;u&gt;Pošaljite nam email&lt;/u&gt;</string>
   <string name="section_license">Licenca</string>
@@ -8,7 +9,11 @@
   <string name="contribute_section">Doprinesite</string>
   <string name="version_section">Verzija</string>
   <string name="no_email_app_installed">Nijedna email aplikacija nije pronađena, instalairajte jednu da biste nam poslali izvješće</string>
+  <string name="no_browser_app_installed">NIje pronađen nijedan web preglednik, instalirajte jadan da biste visjeli stranicu</string>
   <string name="email_chooser_title">Pošalji mail koristeći...</string>
+  <string name="website_chooser_title">Pogledaj web stranicu koristeći...</string>
+  <string name="credits">Zasluge</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Veza nedostupna</string>
@@ -22,6 +27,8 @@
   <string name="menu_item_home">Glavni meni</string>
   <string name="menu_item_accounts">Upravljaj računima</string>
   <string name="menu_item_settings">Postavke</string>
+  <string name="menu_item_share">Dijeli moj kontakt</string>
+  <string name="menu_item_blacklist">Blokirani kontakti</string>
   <string name="menu_item_about">O Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Pozovi broj</string>
@@ -46,6 +53,8 @@
   <string name="transfer_to_another_call">Prenesi na drugi razgovor:</string>
   <string name="transfer_no_other_call">Nema dolazećih poziva</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Propušteni dolazni poziv</string>
+  <string name="notif_missed_outgoing_call">Propušteni odlazni poziv</string>
   <string name="notif_incoming_call_title">Dolazni poziv od %1$s</string>
   <string name="notif_incoming_call">Dolazni poziv</string>
   <string name="notif_outgoing_call_title">Odlazni poziv za %1$s</string>
@@ -99,6 +108,7 @@
   <string name="conversation_action_copy_peer_number">Kopiraj broj</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopiran u međuspremnik</string>
   <string name="conversation_action_select_peer_number">Odaberite broj</string>
+  <string name="conversation_action_block_this">Blokiraj ovaj kontakt</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</string>
   <string name="prompt_new_password">Nova lozinka</string>
@@ -113,12 +123,19 @@
   <string name="profile">Moj profil</string>
   <string name="profile_message_warning">Vaš profil je podjeljen samo sa vašim kontaktima</string>
   <string name="open_the_gallery">Otvorite galeriju</string>
+  <string name="take_a_photo">Fotografiraj</string>
   <string name="unknown">Nepoznato</string>
   <!--Share fragment-->
+  <string name="share_message_no_account">Molim odaberite račun za djeljenje</string>
   <string name="generic_error_migration">Greška</string>
   <!--Pending contact requests-->
   <string name="accept">Prihvati</string>
   <string name="refuse">Odbij</string>
+  <string name="block">Blokiraj</string>
+  <string name="contact_request_account">Za %1$s</string>
   <!--Send contact requests-->
   <string name="send_request_button">Pošalji</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 blokiranih kontakata</string>
+  <!--Smartlist-->
 </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 e0ed7d0..f4fb8b5 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
@@ -3,6 +3,7 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Izbriši</string>
   <string name="ic_advanced_menu">Napredne postavke</string>
+  <string name="ic_blacklist_menu">Blokirani kontakti</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Dodaj Ring račun</string>
   <string name="add_sip_account_title">Dodajte SIP račun</string>
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 3e12a2e..3838019 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">A Ring egy szabad szoftver, amelynek fejlesztője és támogatója:</string>
   <string name="copyright_section">Jogvédelem</string>
   <string name="contribute_section">Hozzájárulás</string>
   <string name="version_section">Verzió</string>
   <string name="no_email_app_installed">Nem találtam emailalkalmazást. Telepítsen egyet, hogy jelentést tudjon küldeni nekünk!</string>
   <string name="email_chooser_title">Levél küldése a következővel…</string>
+  <string name="credits">Készítők</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Nincs hálózati csatlakozás</string>
@@ -119,4 +122,6 @@
   <!--Pending contact requests-->
   <!--Send contact requests-->
   <string name="send_request_button">Elküld</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 302233a..c7803f7 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -1,6 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
+  <string name="feedback_section">Umpan balik</string>
+  <string name="report">&lt;u&gt;Kirim email kepada kami&lt;/u&gt;</string>
+  <string name="section_license">Lisensi</string>
+  <string name="sponsor_section">Ring adalah perangkat lunak bebas yang dikembangkan dan didukung oleh</string>
+  <string name="copyright_section">Hak cipta</string>
+  <string name="contribute_section">Berkontribusi</string>
+  <string name="version_section">Versi</string>
+  <string name="no_email_app_installed">Aplikasi email tidak ditemukan, silakan pasang salah satu untuk mengirimkan laporan kepada kami</string>
+  <string name="no_browser_app_installed">Aplikasi peramban tidak ditemukan, silakan pasang salah satu untuk melihat halaman ini</string>
+  <string name="email_chooser_title">Kirim email menggunakan...</string>
+  <string name="website_chooser_title">Lihat halaman menggunakan...</string>
+  <!--About dialog-->
   <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
   <!--AB menus-->
   <!--Left Drawer-->
   <!--Accessibility-->
@@ -14,20 +28,86 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <!--Call Fragment-->
+  <string name="start_error_title">Tidak dapat menjalankan Ring !</string>
+  <string name="start_error_mic_required">Ring memerlukan izin mikropon agar dapat bekerja.</string>
+  <string name="action_call_accept">Terima panggilan</string>
+  <string name="action_call_decline">Tolak</string>
+  <string name="ab_action_speakerphone">Aktifkan pengeras suara</string>
+  <string name="ab_action_contact_add">Tambah sebagai kontak</string>
+  <string name="ab_action_contact_add_question">Tambahkan sebagai kontak ?</string>
+  <string name="ab_action_audio_call">Panggilan suara</string>
+  <string name="ab_action_video_call">Panggilan video</string>
+  <string name="ab_action_change_screen_orientation">Ganti orientasi layar</string>
+  <string name="share_via">Bagikan melalui</string>
+  <string name="write_a_message">Tulis pesan</string>
+  <string name="scan_qr">Pindai QR Code</string>
+  <string name="ab_action_flipcamera">Tukar kamera</string>
   <!--Text messages-->
+  <string name="send_message">Kirim pesan</string>
+  <string name="message_sending">Mengirimkan pesan...</string>
+  <string name="time_just_now">Baru saja</string>
+  <string name="permission_read_denied">Aplikasi ini tidak diizinkan membaca ruang peyimpanan Anda. Sehingga tidak dapat bekerja sebagaimana mestinya.</string>
   <!--MediaPreferenceFragment-->
-  <string name="ringtone_error_title">Eror</string>
+  <string name="permission_dialog_camera_title">Izin kamera</string>
+  <string name="permission_dialog_camera_message">Percakapan video memerlukan izin kamera agar dapat bekerja.</string>
+  <string name="ringtone_error_title">Galat</string>
+  <string name="ringtone_error_format_not_supported">Format tidak didukung.</string>
+  <string name="ringtone_error_size_too_big">Ukuran berkas terlalu besar. Ukuran maksimal adalah %1$ikB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring memerlukan izin \"Baca kontak\" untuk mengaktifkan fitur ini.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring memerlukan izin \"Tulis log panggilan\" untuk mengaktifkan fitur ini.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Pindai QR Code dari akun yang ingin Anda tambahkan.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Hapus riwayat ?</string>
+  <string name="clear_history_dialog_message">Aksi ini tidak dapat dibatalkan.</string>
+  <string name="clear_history_completed">Riwayat telah dihapus.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Hapus percakapan ini</string>
+  <string name="conversation_action_delete_this_title">Hapus percakapan ini ?</string>
+  <string name="conversation_action_delete_this_message">Aksi ini tidak dapat dibatalkan.</string>
+  <string name="conversation_action_copy_peer_number">Salin nomor</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s telah disalin</string>
+  <string name="conversation_action_select_peer_number">Pilih nomor</string>
+  <string name="conversation_action_block_this">Blokir kontak ini</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Tambah %1$s ?</string>
+  <string name="prompt_new_password">Kata sandi baru</string>
+  <string name="prompt_new_password_repeat">Ulangi kata sandi baru</string>
+  <string name="account_create_title">Buat akun Ring</string>
+  <string name="prompt_new_username">Masukkan username baru</string>
+  <string name="help_password_choose">Pilih kata sandi kuat yang akan Anda ingat untuk melindungi akun Ring Anda.</string>
+  <string name="help_password_enter">Masukkan kata sandi akun Ring Anda</string>
+  <string name="help_pin_enter">Masukkan PIN dari akun Ring lainnya. Gunakan fitur \"ekspor akun Ring\" untuk mendapatkan PIN.</string>
+  <string name="wizard_next">Selanjutnya</string>
+  <string name="wizard_back">Kembali</string>
   <!--MenuHeaderView-->
+  <string name="profile">Profil saya</string>
+  <string name="profile_message_warning">Profil Anda hanya dibagikan kepada kontak Anda</string>
+  <string name="open_the_gallery">Buka galeri</string>
+  <string name="take_a_photo">Ambil foto</string>
+  <string name="profile_name_hint">Masukkan nama Anda (opsional)</string>
   <string name="unknown">Tidak diketahui</string>
   <!--Share fragment-->
-  <string name="generic_error_migration">Eror</string>
+  <string name="share_message">Pindai QRCode ini menggunakan pemindai yang tersedia pada aplikasi Ring.</string>
+  <string name="share_message_no_account">Silakan pilih akun untuk dibagikan.</string>
+  <string name="share_your_account_information">Bagikan informasi kontak saya</string>
+  <string name="generic_error_migration">Galat</string>
+  <string name="generic_error_migration_message">Galat terjadi selama proses migrasi</string>
   <!--Pending contact requests-->
   <string name="accept">Terima</string>
+  <string name="refuse">Tolak</string>
+  <string name="block">Blokir</string>
+  <string name="contact_request_title">Permintaan kontak</string>
+  <string name="contact_request_msg">Anda memiliki %1$s permintaan kontak</string>
+  <string name="contact_request_account">Untuk %1$s</string>
+  <string name="no_requests">0 permintaan kontak</string>
   <!--Send contact requests-->
+  <string name="send_request_button">Kirim</string>
+  <string name="send_request_title">Kirim permintaan kontak</string>
+  <string name="send_request_msg">Anda harus mengirimkan permintaan kontak agar dapat berkomunikasi dengan pengguna berikut. Selama pengguna tersebut belum menerima permintaan kontak, Anda dapat mengirimkan pesan namun pesan tersebut tidak akan terbaca.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 kontak diblokir</string>
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/ring-android/app/src/main/res/values-id/strings_account.xml
index afeb7ab..737d325 100644
--- a/ring-android/app/src/main/res/values-id/strings_account.xml
+++ b/ring-android/app/src/main/res/values-id/strings_account.xml
@@ -3,6 +3,7 @@
   <!--Strings related to account edition screen-->
   <!--Strings related to account creation-->
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Aksi ini tidak dapat dibatalkan.</string>
   <!--AccountManagementFragment-->
   <!--Basic Details-->
   <!--Audio Details-->
@@ -14,6 +15,7 @@
   <!--TLS Details-->
   <!--restore/backup-->
   <string name="account_export_end_error_title">Eror</string>
+  <string name="account_new_button">Buat akun Ring</string>
   <!--Name registration-->
   <string name="account_status_unknown">Tidak diketahui</string>
   <!--Create account-->
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 9c4e4d5..e451d26 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Feedback</string>
   <string name="report">&lt;u&gt;Mandaci un\'e-mail&lt;/u&gt;</string>
   <string name="section_license">Licenza</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Visualizza sito web con...</string>
   <string name="license">Questo software è fornito \"così com\'è\", senza alcun genere di garanzia. Per ulteriori dettagli, si veda
 &lt;u&gt;GNU General Public License versione 3 o successive&lt;/u&gt;</string>
+  <string name="description">Ring è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.</string>
+  <string name="credits">Crediti</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Assenza di connessione di rete</string>
@@ -135,4 +139,6 @@
   <string name="refuse">Rifiuto</string>
   <!--Send contact requests-->
   <string name="send_request_button">Invia</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 ff17395..e03028a 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring è un software libero sviluppato e supportato da</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuisci</string>
   <string name="version_section">Versione</string>
   <string name="no_email_app_installed">Applicazione email non trovata, installane una per inviarci un rapporto</string>
   <string name="email_chooser_title">Mandaci un\'email usando...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Connessione di rete assente</string>
@@ -124,4 +126,6 @@
   <string name="accept">Accettare</string>
   <!--Send contact requests-->
   <string name="send_request_button">Mandare</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 88315a8..65765e0 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">フィードバック</string>
   <string name="report">&lt;u&gt;私たちにメールを送る&lt;/u&gt;</string>
   <string name="section_license">ライセンス</string>
@@ -13,6 +14,8 @@
   <string name="website_chooser_title">Webサイトを表示…</string>
   <string name="license">このソフトウェアは、現状のまま提供され、いかなる種類の保証もありません。 詳細は以下を参照してください。
 &lt;u&gt;GNU General Public License version 3 以降&lt;/u&gt;</string>
+  <string name="credits">クレジット</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">ネットワーク接続がありません</string>
@@ -26,9 +29,11 @@
   <string name="drawer_close">ナビゲーションドロワーを閉じる</string>
   <!--Sections-->
   <string name="menu_item_home">ホーム</string>
+  <string name="menu_item_contact_request">連絡先のリクエスト</string>
   <string name="menu_item_accounts">アカウント管理</string>
   <string name="menu_item_settings">設定</string>
   <string name="menu_item_share">連絡先を共有</string>
+  <string name="menu_item_blacklist">ブロックした連絡先</string>
   <string name="menu_item_about">Ring について</string>
   <!--Dialing Fragment-->
   <string name="dial_number">電話番号を入力</string>
@@ -53,6 +58,8 @@
   <string name="transfer_no_other_call">他に保留中の通話はありません</string>
   <string name="transfer_type_number">転送先の番号を入力してください:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">不在着信</string>
+  <string name="notif_missed_outgoing_call">不在発信</string>
   <string name="notif_incoming_call_title">%1$s から着信</string>
   <string name="notif_incoming_call">着信</string>
   <string name="notif_outgoing_call_title">%1$s への発信</string>
@@ -109,6 +116,7 @@
   <string name="conversation_action_copy_peer_number">番号をコピー</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s をクリップボードにコピーしました</string>
   <string name="conversation_action_select_peer_number">番号を選択</string>
+  <string name="conversation_action_block_this">この連絡先をブロック</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s を追加しますか ?</string>
   <string name="prompt_new_password">新しいパスワード</string>
@@ -134,5 +142,18 @@
   <string name="generic_error_migration">エラー</string>
   <string name="generic_error_migration_message">移行中にエラーが発生しました。</string>
   <!--Pending contact requests-->
+  <string name="accept">受け入れ</string>
+  <string name="refuse">拒否</string>
+  <string name="block">ブロック</string>
+  <string name="contact_request_title">保留中の連絡先リクエスト</string>
+  <string name="contact_request_msg">%1$s の保留中のリクエストがあります</string>
+  <string name="contact_request_account">%1$s に</string>
+  <string name="no_requests">0 の連絡先リクエスト</string>
   <!--Send contact requests-->
+  <string name="send_request_button">送信</string>
+  <string name="send_request_title">連絡先リクエストを送信</string>
+  <string name="send_request_msg">このユーザーと通信するために連絡先のリクエストを送信する必要があります。 連絡先がリクエストを受け入れない限り、メッセージは送信できますが、連絡先はメッセージを読むことはできません。</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 のブロックした連絡先</string>
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 35f4356..1b3d0d2 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -3,9 +3,11 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">削除</string>
   <string name="ic_advanced_menu">詳細設定</string>
+  <string name="ic_blacklist_menu">ブロックした連絡先</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Ringアカウントを追加</string>
   <string name="add_sip_account_title">SIPアカウントを追加</string>
+  <string name="ring_account_default_name">Ring アカウント %1$s</string>
   <string name="prompt_alias">別名</string>
   <string name="prompt_hostname">ホスト名</string>
   <string name="prompt_username">ユーザー名</string>
@@ -33,6 +35,13 @@
   <string name="empty_account_list">アカウントが登録されていません</string>
   <string name="normal_accounts_titles">アカウント</string>
   <string name="normal_devices_titles">既知のデバイスがこのRingアカウントにリンクされています</string>
+  <string name="account_device_revoke">デバイスを取り消し</string>
+  <string name="account_device_revocation_success_title">成功</string>
+  <string name="account_device_revocation_success">デバイスを取り消しました!</string>
+  <string name="account_device_revocation_error_title">デバイスを取り消しできません</string>
+  <string name="account_device_revocation_wrong_password">パスワードが間違っています。</string>
+  <string name="account_device_revocation_unknown_device">不明なデバイス。</string>
+  <string name="account_device_revocation_error_unknown">不明なエラー。</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">全般</string>
   <string name="account_basic_category">基本設定</string>
@@ -58,6 +67,7 @@
   <string name="account_video_enable">動画を有効化</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">詳細</string>
+  <string name="account_dht_public_in_calls_label">すべての着信/メッセージを許可</string>
   <string name="account_registration_exp_label">登録の有効期限切れ</string>
   <string name="account_local_interface_label">ローカルインターフェイス</string>
   <string name="account_local_port_label">ローカルポート</string>
@@ -160,6 +170,7 @@
   <string name="register_username">公開ユーザー名を登録 (実験的)</string>
   <string name="username_already_taken">名前はすでに取得されています</string>
   <string name="invalid_username">無効なユーザー名</string>
+  <string name="looking_for_username_availability">利用可能なユーザー名を検索中…</string>
   <string name="account_status_connecting">接続中</string>
   <string name="account_status_connection_error">接続エラー</string>
   <string name="account_status_online">オンライン</string>
@@ -172,6 +183,16 @@
   <string name="account_link_title">このデバイスをリンク</string>
   <string name="account_sip_cannot_be_registered">アカウントを登録できません</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">確認のパスワードを入力</string>
   <string name="enter_password">パスワードを入力してください</string>
+  <string name="revoke_device_title">デバイスを取り消し</string>
+  <string name="revoke_device_message">%1$s を取り消してもよろしいですか？</string>
   <string name="revoke_device_wait_title">しばらくお待ちください…</string>
+  <string name="revoke_device_wait_message">デバイスを取り消し中</string>
+  <string name="rename_device_title">このデバイスの名前を変更</string>
+  <string name="rename_device_message">Ring アカウントでこのデバイスを識別する新しい名前を選択してください</string>
+  <string name="rename_device_button">デバイスの名前を変更</string>
+  <string name="account_rename_device_hint">新しいデバイス名を選択</string>
+  <string name="account_device_name_empty">デバイス名は空にできません</string>
+  <string name="account_device_this_indicator">このデバイス</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_content_description.xml b/ring-android/app/src/main/res/values-ja/strings_content_description.xml
index 7af3b4e..dc000f8 100644
--- a/ring-android/app/src/main/res/values-ja/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">クイック通話</string>
   <string name="contact_picture_description">連絡先の写真</string>
   <string name="dial_numeric_pad">数字ダイヤルパッド</string>
+  <string name="contact_unblock">ブロック解除</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 26a0202..7a6439f 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="section_license">Licencija</string>
   <string name="sponsor_section">Ring yra laisva programinė įranga, kurią kuria ir palaiko</string>
   <string name="copyright_section">Autorių Teisės</string>
@@ -9,6 +10,9 @@
   <string name="no_browser_app_installed">Nerasta jokios saityno naršyklės programėlės, įdiekite kurią nors, kad peržiūrėtumėte šį puslapį</string>
   <string name="email_chooser_title">Siųsti paštą, naudojant...</string>
   <string name="website_chooser_title">Rodyti svetainę, naudojant...</string>
+  <string name="description">Ring yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą.</string>
+  <string name="credits">Padėkos</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Nėra tinklo ryšio</string>
@@ -112,4 +116,6 @@
   <string name="refuse">Atmesti</string>
   <!--Send contact requests-->
   <string name="send_request_button">Siųsti</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 9c66b7f..185f9d4 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
@@ -4,6 +4,9 @@
   <string name="ic_delete_menu">Ištrinti</string>
   <string name="ic_advanced_menu">Išplėstiniai nustatymai</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Pridėti Ring paskyrą</string>
+  <string name="add_sip_account_title">Pridėti SIP paskyrą</string>
+  <string name="ring_account_default_name">Ring paskyra %1$s</string>
   <string name="prompt_alias">Slapyvardis</string>
   <string name="prompt_hostname">Kompiuterio vardas</string>
   <string name="prompt_username">Naudotojo vardas</string>
@@ -22,6 +25,7 @@
   <string name="account_type_ip2ip">IP paskyra</string>
   <string name="help_sip_title">Pridėti savo SIP paskyrą</string>
   <string name="help_sip">Konfigūruokite esamą SIP paskyrą.</string>
+  <string name="create_sip_account">Pridėti SIP paskyrą</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.</string>
@@ -29,6 +33,10 @@
   <string name="empty_account_list">Nėra užregistruotų paskyrų</string>
   <string name="normal_accounts_titles">Paskyros</string>
   <string name="normal_devices_titles">Žinomi, su šia Ring paskyra susieti, įrenginiai</string>
+  <string name="account_device_revocation_success_title">Pavyko</string>
+  <string name="account_device_revocation_wrong_password">Neteisingas slaptažodis.</string>
+  <string name="account_device_revocation_unknown_device">Nežinomas įrenginys.</string>
+  <string name="account_device_revocation_error_unknown">Nežinoma klaida.</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Bendra</string>
   <string name="account_basic_category">Pagrindiniai nustatymai</string>
@@ -135,6 +143,7 @@
   <string name="register_username">Registruoti viešąjį naudotojo vardą (eksperimentinis)</string>
   <string name="username_already_taken">Naudotojo vardas jau užimtas</string>
   <string name="invalid_username">Neteisingas naudotojo vardas</string>
+  <string name="looking_for_username_availability">Tikrinamas naudotojo vardo prieinamumas...</string>
   <string name="account_status_connecting">Sujungiama</string>
   <string name="account_status_connection_error">Ryšio klaida</string>
   <string name="account_status_unknown">Nežinomas</string>
@@ -143,4 +152,8 @@
   <string name="account_creation_profile">Susikurkite savo profilį</string>
   <!--Devices-->
   <string name="revoke_device_wait_title">Prašome palaukti...</string>
+  <string name="rename_device_title">Pervadinti šį įrenginį</string>
+  <string name="rename_device_button">Pervadinti įrenginį</string>
+  <string name="account_device_name_empty">Įrenginio pavadinimas negali būti tuščias</string>
+  <string name="account_device_this_indicator">šis įrenginys</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index 15068c5..0cf75de 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring adalah aplikasi percuma yang dibangunkan dan disokong oleh</string>
   <string name="copyright_section">Hakcipta</string>
   <string name="contribute_section">Sumbangkan</string>
   <string name="version_section">Versi</string>
   <string name="no_email_app_installed">Tiada aplikasi emel ditemui, pasangkan satu untuk menghantar laporan kepada kami</string>
   <string name="email_chooser_title">Hantar email menggunakan…</string>
+  <string name="credits">Kredit</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Tiada sambungan rangkaian</string>
@@ -121,4 +124,6 @@
   <!--Pending contact requests-->
   <string name="accept">Terima</string>
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 c7f95aa..5828c31 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring er fri programvare utviklet og støttet av</string>
   <string name="copyright_section">Opphavsrett</string>
   <string name="contribute_section">Bidra</string>
   <string name="version_section">Versjon</string>
   <string name="no_email_app_installed">Fant ingen epost-app.  Installer en for å sende oss en rapport</string>
   <string name="email_chooser_title">Send epost vha...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Mangler nettverksforbindelse</string>
@@ -106,4 +108,6 @@
   <string name="accept">Aksepter</string>
   <!--Send contact requests-->
   <string name="send_request_button">Send</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 8187e01..4ccf597 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
@@ -1,9 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
   <string name="contribute_section">Bijdragen</string>
   <string name="version_section">Versie</string>
   <string name="no_email_app_installed">Geen emailapplicatie gevonden. Installeer deze om ons een rapportage toe te zenden</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Bellen</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
@@ -50,4 +52,6 @@
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 9e5c6cb..9060e0d 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Feedback</string>
   <string name="report">&lt;u&gt;Stuur ons een e-mail&lt;/u&gt;</string>
   <string name="section_license">Licentie</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Website bekijken met...</string>
   <string name="license">Deze software wordt \"als zodanig\" aangeboden zonder enige garantie. Bekijk voor meer informatie
 &lt;u&gt;GNU General Public License versie 3 of later&lt;/u&gt;</string>
+  <string name="description">Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.</string>
+  <string name="credits">Credits</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
@@ -26,9 +30,11 @@
   <string name="drawer_close">Navigatielade sluiten</string>
   <!--Sections-->
   <string name="menu_item_home">Thuis</string>
+  <string name="menu_item_contact_request">Contactverzoeken</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_blacklist">Geblokkeerde contacten</string>
   <string name="menu_item_about">Over Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Kies een nummer</string>
@@ -54,6 +60,8 @@
   <string name="transfer_no_other_call">Geen verdere oproepen in behandeling</string>
   <string name="transfer_type_number">Nummer ingeven om naar te versturen:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Gemiste inkomende oproep</string>
+  <string name="notif_missed_outgoing_call">Gemiste uitgaande oproep</string>
   <string name="notif_incoming_call_title">Inkomende oproep van %1$s</string>
   <string name="notif_incoming_call">Inkomende oproep</string>
   <string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
@@ -110,6 +118,7 @@
   <string name="conversation_action_copy_peer_number">Nummer kopiëren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s gekopieerd naar klembord</string>
   <string name="conversation_action_select_peer_number">Kies een nummer</string>
+  <string name="conversation_action_block_this">Contact blokkeren</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s toevoegen?</string>
   <string name="prompt_new_password">Nieuw wachtwoord</string>
@@ -137,6 +146,16 @@
   <!--Pending contact requests-->
   <string name="accept">Aanvaarden</string>
   <string name="refuse">Afwijzen</string>
+  <string name="block">Blokkeren</string>
+  <string name="contact_request_title">Contactverzoek in afwachting</string>
+  <string name="contact_request_msg">Je hebt %1$s verzoeken in afwachting</string>
+  <string name="contact_request_account">Voor %1$s</string>
+  <string name="no_requests">0 contactverzoeken</string>
   <!--Send contact requests-->
   <string name="send_request_button">Versturen</string>
+  <string name="send_request_title">Contactverzoek verzenden</string>
+  <string name="send_request_msg">Je moet een contactverzoek verzenden om met deze gebruiker te communiceren. Zolang je contact het verzoek niet aanvaardt zal deze de berichten die je stuurt niet kunnen lezen.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 geblokkeerde contacten</string>
+  <!--Smartlist-->
 </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 68ce229..32acc8f 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
@@ -3,9 +3,11 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Verwijderen</string>
   <string name="ic_advanced_menu">Geavanceerde instellingen</string>
+  <string name="ic_blacklist_menu">Geblokkeerde contacten</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Ring-account toevoegen</string>
   <string name="add_sip_account_title">SIP-account toevoegen</string>
+  <string name="ring_account_default_name">Ring-account %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostnaam</string>
   <string name="prompt_username">Gebruikersnaam</string>
@@ -33,6 +35,13 @@
   <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>
+  <string name="account_device_revoke">Apparaat terugtrekken</string>
+  <string name="account_device_revocation_success_title">Klaar</string>
+  <string name="account_device_revocation_success">Het apparaat is nu teruggetrokken!</string>
+  <string name="account_device_revocation_error_title">Kan apparaat niet terugtrekken</string>
+  <string name="account_device_revocation_wrong_password">Verkeerd wachtwoord.</string>
+  <string name="account_device_revocation_unknown_device">Onbekend apparaat.</string>
+  <string name="account_device_revocation_error_unknown">Onbekende fout.</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
   <string name="account_basic_category">Basisinstellingen</string>
@@ -58,6 +67,7 @@
   <string name="account_video_enable">Video inschakelen</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Geavanceerd</string>
+  <string name="account_dht_public_in_calls_label">Alle oproepen/berichten toestaan</string>
   <string name="account_registration_exp_label">Verval registratie</string>
   <string name="account_local_interface_label">Lokale interface</string>
   <string name="account_local_port_label">Lokale poort</string>
@@ -160,6 +170,7 @@
   <string name="register_username">Registreer een publieke gebruikersnaam (experimenteel)</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
+  <string name="looking_for_username_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd…</string>
   <string name="account_status_connecting">Verbinden</string>
   <string name="account_status_connection_error">Verbindingsfout</string>
   <string name="account_status_online">Online</string>
@@ -172,6 +183,16 @@
   <string name="account_link_title">Dit apparaat koppelen</string>
   <string name="account_sip_cannot_be_registered">Account kan niet geregistreerd worden</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">Voer wachtwoord in om te bevestigen</string>
   <string name="enter_password">Voer wachtwoord in</string>
+  <string name="revoke_device_title">Apparaat terugtrekken</string>
+  <string name="revoke_device_message">Weet je zeker dat je %1$s wil terugtrekken?</string>
   <string name="revoke_device_wait_title">Even geduld...</string>
+  <string name="revoke_device_wait_message">Apparaat wordt teruggetrokken</string>
+  <string name="rename_device_title">Dit apparaat hernoemen</string>
+  <string name="rename_device_message">Kies een nieuwe naam om dit apparaat te identificeren in je Ring-account</string>
+  <string name="rename_device_button">Apparaat hernoemen</string>
+  <string name="account_rename_device_hint">Kies een nieuwe apparaatnaam</string>
+  <string name="account_device_name_empty">Apparaatnaam kan niet leeg zijn</string>
+  <string name="account_device_this_indicator">dit apparaat</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_content_description.xml b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
index 3de32c3..247c917 100644
--- a/ring-android/app/src/main/res/values-nl/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">Snel bellen</string>
   <string name="contact_picture_description">Contactfoto</string>
   <string name="dial_numeric_pad">Numeriek toetsenbord</string>
+  <string name="contact_unblock">Deblokkeren</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 9220674..50db5e3 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">ਰਿੰਗ</string>
   <!--AB menus-->
@@ -31,4 +33,6 @@
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 d254b2e..39bd977 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <!--AB menus-->
@@ -28,4 +30,6 @@
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 89792c9..a02232a 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring jest wolnym oprogramowaniem stworzonym przez</string>
   <string name="copyright_section">Prawa autorskie</string>
   <string name="contribute_section">Współpracuj</string>
   <string name="version_section">Wersja</string>
   <string name="no_email_app_installed">Nie znaleziono aplikacji e-mail. Zainstaluj jedną aby wysłać nam raport.</string>
   <string name="email_chooser_title">Wyślij e-mail używając...</string>
+  <string name="credits">Podziękowania</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Brak połączenia z siecią</string>
@@ -114,4 +117,6 @@
   <string name="refuse">Odmów</string>
   <!--Send contact requests-->
   <string name="send_request_button">Wyślij</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 98c33f3..b2f7fd3 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Feedback</string>
   <string name="report">&lt;u&gt;Envie-nos um email&lt;/u&gt;</string>
   <string name="section_license">Licença</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Ver site utilizando...</string>
   <string name="license">Este software é disponibilizado \"no estado\", sem garantia de qualquer tipo. 
 Para maiores detalhes, consulte a &lt;u&gt;Licença GPL versão 3 ou mais recente&lt;/u&gt;</string>
+  <string name="description">Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários.</string>
+  <string name="credits">Créditos</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Sem conectividade</string>
@@ -26,9 +30,11 @@
   <string name="drawer_close">Fechar navegação</string>
   <!--Sections-->
   <string name="menu_item_home">Início</string>
+  <string name="menu_item_contact_request">Solicitações de contatos</string>
   <string name="menu_item_accounts">Gerenciar contas</string>
   <string name="menu_item_settings">Configurações</string>
   <string name="menu_item_share">Compartilhar meu contato</string>
+  <string name="menu_item_blacklist">Contatos bloqueados</string>
   <string name="menu_item_about">Sobre o Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Disque um número</string>
@@ -41,6 +47,7 @@
     <item quantity="one">%d Conversa</item>
     <item quantity="other">%d Conversas</item>
   </plurals>
+  <string name="home_transfering">Transferindo %1$s para %2$s</string>
   <string name="home_transfer_complet">Transferência completa</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">Nenhum contato encontrado</string>
@@ -53,6 +60,8 @@
   <string name="transfer_no_other_call">Nenhuma outra chamada pendente</string>
   <string name="transfer_type_number">Digite o número para transferir:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Chamadas recebidas perdidas</string>
+  <string name="notif_missed_outgoing_call">Chamadas efetuadas perdidas</string>
   <string name="notif_incoming_call_title">Chamada recebida de %1$s</string>
   <string name="notif_incoming_call">Chamada recebida</string>
   <string name="notif_outgoing_call_title">Chamada efetuada para %1$s</string>
@@ -76,6 +85,7 @@
   <string name="ab_action_contact_add_question">Adicionar aos contatos?</string>
   <string name="ab_action_audio_call">Voz da chamada</string>
   <string name="ab_action_video_call">Chamada de Vídeo</string>
+  <string name="ab_action_change_screen_orientation">Mudar orientação de tela</string>
   <string name="share_via">Compartilhar via</string>
   <string name="write_a_message">Escrever uma mensagem</string>
   <string name="scan_qr">Escanear QR Code</string>
@@ -108,6 +118,7 @@
   <string name="conversation_action_copy_peer_number">Copiar número</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado para área de transferência</string>
   <string name="conversation_action_select_peer_number">Selecione um numero</string>
+  <string name="conversation_action_block_this">Bloquear este contato</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
   <string name="prompt_new_password">Nova senha</string>
@@ -121,8 +132,10 @@
   <string name="wizard_back">Voltar</string>
   <!--MenuHeaderView-->
   <string name="profile">Meu perfil</string>
+  <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
+  <string name="profile_name_hint">Insira o seu nome (opcional)</string>
   <string name="unknown">Desconhecido</string>
   <!--Share fragment-->
   <string name="share_message">Escaneie o QRCode com o escaner embutido da aplicação Ring que deseja se comunicar com você.</string>
@@ -133,6 +146,16 @@
   <!--Pending contact requests-->
   <string name="accept">Aceitar</string>
   <string name="refuse">Recusar</string>
+  <string name="block">Bloquear</string>
+  <string name="contact_request_title">Solicitação de contato pendente</string>
+  <string name="contact_request_msg">Você tem %1$s solicitação pendentes</string>
+  <string name="contact_request_account">para %1$s</string>
+  <string name="no_requests">0 solicitações de contato</string>
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
+  <string name="send_request_title">Enviar uma solicitação de contato</string>
+  <string name="send_request_msg">Você deve enviar uma solicitação de contato para se comunicar com este usuário. Enquanto o contato não aceitar seu pedido, você pode enviar mensagens, mas ele não ira as ler.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 contatos bloqueados</string>
+  <!--Smartlist-->
 </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 df465a7..1f87308 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
@@ -3,6 +3,7 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Deletar</string>
   <string name="ic_advanced_menu">Configurações avançadas</string>
+  <string name="ic_blacklist_menu">Contatos bloqueados</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Adicionar conta Ring</string>
   <string name="add_sip_account_title">Adicionar conta SIP</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml
index f4dd813..aff85b5 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">Chamada Rápida</string>
   <string name="contact_picture_description">Imagem de Contato</string>
   <string name="dial_numeric_pad">Teclado de discagem Numérico</string>
+  <string name="contact_unblock">Desbloquear</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 a269f5a..dba8a62 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring é um software livre desenvolvido e mantido por</string>
   <string name="copyright_section">Direitos de autor</string>
   <string name="contribute_section">Contribuir</string>
   <string name="version_section">Versão</string>
   <string name="no_email_app_installed">Nenhuma aplicação de email encontrada no dispositivo. Instale uma para que nos possa enviar um relatório.</string>
   <string name="email_chooser_title">Enviar email utilizando...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="error_no_network">Sem conexão de rede</string>
   <string name="error_mobile_network_available_but_disabled">Por favor, permita o acesso à rede móvel nas definições do dispositivo.</string>
@@ -114,4 +116,6 @@
   <!--Pending contact requests-->
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
index 06cb61d..6046e79 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring este un program tip freeware, dezvoltat si sustinut de catre</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuie</string>
   <string name="version_section">Versiune</string>
   <string name="no_email_app_installed">Nu a fost gasita o aplicatie de email. Va rugam sa o instalati pentru a ne putea trimite un raport.</string>
   <string name="email_chooser_title">Trimite email folosind...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Suna</string>
   <string name="error_no_network">Nu exista conectivitate la retea</string>
@@ -77,4 +79,6 @@
   <string name="generic_error_migration">Eroare</string>
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 f5c5e0d..426767c 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
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring является свободным ПО, которое разрабатывается и поддерживается</string>
   <string name="copyright_section">Авторское право</string>
   <string name="contribute_section">Помочь проекту</string>
   <string name="version_section">Версия</string>
   <string name="no_email_app_installed">Не найдено приложение электронной почты. Пожалуйста, установите его для отправки нам отчета.</string>
   <string name="email_chooser_title">Отправить почту, используя...</string>
+  <string name="credits">Кредиты</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Звонок</string>
   <string name="error_no_network">Отсутствует сетевое подключение</string>
@@ -113,4 +116,6 @@
   <string name="accept">Принять</string>
   <!--Send contact requests-->
   <string name="send_request_button">Отправть</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 9e265d9..a566b6c 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Обратная связь</string>
   <string name="report">&lt;u&gt;Отправить нам письмо&lt;/u&gt;</string>
   <string name="section_license">Лицензия</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Просмотреть веб-сайт с помощью…</string>
   <string name="license">Это программное обеспечение предоставляется \"как есть\", без каких либо гарантий. Для получения дополнительной информации смотрите
 &lt;u&gt; Лицензию GNU General Public 3 или более поздней версии&lt;/u&gt;</string>
+  <string name="description">Ring — это свободная программа для всеобщей связи, уважающая свободы и конфиденциальность ее пользователей.</string>
+  <string name="credits">Благодарности</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Нет подключения к сети</string>
@@ -137,4 +141,6 @@
   <string name="refuse">Отклонить</string>
   <!--Send contact requests-->
   <string name="send_request_button">Отправить</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index bf031c8..3a78af5 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,8 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="version_section">Verzia</string>
   <string name="no_email_app_installed">Nainštaluj emailovú aplikáciu, aby si nám poslal správu.</string>
   <string name="email_chooser_title">Email </string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Žiadne sieťové pripojenie</string>
@@ -55,4 +57,6 @@
   <string name="generic_error_migration">Chyba</string>
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 c002f3e..3086d12 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -1,9 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring je prosto programje, ki ga razvija in podpira</string>
   <string name="copyright_section">Avtorske pravice</string>
   <string name="contribute_section">Prispevaj</string>
   <string name="version_section">Različica</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <!--AB menus-->
@@ -31,4 +33,6 @@
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index f91897a..7000652 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Përshtypje</string>
   <string name="report">&lt;u&gt;Dërgonani një email&lt;/u&gt;</string>
   <string name="section_license">Licencë</string>
@@ -12,6 +13,9 @@
   <string name="email_chooser_title">Dërgojeni mesazhi duke përdorur…</string>
   <string name="website_chooser_title">Shiheni sajtin duke përdorur…</string>
   <string name="license">Ky software jepet \"siç është\", pa asnjë garanci të çfaërdo lloji. Për hollësi, shihni &lt;u&gt;GNU General Public License, version 3 ose më të re&lt;/u&gt;</string>
+  <string name="description">Ring është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.</string>
+  <string name="credits">Kredite</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Pa lidhje në rrjet</string>
@@ -131,4 +135,6 @@
   <string name="accept">Pranoje</string>
   <string name="refuse">Hidhe tej</string>
   <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 cf5329a..c49ff66 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Återkoppling</string>
   <string name="report">&lt;u&gt;Skicka e-post till oss&lt;/u&gt;</string>
   <string name="section_license">Licens</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Visa webbsidan med...</string>
   <string name="license">Denna app tillhandahålles i \"befintligt skick\", utan några som helst garantier. För detaljerad info, se
 &lt;u&gt;GNU General Public License version 3 eller senare&lt;/u&gt;</string>
+  <string name="description">Ring är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.</string>
+  <string name="credits">Tack till</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ingen nätverksanslutning</string>
@@ -30,6 +34,7 @@
   <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_blacklist">Blockerade kontakter</string>
   <string name="menu_item_about">Om Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Slå ett nummer</string>
@@ -150,4 +155,7 @@
   <string name="send_request_button">Skicka</string>
   <string name="send_request_title">Skicka en kontaktförfrågan</string>
   <string name="send_request_msg">Du måste skicka en kontaktförfrågan för att kommunicera med den här användaren. Så länge din kontakt inte har accepterat förfrågan, kan du skicka meddelanden, men din kontakt kan inte läsa dem.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 blockerade kontakter</string>
+  <!--Smartlist-->
 </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 ebd849a..9ace589 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
@@ -3,6 +3,7 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Ta bort</string>
   <string name="ic_advanced_menu">Avancerade inställningar</string>
+  <string name="ic_blacklist_menu">Blockerade kontakter</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Lägg till Ring-konto</string>
   <string name="add_sip_account_title">Lägg till SIP-konto</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_content_description.xml b/ring-android/app/src/main/res/values-sv/strings_content_description.xml
index 7040856..517a232 100644
--- a/ring-android/app/src/main/res/values-sv/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">Snabbsamtal</string>
   <string name="contact_picture_description">Kontaktbild</string>
   <string name="dial_numeric_pad">Numerisk knappsats</string>
+  <string name="contact_unblock">Ta bort blockering</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 72f4aa4..2aa6f3c 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">Geri bildirim</string>
   <string name="report">&lt;u&gt;Bize e-posta gönder&lt;/u&gt;</string>
   <string name="section_license">Lisans</string>
@@ -13,6 +14,9 @@
   <string name="website_chooser_title">Şunu kullanarak web sitesini gör...</string>
   <string name="license">Bu program HERHANGİ BİR TEMİNAT OLMADAN sağlanmıştır. Ayrıntılar için şuna bakın
 &lt;u&gt;GNU Genel Kamu Lisansı sürüm 3 ya da sonrası&lt;/u&gt;</string>
+  <string name="description">Ring; kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.</string>
+  <string name="credits">Krediler</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ağ bağlantısı yok</string>
@@ -26,9 +30,11 @@
   <string name="drawer_close">Gezinti çekmecesini kapat</string>
   <!--Sections-->
   <string name="menu_item_home">Ev</string>
+  <string name="menu_item_contact_request">İletişim istekleri</string>
   <string name="menu_item_accounts">Hesapları yönet</string>
   <string name="menu_item_settings">Ayarlar</string>
   <string name="menu_item_share">Bilgimi paylaş</string>
+  <string name="menu_item_blacklist">Engellenmiş kişiler</string>
   <string name="menu_item_about">Ring Hakkında</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Bir numara çevir</string>
@@ -54,6 +60,8 @@
   <string name="transfer_no_other_call">Bekleyen başka arama yok</string>
   <string name="transfer_type_number">Aktarılacak numarayı girin:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Yanıtsız gelen arama</string>
+  <string name="notif_missed_outgoing_call">Yanıtsız giden arama</string>
   <string name="notif_incoming_call_title">%1$s\'dan gelen arama</string>
   <string name="notif_incoming_call">Gelen arama</string>
   <string name="notif_outgoing_call_title">%1$s\'a giden arama</string>
@@ -110,6 +118,7 @@
   <string name="conversation_action_copy_peer_number">Numarayı kopyala</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s panoya kopyalandı</string>
   <string name="conversation_action_select_peer_number">Bir numara seçin</string>
+  <string name="conversation_action_block_this">Bu kişiyi engelle</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s eklensin mi ?</string>
   <string name="prompt_new_password">Yeni parola</string>
@@ -137,6 +146,14 @@
   <!--Pending contact requests-->
   <string name="accept">Kabul et</string>
   <string name="refuse">Geri Çevir</string>
+  <string name="block">Engelleme</string>
+  <string name="contact_request_title">Bekleyen iletişim isteği</string>
+  <string name="contact_request_account">%1$s için</string>
+  <string name="no_requests">0 iletişim isteği</string>
   <!--Send contact requests-->
   <string name="send_request_button">Gönder</string>
+  <string name="send_request_title">Bir ileteşem isteği gönder</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0 engellenmiş kişi</string>
+  <!--Smartlist-->
 </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 99e04d6..0824a7d 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
@@ -3,6 +3,7 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Sil</string>
   <string name="ic_advanced_menu">Gelişmiş ayarlar</string>
+  <string name="ic_blacklist_menu">Engellenmiş kişiler</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Ring hesabı ekle</string>
   <string name="add_sip_account_title">SIP hesabı ekle</string>
@@ -33,6 +34,13 @@
   <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 bağlı bilinen aygıtlar</string>
+  <string name="account_device_revoke">Aygıtı iptal et</string>
+  <string name="account_device_revocation_success_title">Başarılı</string>
+  <string name="account_device_revocation_success">Aygıt şimdi iptal edildi!</string>
+  <string name="account_device_revocation_error_title">Aygıt iptal edilemiyor</string>
+  <string name="account_device_revocation_wrong_password">Yanlış parola</string>
+  <string name="account_device_revocation_unknown_device">Bilinmeyen aygıt.</string>
+  <string name="account_device_revocation_error_unknown">Bilinmeyen hata.</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Genel</string>
   <string name="account_basic_category">Temel Ayarlar</string>
@@ -58,6 +66,7 @@
   <string name="account_video_enable">Görüntüyü Etkinleştir</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Gelişmiş</string>
+  <string name="account_dht_public_in_calls_label">Tüm arama ve iletilere izin ver</string>
   <string name="account_registration_exp_label">Kaydolma Bitimi</string>
   <string name="account_local_interface_label">Yerel Arayüz</string>
   <string name="account_local_port_label">Yerel Delik</string>
@@ -160,6 +169,7 @@
   <string name="register_username">Halka açık kullanıcı adı kaydet (deneysel)</string>
   <string name="username_already_taken">Kullanıcı adı önceden alınmış</string>
   <string name="invalid_username">Geçersiz kullanıcı adı</string>
+  <string name="looking_for_username_availability">Kullanıcı adının uygunluğuna bakılıyor...</string>
   <string name="account_status_connecting">Bağlanılıyor</string>
   <string name="account_status_connection_error">Bağlantı hatası</string>
   <string name="account_status_online">Çevrimiçi</string>
@@ -172,6 +182,15 @@
   <string name="account_link_title">Bu aygıtı bağla</string>
   <string name="account_sip_cannot_be_registered">Hesap kaydedilemiyor</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">Onaylamak için parolayı girin</string>
   <string name="enter_password">Parolayı gir</string>
+  <string name="revoke_device_title">Aygıtı feshet </string>
+  <string name="revoke_device_message">%1$s iptal etmek istediğinizden emin misiniz?</string>
   <string name="revoke_device_wait_title">Lütfen bekleyin...</string>
+  <string name="revoke_device_wait_message">Aygıt iptal ediliyor</string>
+  <string name="rename_device_title">Bu aygıtı yeniden adlandır</string>
+  <string name="rename_device_message">Ring hesabınızı bu aygıtta tanımlamak için yeni bir ad seçin</string>
+  <string name="rename_device_button">Aygıtı yeniden adlandır</string>
+  <string name="account_rename_device_hint">Yeni aygıt adı seç</string>
+  <string name="account_device_this_indicator">bu aygıt</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_content_description.xml b/ring-android/app/src/main/res/values-tr/strings_content_description.xml
index 4731b36..9d4b9c8 100644
--- a/ring-android/app/src/main/res/values-tr/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">Hızlı Ara</string>
   <string name="contact_picture_description">Kişi Resmi</string>
   <string name="dial_numeric_pad">Sayısal Tuşlar</string>
+  <string name="contact_unblock">Engeli kaldır</string>
 </resources>
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 99d3f73..aabdbab 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring є безкоштовним програмним забезпеченням, що розроблене та пдітримується</string>
   <string name="copyright_section">Авторське право</string>
   <string name="contribute_section">Співробітничати</string>
   <string name="version_section">Версія</string>
   <string name="no_email_app_installed">Не знайдено жодного поштового додатку, будь ласка встановіть хоча б один поштовий додаток щоб надіслати нам повідомлення</string>
   <string name="email_chooser_title">Надіслати повідомлення за допомогою...</string>
+  <string name="credits">Подяки</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Відсутнє з’єднання з мережею</string>
@@ -113,4 +116,6 @@
   <string name="refuse">Скидання</string>
   <!--Send contact requests-->
   <string name="send_request_button">Відправити</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 e95fb61..4cca707 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
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="feedback_section">反馈</string>
   <string name="report">&lt;u&gt;给我们发邮件&lt;/u&gt;</string>
   <string name="section_license">许可</string>
@@ -12,6 +13,9 @@
   <string name="email_chooser_title">使用…发送邮件</string>
   <string name="website_chooser_title">用…浏览网站</string>
   <string name="license">本软件由版权持有人及其他责任者“按原样”提供，不担保任何责任。详细信息请参见&lt;u&gt;GNU通用公共许可证，版本3或更新&lt;/u&gt;</string>
+  <string name="description">Ring是自由软件，尊重用户的通讯自由与隐私。</string>
+  <string name="credits">致谢</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">无网络连接</string>
@@ -25,9 +29,11 @@
   <string name="drawer_close">收起导航</string>
   <!--Sections-->
   <string name="menu_item_home">主页</string>
+  <string name="menu_item_contact_request">联系人请求</string>
   <string name="menu_item_accounts">管理帐户</string>
   <string name="menu_item_settings">设置</string>
   <string name="menu_item_share">共享我的通讯录</string>
+  <string name="menu_item_blacklist">已屏蔽的联系人</string>
   <string name="menu_item_about">关于Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">拨号</string>
@@ -52,6 +58,7 @@
   <string name="transfer_no_other_call">无通话</string>
   <string name="transfer_type_number">输入要切换至的号码：</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">未接来电</string>
   <string name="notif_incoming_call_title">来电：%1$s</string>
   <string name="notif_incoming_call">来电</string>
   <string name="notif_outgoing_call_title">去电：%1$s</string>
@@ -108,6 +115,7 @@
   <string name="conversation_action_copy_peer_number">复制号码</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s已复制至剪贴板</string>
   <string name="conversation_action_select_peer_number">选择一个数字</string>
+  <string name="conversation_action_block_this">屏蔽该联系人</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">添加%1$s吗？</string>
   <string name="prompt_new_password">新密码</string>
@@ -135,6 +143,15 @@
   <!--Pending contact requests-->
   <string name="accept">接听</string>
   <string name="refuse">拒接</string>
+  <string name="block">屏蔽</string>
+  <string name="contact_request_title">未处理的联系人请求</string>
+  <string name="contact_request_msg">您有%1$s个未处理的请求</string>
+  <string name="no_requests">0个联系人请求</string>
   <!--Send contact requests-->
   <string name="send_request_button">发送</string>
+  <string name="send_request_title">发送联系人请求</string>
+  <string name="send_request_msg">要与该用户通信，您必须先发送联系人请求。如果您的请求未被通过，您发送的消息将无法被对方阅读。</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">0个屏蔽的联系人</string>
+  <!--Smartlist-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index aebb46a..beaa4e5 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -3,9 +3,11 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">删除</string>
   <string name="ic_advanced_menu">高级设置</string>
+  <string name="ic_blacklist_menu">已屏蔽的联系人</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">添加Ring帐户</string>
   <string name="add_sip_account_title">添加SIP帐户</string>
+  <string name="ring_account_default_name">Ring帐户%1$s</string>
   <string name="prompt_alias">别名</string>
   <string name="prompt_hostname">主机名</string>
   <string name="prompt_username">用户名</string>
@@ -33,6 +35,13 @@
   <string name="empty_account_list">没有已注册账户</string>
   <string name="normal_accounts_titles">帐户</string>
   <string name="normal_devices_titles">与该Ring帐户连接的已知设备</string>
+  <string name="account_device_revoke">吊销设备</string>
+  <string name="account_device_revocation_success_title">成功</string>
+  <string name="account_device_revocation_success">设备已吊销！</string>
+  <string name="account_device_revocation_error_title">无法吊销设备</string>
+  <string name="account_device_revocation_wrong_password">密码错误。</string>
+  <string name="account_device_revocation_unknown_device">未知设备。</string>
+  <string name="account_device_revocation_error_unknown">未知错误。</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">通用</string>
   <string name="account_basic_category">基本设置</string>
@@ -58,6 +67,7 @@
   <string name="account_video_enable">启用视频</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">高级</string>
+  <string name="account_dht_public_in_calls_label">允许所有通话/信息</string>
   <string name="account_registration_exp_label">录音过期</string>
   <string name="account_local_interface_label">本地接口</string>
   <string name="account_local_port_label">本地端口</string>
@@ -136,6 +146,7 @@
   <string name="account_cannot_be_updated_message">无法更新帐户设备。请检查您的密码。</string>
   <string name="account_sip_success_title">SIP帐户已注册</string>
   <string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
+  <string name="account_sip_register_anyway">仍然注册</string>
   <string name="account_link_button">将此设备与一个帐户进行连接</string>
   <string name="account_import_title">与已有帐户进行连接</string>
   <string name="account_link_prompt_pin">输入PIN</string>
@@ -159,6 +170,7 @@
   <string name="register_username">注册公共用户名（试验性）</string>
   <string name="username_already_taken">用户名已被占用</string>
   <string name="invalid_username">非法用户名</string>
+  <string name="looking_for_username_availability">正在检测用户名是否可用…</string>
   <string name="account_status_connecting">正在连接</string>
   <string name="account_status_connection_error">连接错误</string>
   <string name="account_status_online">在线</string>
@@ -171,6 +183,16 @@
   <string name="account_link_title">连接此设备</string>
   <string name="account_sip_cannot_be_registered">无法注册帐户</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">输入密码以确认</string>
   <string name="enter_password">输入密码</string>
+  <string name="revoke_device_title">吊销设备</string>
+  <string name="revoke_device_message">确定吊销设备%1$s吗？</string>
   <string name="revoke_device_wait_title">请稍等…</string>
+  <string name="revoke_device_wait_message">正在吊销设备</string>
+  <string name="rename_device_title">重命名该设备</string>
+  <string name="rename_device_message">为该设备取名，以在您的Ring帐户中识别该设备</string>
+  <string name="rename_device_button">重命名设备</string>
+  <string name="account_rename_device_hint">输入新的设备名</string>
+  <string name="account_device_name_empty">设备名不可为空</string>
+  <string name="account_device_this_indicator">该设备</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml
index 9945015..9262361 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">快速拨号</string>
   <string name="contact_picture_description">联系人头像</string>
   <string name="dial_numeric_pad">数字拨号盘</string>
+  <string name="contact_unblock">取消屏蔽</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 1f38733..ce1003f 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
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
   <string name="sponsor_section">Ring 是一個自由軟體開發並支援由</string>
   <string name="copyright_section">版權</string>
   <string name="contribute_section">貢獻</string>
   <string name="version_section">版本</string>
   <string name="no_email_app_installed">沒有找到電子郵件應用程式，請安裝一個來傳送報告給我們</string>
   <string name="email_chooser_title">傳送郵件藉由...</string>
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">沒有網路連接</string>
@@ -87,4 +89,6 @@
   <!--Pending contact requests-->
   <!--Send contact requests-->
   <string name="send_request_button">傳送</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </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 85b89eb..d16bd27 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--About-->
+  <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <!--AB menus-->
@@ -36,4 +38,6 @@
   <string name="refuse">拒絕</string>
   <!--Send contact requests-->
   <string name="send_request_button">發送</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
 </resources>