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 f5904fa..bce78fb 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -71,6 +71,8 @@
   <!--QRCode Scan-->
   <!--Settings-->
   <!--Conversation-->
+  <string name="conversation_action_history_clear">مسح السجل</string>
+  <string name="conversation_action_remove_this">احذف الإتصال</string>
   <string name="conversation_action_copy_peer_number">نسخ الرقم</string>
   <!--Contacts-->
   <string name="wizard_next">التالي</string>
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 4b3a6fe..48993be 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -75,7 +75,6 @@
   <string name="action_call_decline">Отказ</string>
   <string name="ab_action_speakerphone">Включване на колонката</string>
   <string name="ab_action_contact_add">Добавяне към контактите</string>
-  <string name="ab_action_contact_add_question">Добавяне към контактите?</string>
   <string name="ab_action_audio_call">Гласово обаждане</string>
   <string name="ab_action_video_call">Обаждане с видео</string>
   <string name="ab_action_change_screen_orientation">Промяна на ориентацията на екрана</string>
@@ -100,19 +99,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Сканирайте QR-кода на акаунта, който искате да добавите.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Изчистване на историята?</string>
-  <string name="clear_history_dialog_message">Това действие е необратимо.</string>
   <string name="clear_history_completed">Историята беше изчистена.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Изтриване на този разговор</string>
   <string name="conversation_action_delete_this_title">Изтриване на този разговор?</string>
   <string name="conversation_action_delete_this_message">Това действие е необратимо.</string>
+  <string name="conversation_action_history_clear">Изчистване на историята</string>
+  <string name="conversation_action_remove_this">Изтриване на контакт</string>
   <string name="conversation_action_copy_peer_number">Копиране на номера</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s е копиран</string>
   <string name="conversation_action_select_peer_number">Изберете номер</string>
-  <string name="conversation_action_block_this">Блокиране на този контакт</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Добавяне на %1$s?</string>
   <string name="prompt_new_password">Нова парола</string>
   <string name="prompt_new_password_repeat">Повторете новата парола</string>
   <string name="account_create_title">Създаване на акаунт за Ring</string>
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 5e7a837..52c5c37 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -79,7 +79,6 @@
   <string name="action_call_decline">Rebutja</string>
   <string name="ab_action_speakerphone">Activa l\'altaveu</string>
   <string name="ab_action_contact_add">Afegeix als contactes</string>
-  <string name="ab_action_contact_add_question">Voleu afegir als contactes ?</string>
   <string name="ab_action_audio_call">Trucada de veu</string>
   <string name="ab_action_video_call">Videotrucada </string>
   <string name="ab_action_change_screen_orientation">Canvia l\'orientació de la pantalla</string>
@@ -104,19 +103,16 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escanegeu el codi QR del compte que vulgueu afegir.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Suprimeix l\'historial ?</string>
-  <string name="clear_history_dialog_message">Aquesta acció no es pot desfer.</string>
   <string name="clear_history_completed">L\'historial s\'ha netejat.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Esborra aquesta conversa</string>
   <string name="conversation_action_delete_this_title">Voleu suprimir aquesta conversa ?</string>
   <string name="conversation_action_delete_this_message">Aquesta acció no es pot desfer.</string>
+  <string name="conversation_action_history_clear">Neteja historial</string>
   <string name="conversation_action_copy_peer_number">Copia el número</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiat al porta-retalls</string>
   <string name="conversation_action_select_peer_number">Seleccioneu un número</string>
-  <string name="conversation_action_block_this">Bloca el contacte</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Voleu afegir %1$s ?</string>
   <string name="prompt_new_password">Contrasenya nova</string>
   <string name="prompt_new_password_optional">Contrasenya nova (opcional)</string>
   <string name="prompt_new_password_repeat">Torneu a inserir la contrasenya nova</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 86a8173..ce441fc 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
@@ -74,7 +74,6 @@
   <string name="action_call_decline">Odmítnout</string>
   <string name="ab_action_speakerphone">Zapnout reproduktor</string>
   <string name="ab_action_contact_add">Přidat do kontaktů</string>
-  <string name="ab_action_contact_add_question">Přidat do kontaktů?</string>
   <string name="ab_action_audio_call">Audio hovor</string>
   <string name="ab_action_video_call">Video hovor</string>
   <string name="ab_action_change_screen_orientation">Změnit natočení obrazovky</string>
@@ -99,19 +98,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Oskenujte QR kód účtu, který chcete přidat.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Vymazat historii?</string>
-  <string name="clear_history_dialog_message">Tuto činnost nelze vrátit zpět.</string>
   <string name="clear_history_completed">Historie byla vymazána.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Odstranit tuto konverzaci</string>
   <string name="conversation_action_delete_this_title">Odstranit tuto konverzaci?</string>
   <string name="conversation_action_delete_this_message">Tuto činnost nelze vrátit zpět.</string>
+  <string name="conversation_action_history_clear">Vymazat historii</string>
+  <string name="conversation_action_remove_this">Smazat kontakt</string>
   <string name="conversation_action_copy_peer_number">Kopírovat číslo</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s zkopírováno do schránky</string>
   <string name="conversation_action_select_peer_number">Vyberte číslo</string>
-  <string name="conversation_action_block_this">Blokovat tento kontakt</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Přidat %1$s?</string>
   <string name="prompt_new_password">Nové heslo</string>
   <string name="prompt_new_password_repeat">Zopakujte nové heslo</string>
   <string name="account_create_title">Vytvořit účet Ring</string>
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 f64237d..49518e2 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
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Afvis</string>
   <string name="ab_action_speakerphone">Aktiver højtaler</string>
   <string name="ab_action_contact_add">Tilføj til kontakt</string>
-  <string name="ab_action_contact_add_question">Tilføj til kontakter?</string>
   <string name="hist_contact_added">Kontakt tilføjet</string>
   <string name="hist_invitation_received">Invitation modtaget</string>
   <string name="ab_action_audio_call">Lydopkald</string>
@@ -110,19 +109,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skan QR-koden for kontoen du vil tilføje.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Ryd historikken?</string>
-  <string name="clear_history_dialog_message">Denne handling kan ikke fortrydes.</string>
   <string name="clear_history_completed">Historikken er blevet ryddet.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Slet denne samtale</string>
   <string name="conversation_action_delete_this_title">Slet denne samtale?</string>
   <string name="conversation_action_delete_this_message">Denne handling kan ikke fortrydes.</string>
+  <string name="conversation_action_history_clear">Ryd historiken</string>
+  <string name="conversation_action_remove_this">Slet kontakt</string>
   <string name="conversation_action_copy_peer_number">Kopiér nummer</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopieret til udklipsholder</string>
   <string name="conversation_action_select_peer_number">Vælg et nummer</string>
-  <string name="conversation_action_block_this">Blokér denne kontakt</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Tilføj %1$s?</string>
   <string name="prompt_new_password">Ny adgangskode</string>
   <string name="prompt_new_password_optional">Ny adgangskode (valgfrit)</string>
   <string name="prompt_new_password_repeat">Gentag ny adgangskode</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 5365dff..c181496 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
@@ -80,7 +80,6 @@
   <string name="action_call_decline">Ablehnen</string>
   <string name="ab_action_speakerphone">Lautsprecher aktivieren</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_audio_call">Audioanruf</string>
   <string name="ab_action_video_call">Videoanruf</string>
   <string name="ab_action_change_screen_orientation">Ändern der Bildschirmausrichtung</string>
@@ -106,19 +105,17 @@
   <!--QRCode Scan-->
   <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>
   <string name="clear_history_completed">Verlauf wurde gelöscht.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
   <string name="conversation_action_delete_this_title">Diese Unterhaltung löschen?</string>
   <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
+  <string name="conversation_action_history_clear">Verlauf löschen</string>
+  <string name="conversation_action_remove_this">Kontakt löschen</string>
   <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s wurde in die Zwischenablage kopiert.</string>
   <string name="conversation_action_select_peer_number">Nummer auswählen</string>
-  <string name="conversation_action_block_this">Diesen Kontakt blockieren</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Fügen %1$s hinzu?</string>
   <string name="prompt_new_password">Neues Passwort</string>
   <string name="prompt_new_password_optional">Neues Passwort (optional)</string>
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index ccb6cf5..fe3c340 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -82,7 +82,6 @@
   <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="hist_contact_added">Kontakt hinzugefügt</string>
   <string name="hist_invitation_received">Einladung erhalten</string>
   <string name="ab_action_audio_call">Audioanruf</string>
@@ -112,20 +111,18 @@
   <!--QRCode Scan-->
   <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>
   <string name="clear_history_completed">Der Verlauf wurde gelöscht.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
   <string name="conversation_action_delete_this_title">Diese Unterhaltung löschen?</string>
   <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
+  <string name="conversation_action_history_clear">Verlauf leeren</string>
+  <string name="conversation_action_remove_this">Kontakt löschen</string>
   <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>
   <string name="conversation_action_go_to_call">Zurück zum laufenden Anruf</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_optional">Neues Passwort (optional)</string>
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
@@ -136,6 +133,7 @@
   <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>
+  <string name="wizard_skip">Überspringen</string>
   <!--MenuHeaderView-->
   <string name="profile">Mein Profil</string>
   <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
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 b1df282..14834ca 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -68,7 +68,6 @@
   <string name="action_call_decline">Απόρριψη κλήσης</string>
   <string name="ab_action_speakerphone">Μεγάφωνο</string>
   <string name="ab_action_contact_add">Προσθήκη στις επαφές</string>
-  <string name="ab_action_contact_add_question">Προσθήκη στις επαφές;</string>
   <string name="ab_action_audio_call">Κλήση φωνής</string>
   <string name="ab_action_video_call">Κλήση βίντεο</string>
   <string name="ab_action_change_screen_orientation">Στρίψτε την οθόνη</string>
@@ -93,8 +92,6 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Σαρώστε τον κώδικα QR του λογαριασμού που θέλετε να προσθέσετε.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Διαγραφή ιστορικού;</string>
-  <string name="clear_history_dialog_message">Η ενέργεια αυτή δεν μπορεί να ανακληθεί.</string>
   <string name="clear_history_completed">Το ιστορικό έχει διαγραφεί.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Διαγραφή αυτής της συνομιλίας</string>
@@ -103,9 +100,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>
   <string name="prompt_new_password_repeat">Επανάληψη νέου συνθηματικού</string>
   <string name="account_create_title">Δημιουργία λογαριασμού Ring</string>
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 0721cc4..1f38e53 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -53,7 +53,6 @@
   <string name="action_call_decline">Rifuzi</string>
   <string name="ab_action_speakerphone">Ŝalti laŭtparolilon</string>
   <string name="ab_action_contact_add">Aldoni al kontaktoj</string>
-  <string name="ab_action_contact_add_question">Ĉu aldoni al kontaktoj ?</string>
   <string name="ab_action_audio_call">Sona voko</string>
   <string name="ab_action_video_call">Videa voko</string>
   <string name="share_via">Kunhavi per</string>
@@ -76,18 +75,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skanu la QR Kodon de la konto, kiun vi volas aldoni.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Ĉu vakigi historion ?</string>
-  <string name="clear_history_dialog_message">Tiu ĉi ago ne povos malfariĝî.</string>
   <string name="clear_history_completed">Historio vakigita.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Forigi tiu ĉi konversacion</string>
   <string name="conversation_action_delete_this_title">Ĉu forigi tiu ĉi konversacion ?</string>
   <string name="conversation_action_delete_this_message">Tiu ĉi ago ne povos malfariĝi.</string>
+  <string name="conversation_action_history_clear">Vakigi historion</string>
+  <string name="conversation_action_remove_this">Forigi kontakton</string>
   <string name="conversation_action_copy_peer_number">Kopii numeron</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopiita en tondejon</string>
   <string name="conversation_action_select_peer_number">Elektu numeron</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Ĉu aldoni %1$s ?</string>
   <string name="prompt_new_password">Nova pasvorto</string>
   <string name="account_create_title">Krei Ring konton</string>
   <string name="wizard_next">Sekva</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index ce25338..35127c4 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Rechazar</string>
   <string name="ab_action_speakerphone">Activar altavoz</string>
   <string name="ab_action_contact_add">Agregar a contactos</string>
-  <string name="ab_action_contact_add_question">¿Añadir a contactos?</string>
   <string name="hist_contact_added">Contacto añadido</string>
   <string name="hist_invitation_received">Invitación recibida</string>
   <string name="ab_action_audio_call">Llamada de voz</string>
@@ -110,19 +109,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escaneá el código QR de la cuenta que querés agregar.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">¿Borrar historial?</string>
-  <string name="clear_history_dialog_message">Esta acción no puede deshacerse.</string>
   <string name="clear_history_completed">El historial ha sido borrado.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Borrar conversación</string>
   <string name="conversation_action_delete_this_title">¿Borrar conversación?</string>
   <string name="conversation_action_delete_this_message">Esta acción no puede deshacerse.</string>
+  <string name="conversation_action_history_clear">Borrar historial</string>
+  <string name="conversation_action_remove_this">Eliminar contacto</string>
   <string name="conversation_action_copy_peer_number">Copiar número</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado al portapapeles</string>
   <string name="conversation_action_select_peer_number">Seleccioná un número</string>
-  <string name="conversation_action_block_this">Bloquear contacto</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">¿Agregar %1$s?</string>
   <string name="prompt_new_password">Nueva contraseña</string>
   <string name="prompt_new_password_optional">Nueva contraseña (opcional)</string>
   <string name="prompt_new_password_repeat">Repetir nueva contraseña</string>
@@ -133,6 +130,7 @@
   <string name="help_pin_enter">Ingresá el PIN de otra cuenta Ring configurada. Usá la función \"exportar cuenta Ring\" para obtener un PIN.</string>
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Atrás</string>
+  <string name="wizard_skip">Saltar</string>
   <!--MenuHeaderView-->
   <string name="profile">Mi perfil</string>
   <string name="profile_message_warning">Tu perfil sólo es compartido con tus contactos</string>
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 749af59..6f63460 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -86,7 +86,6 @@
   <string name="action_call_decline">Rechazar</string>
   <string name="ab_action_speakerphone">Activar el altavoz</string>
   <string name="ab_action_contact_add">Añadir a contactos</string>
-  <string name="ab_action_contact_add_question">¿Añadir a contactos?</string>
   <string name="hist_contact_added">Contacto añadido</string>
   <string name="hist_invitation_received">Invitación recibida</string>
   <string name="ab_action_audio_call">Llamada de voz</string>
@@ -117,20 +116,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escanear el código QR de la cuenta que quieres añadir.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">¿Limpiar historial?</string>
-  <string name="clear_history_dialog_message">Esta acción no puede deshacerse.</string>
   <string name="clear_history_completed">El historial se ha limpiado.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Borrar esta conversación</string>
   <string name="conversation_action_delete_this_title">¿Borrar esta conversación?</string>
   <string name="conversation_action_delete_this_message">Esta acción no puede deshacerse.</string>
+  <string name="conversation_action_history_clear">Limpiar historial</string>
+  <string name="conversation_action_remove_this">Eliminar contacto</string>
   <string name="conversation_action_copy_peer_number">Copiar número</string>
   <string name="conversation_action_copied_peer_number_clipboard">Se ha copiado %1$s al portapapeles</string>
   <string name="conversation_action_select_peer_number">Escoge un número</string>
-  <string name="conversation_action_block_this">Bloquear este contacto</string>
   <string name="conversation_action_go_to_call">Volver a la llamada en curso</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">¿Añadir %1$s ?</string>
   <string name="prompt_new_password">Contraseña nueva</string>
   <string name="prompt_new_password_optional">Contraseña nueva (opcional)</string>
   <string name="prompt_new_password_repeat">Repite la nueva contraseña</string>
@@ -141,6 +138,7 @@
   <string name="help_pin_enter">Ingresa el PIN de otra cuenta de Ring configurada. Utiliza la opción \"Exportar cuenta en Ring\" para obtener un PIN.</string>
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Volver</string>
+  <string name="wizard_skip">Saltar</string>
   <!--MenuHeaderView-->
   <string name="profile">Mi perfil</string>
   <string name="profile_message_warning">Tu perfil solamente se comparte con tus contactos</string>
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 1f252a2..95528fd 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
@@ -86,7 +86,6 @@
   <string name="action_call_decline">رد کردن</string>
   <string name="ab_action_speakerphone">فعال کردن بلندگو</string>
   <string name="ab_action_contact_add">افزودن به مخاطبان</string>
-  <string name="ab_action_contact_add_question">افزودن به مخاطبان؟</string>
   <string name="hist_contact_added">مخاطب افزوده شد</string>
   <string name="hist_invitation_received">دعوت نامه دریافت شد</string>
   <string name="ab_action_audio_call">تماس صوتی</string>
@@ -117,20 +116,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">رمز QR حسابی که می‌خواهید بیفزایید را بپویید.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">پاک‌سازی تاریخچه؟</string>
-  <string name="clear_history_dialog_message">این کار قابل بازگشت نیست.</string>
   <string name="clear_history_completed">تاریخچه پاک‌سازی شد.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">حذف این گفت‌وگو</string>
   <string name="conversation_action_delete_this_title">حذف این گفت‌وگو؟</string>
   <string name="conversation_action_delete_this_message">این کار قابل بازگشت نیست.</string>
+  <string name="conversation_action_history_clear">پاکسازی تاریخچه</string>
+  <string name="conversation_action_remove_this">مخاطب را حذف کنید</string>
   <string name="conversation_action_copy_peer_number">رونوشت از شماره</string>
   <string name="conversation_action_copied_peer_number_clipboard">‫%1$s در حافظه رونویسی شد</string>
   <string name="conversation_action_select_peer_number">گزینش یک شماره</string>
-  <string name="conversation_action_block_this">مسدود کردن این مخاطب</string>
   <string name="conversation_action_go_to_call">بازگشت به تماس در حال جريان</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">افزودن%1$s؟</string>
   <string name="prompt_new_password">گذرواژه جدید</string>
   <string name="prompt_new_password_optional">گذرواژه جدید (اختیاری)</string>
   <string name="prompt_new_password_repeat">گذرواژه جدید را تکرار کنید</string>
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 98008d4..9d627eb 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -57,7 +57,6 @@
   <string name="action_call_decline">Kieltäydy</string>
   <string name="ab_action_speakerphone">Kaiutin päälle</string>
   <string name="ab_action_contact_add">Lisää yhteystietoihin</string>
-  <string name="ab_action_contact_add_question">Lisätäänkö yhteystietoihin?</string>
   <string name="ab_action_audio_call">Äänipuhelu</string>
   <string name="ab_action_video_call">Videopuhelu</string>
   <string name="share_via">Jaa</string>
@@ -80,18 +79,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skannaa lisättävän tunnuksen QR-koodi.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Tyhjennä historia?</string>
-  <string name="clear_history_dialog_message">Tätä toimintoa ei voi perua.</string>
   <string name="clear_history_completed">Historia on tyhjennetty.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Poista tämä keskustelu</string>
   <string name="conversation_action_delete_this_title">Poistetaanko tämä keskustelu?</string>
   <string name="conversation_action_delete_this_message">Tätä toimintoa ei voi perua.</string>
+  <string name="conversation_action_history_clear">Tyhjennä historia</string>
+  <string name="conversation_action_remove_this">Poista yhteystieto</string>
   <string name="conversation_action_copy_peer_number">Kopioi numero</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopioitu leikepöydälle</string>
   <string name="conversation_action_select_peer_number">Valitse numero</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Lisätäänkö %1$s?</string>
   <string name="prompt_new_password">Uusi salasana</string>
   <string name="account_create_title">Luo Ring tunnus</string>
   <string name="wizard_next">Seuraava</string>
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 45e4370..fc286e3 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
@@ -76,7 +76,6 @@
   <string name="action_call_decline">Refuser</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
-  <string name="ab_action_contact_add_question">Ajouter aux contacts ?</string>
   <string name="ab_action_audio_call">Appel audio</string>
   <string name="ab_action_video_call">Appel vidéo</string>
   <string name="ab_action_change_screen_orientation">Modifier l\'orientation de l\'écran</string>
@@ -101,19 +100,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Numériser le code QR du compte que vous désirez ajouter.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Effacer l\'historique?</string>
-  <string name="clear_history_dialog_message">Cette action ne peut pas être annulée.</string>
   <string name="clear_history_completed">L\'historique a été effacé.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Supprimer cette conversation</string>
   <string name="conversation_action_delete_this_title">Supprimer cette conversation ?</string>
   <string name="conversation_action_delete_this_message">Cette action ne peut être annulée.</string>
+  <string name="conversation_action_history_clear">Effacer l\'historique</string>
+  <string name="conversation_action_remove_this">Supprimer le contact</string>
   <string name="conversation_action_copy_peer_number">Copier le numéro</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copié dans le presse papiers</string>
   <string name="conversation_action_select_peer_number">Sélectionner un numéro de téléphone</string>
-  <string name="conversation_action_block_this">Bloquer ce contact</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
   <string name="prompt_new_password_optional">Nouveau mot de passe (optionnel)</string>
   <string name="prompt_new_password_repeat">Répéter le nouveau mot de passe</string>
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 3449af0..aa05c4b 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
@@ -57,7 +57,6 @@
   <string name="action_call_decline">Refuser</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter dans les contacts</string>
-  <string name="ab_action_contact_add_question">Voulez-vous l\'ajouter à vos contacts?</string>
   <string name="ab_action_audio_call">Appel audio</string>
   <string name="ab_action_video_call">Appel vidéo</string>
   <string name="share_via">Partager via</string>
@@ -80,18 +79,16 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Merci de scanner le Code QR du compte que vous souhaitez ajouter.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Voulez-vous effacer l\'historique?</string>
-  <string name="clear_history_dialog_message">Cette action ne peut pas être annulée</string>
   <string name="clear_history_completed">L\'historique a été effacée</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Supprimer cette conversation</string>
   <string name="conversation_action_delete_this_title">Voulez-vous supprimer cette conversation?</string>
   <string name="conversation_action_delete_this_message">Cette action ne peut pas être annulée</string>
+  <string name="conversation_action_remove_this">Supprimer contact</string>
   <string name="conversation_action_copy_peer_number">Copier le numéro de téléphone</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s a été copié dans le presse-papier</string>
   <string name="conversation_action_select_peer_number">Choisir un numéro </string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Voulez-vous ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
   <string name="prompt_new_password_repeat">Saisir à nouveau le mot de passe</string>
   <string name="account_create_title">Créer un compte Ring</string>
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 9e12aa9..e40fb2d 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -86,7 +86,6 @@
   <string name="action_call_decline">Décliner</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
-  <string name="ab_action_contact_add_question">Ajouter aux contacts ?</string>
   <string name="hist_contact_added">Contact ajouté</string>
   <string name="hist_invitation_received">Invitation reçue</string>
   <string name="ab_action_audio_call">Appel audio</string>
@@ -117,20 +116,19 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Numérisez le code QR de votre interlocuteur.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Effacer le journal d\'appels ?</string>
-  <string name="clear_history_dialog_message">Cette action est irréversible.</string>
   <string name="clear_history_completed">Le journal d\'appels a été effacé.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Supprimer la conversation</string>
   <string name="conversation_action_delete_this_title">Supprimer la conversation ?</string>
   <string name="conversation_action_delete_this_message">Cette action est irréversible.</string>
+  <string name="conversation_action_history_clear">Effacer l\'historique</string>
+  <string name="conversation_action_remove_this">Supprimer le contact</string>
   <string name="conversation_action_copy_peer_number">Copier le numéro ou identifiant Ring</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copié vers leclipboard</string>
   <string name="conversation_action_select_peer_number">Choisir un numéro</string>
-  <string name="conversation_action_block_this">Bloquer ce contact</string>
+  <string name="conversation_action_block_this">Bloquer le contact</string>
   <string name="conversation_action_go_to_call">Revenir à l\'appel en cours</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Ajouter %1$s</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
   <string name="prompt_new_password_optional">Nouveau mot de passe (optionnel)</string>
   <string name="prompt_new_password_repeat">Confirmez le mot de passe</string>
@@ -141,6 +139,7 @@
   <string name="help_pin_enter">Entrez le NIP obtenu en configurant un autre compte Ring . Utilisez la fonction \"exportez un compte sur Ring\" pour obtenir un NIP.</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Précédent</string>
+  <string name="wizard_skip">Passez</string>
   <!--MenuHeaderView-->
   <string name="profile">Mon profil</string>
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
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 73b050b..39a344b 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -65,7 +65,6 @@
   <string name="action_call_decline">Odbij</string>
   <string name="ab_action_speakerphone">Omogući zvučnik</string>
   <string name="ab_action_contact_add">Dodaj u kontakte</string>
-  <string name="ab_action_contact_add_question">Dodati u kontakte?</string>
   <string name="ab_action_audio_call">Audio poziv</string>
   <string name="ab_action_video_call">Video poziv</string>
   <string name="ab_action_change_screen_orientation">Promjeni orijentaciju zaslona</string>
@@ -88,19 +87,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skenirajte QR kod korisnika kojeg želite dodati.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Očistiti povijest?</string>
-  <string name="clear_history_dialog_message"> Ova se radnja ne može poništiti.</string>
   <string name="clear_history_completed">Povijest je očišćena.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Izbrišite ovaj razgovor</string>
   <string name="conversation_action_delete_this_title">Izbrisati ovaj razgovor?</string>
   <string name="conversation_action_delete_this_message"> Ova se radnja ne može poništiti.</string>
+  <string name="conversation_action_history_clear">Očisti povijest</string>
+  <string name="conversation_action_remove_this">Izbriši kontakt</string>
   <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>
   <string name="prompt_new_password_repeat">Ponovite novu lozinku</string>
   <string name="account_create_title">Napravite Ring 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 eb85420..2e8e8ed 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -86,7 +86,6 @@
   <string name="action_call_decline">Elutasítás</string>
   <string name="ab_action_speakerphone">Hangszóró engedélyezése</string>
   <string name="ab_action_contact_add">Hozzáadás a partnerekhez</string>
-  <string name="ab_action_contact_add_question">Hozzáadja a partnerekhez?</string>
   <string name="hist_contact_added">Kapcsolat hozzáadva</string>
   <string name="hist_invitation_received">Meghívó érkezett</string>
   <string name="ab_action_audio_call">Hanghívás</string>
@@ -117,20 +116,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Olvassa be a hozzáadandó fiók QR-kódját.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Törli az előzményeket?</string>
-  <string name="clear_history_dialog_message">Ez a művelet nem vonható vissza.</string>
   <string name="clear_history_completed">Az előzmények törölve.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Beszélgetés törlése</string>
   <string name="conversation_action_delete_this_title">Törli ezt a beszélgetést?</string>
   <string name="conversation_action_delete_this_message">Ez a művelet nem vonható vissza.</string>
+  <string name="conversation_action_history_clear">Előzmények törlése</string>
+  <string name="conversation_action_remove_this">Partner törlése</string>
   <string name="conversation_action_copy_peer_number">Szám másolása</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s a vágólapra másolva</string>
   <string name="conversation_action_select_peer_number">Válasszon egy számot</string>
-  <string name="conversation_action_block_this">Ezen partner blokkolása</string>
   <string name="conversation_action_go_to_call">Visszatérés a folyamatban lévő híváshoz</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Hozzáadja: %1$s?</string>
   <string name="prompt_new_password">Új jelszó</string>
   <string name="prompt_new_password_optional">Új jelszó (választható)</string>
   <string name="prompt_new_password_repeat">Új jelszó még egyszer</string>
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 f0a5c9d..e92a4b9 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -34,7 +34,6 @@
   <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>
@@ -59,19 +58,16 @@
   <!--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_remove_this">Hapus kontak</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>
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 b206360..dcd0c41 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
@@ -72,7 +72,6 @@
   <string name="action_call_decline">Rifiuta</string>
   <string name="ab_action_speakerphone">Attiva l\'audio</string>
   <string name="ab_action_contact_add">Aggiungi alla rubrica</string>
-  <string name="ab_action_contact_add_question">Aggiungi alla rubrica?</string>
   <string name="ab_action_audio_call">Chiamata</string>
   <string name="ab_action_video_call">Videochiamata</string>
   <string name="ab_action_change_screen_orientation">Ruota schermo</string>
@@ -97,19 +96,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scansiona il codice QR dell\'account che vuoi aggiungere.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Pulisco la cronologia?</string>
-  <string name="clear_history_dialog_message">Questa operazione non può essere annullata.</string>
   <string name="clear_history_completed">La cronologia è stata cancellata.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Cancella questa conversazione</string>
   <string name="conversation_action_delete_this_title">Cancellare questa conversazione?</string>
   <string name="conversation_action_delete_this_message">Questa operazione non può essere annullata.</string>
+  <string name="conversation_action_history_clear">Elimina cronologia</string>
+  <string name="conversation_action_remove_this">Elimina contatto</string>
   <string name="conversation_action_copy_peer_number">Copia numero</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiato negli appunti</string>
   <string name="conversation_action_select_peer_number">Seleziona un numero</string>
-  <string name="conversation_action_block_this">Blocca questo contatto</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
   <string name="prompt_new_password">Nuova password</string>
   <string name="prompt_new_password_repeat">Ripeti nuova password</string>
   <string name="account_create_title">Crea un account Ring</string>
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 0dc11a1..1863cf2 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -80,7 +80,6 @@
   <string name="action_call_decline">Rifiuta</string>
   <string name="ab_action_speakerphone">Attiva gli altoparlanti</string>
   <string name="ab_action_contact_add">Aggiungi contatti</string>
-  <string name="ab_action_contact_add_question">Aggiungere contatti ?</string>
   <string name="ab_action_audio_call">Audiochiamata</string>
   <string name="ab_action_video_call">Videochiamata</string>
   <string name="ab_action_change_screen_orientation">Cambia orientamento dello schermo</string>
@@ -106,19 +105,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scansiona il QR Code del profilo che desideri aggiungere.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Cancellare cronologia ?</string>
-  <string name="clear_history_dialog_message">Questa azione è irreversibilie.</string>
   <string name="clear_history_completed">La cronologia è stata cancellata</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Cancellare questa conversazione</string>
   <string name="conversation_action_delete_this_title">Cancellare questa conversazione ?</string>
   <string name="conversation_action_delete_this_message">Questa azione è irreversibilie</string>
+  <string name="conversation_action_history_clear">Svuotare lo storico</string>
+  <string name="conversation_action_remove_this">Rimuovere contatto</string>
   <string name="conversation_action_copy_peer_number">Copia il numero</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiato negli appunti</string>
   <string name="conversation_action_select_peer_number">Scegli un numero</string>
-  <string name="conversation_action_block_this">Blocca questo contatto</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
   <string name="prompt_new_password">Nuovo password</string>
   <string name="prompt_new_password_optional">Nuova password (opzionale)</string>
   <string name="prompt_new_password_repeat">Ripeti la nuova password</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index f2ba260..6e7f504 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -71,7 +71,6 @@
   <string name="action_call_decline">辞退</string>
   <string name="ab_action_speakerphone">スピーカーを有効にする</string>
   <string name="ab_action_contact_add">連絡先に追加</string>
-  <string name="ab_action_contact_add_question">連絡先に追加しますか ?</string>
   <string name="ab_action_audio_call">音声通話</string>
   <string name="ab_action_video_call">ビデオ通話</string>
   <string name="ab_action_change_screen_orientation">画面の向きを変更</string>
@@ -96,19 +95,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">追加したいアカウントの QR コートをスキャンしてください。</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">履歴をクリアしますか ?</string>
-  <string name="clear_history_dialog_message">この操作は元に戻せません。</string>
   <string name="clear_history_completed">履歴をクリアしました。</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">この会話を削除</string>
   <string name="conversation_action_delete_this_title">この会話を削除しますか ?</string>
   <string name="conversation_action_delete_this_message">この操作は元に戻せません。</string>
+  <string name="conversation_action_history_clear">履歴をクリア</string>
+  <string name="conversation_action_remove_this">連絡先を削除</string>
   <string name="conversation_action_copy_peer_number">番号をコピー</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s をクリップボードにコピーしました</string>
   <string name="conversation_action_select_peer_number">番号を選択</string>
-  <string name="conversation_action_block_this">この連絡先をブロック</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">%1$s を追加しますか ?</string>
   <string name="prompt_new_password">新しいパスワード</string>
   <string name="prompt_new_password_repeat">新しいパスワードの繰り返し</string>
   <string name="account_create_title">Ringアカウントを作成</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 8189e24..b383f98 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Atmesti</string>
   <string name="ab_action_speakerphone">Įjungti garsiakalbį</string>
   <string name="ab_action_contact_add">Pridėti prie kontaktų</string>
-  <string name="ab_action_contact_add_question">Pridėti prie kontaktų ?</string>
   <string name="hist_contact_added">Kontaktas pridėtas</string>
   <string name="ab_action_audio_call">Garso skambutis</string>
   <string name="ab_action_video_call">Vaizdo skambutis</string>
@@ -108,18 +107,16 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Nuskenuokite paskyros, kurią norite pridėti, QR kodą.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Išvalyti istoriją ?</string>
-  <string name="clear_history_dialog_message">Šio veiksmo negalima bus atšaukti.</string>
   <string name="clear_history_completed">Istorija išvalyta.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Ištrinti šį pokalbį</string>
   <string name="conversation_action_delete_this_title">Ištrinti šį pokalbį ?</string>
   <string name="conversation_action_delete_this_message">Šio veiksmo negalima bus atšaukti.</string>
+  <string name="conversation_action_history_clear">Išvalyti istoriją</string>
+  <string name="conversation_action_remove_this">Ištrinti kontaktą</string>
   <string name="conversation_action_copy_peer_number">Kopijuoti numerį</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s nukopijuota į iškarpinę</string>
-  <string name="conversation_action_block_this">Užblokuoti šį kontaktą</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Pridėti %1$s ?</string>
   <string name="prompt_new_password">Naujas slaptažodis</string>
   <string name="prompt_new_password_optional">Naujas slaptažodis (nebūtina)</string>
   <string name="prompt_new_password_repeat">Pakartokite naują slaptažodį</string>
@@ -130,6 +127,7 @@
   <string name="help_pin_enter">Įveskite PIN iš kitos sukonfigūruotos Ring paskyros. Norėdami gauti PIN, naudokite ypatybę \"eksportuoti paskyrą Ring sistemoje\".</string>
   <string name="wizard_next">Kitas</string>
   <string name="wizard_back">Atgal</string>
+  <string name="wizard_skip">Praleisti</string>
   <!--MenuHeaderView-->
   <string name="profile">Mano profilis</string>
   <string name="profile_message_warning">Jūsų profilis yra bendrinamas tik su jūsų kontaktais</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index 9561fef..f7603d2 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -58,7 +58,6 @@
   <string name="action_call_decline">Bantah panggilan</string>
   <string name="ab_action_speakerphone">Aktifkan pembesar suara</string>
   <string name="ab_action_contact_add">Tambahkan sebagai kenalan</string>
-  <string name="ab_action_contact_add_question">Tambah sebagai kenalan ?</string>
   <string name="ab_action_audio_call">Panggilan suara</string>
   <string name="ab_action_video_call">Panggilan video</string>
   <string name="share_via">Kongsikan melalui</string>
@@ -82,18 +81,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Imbas kod QR akaun yang ingin anda tambah.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Padam sejarah ?</string>
-  <string name="clear_history_dialog_message">Aksi ini tidak akan dapat dibuat ulang.</string>
   <string name="clear_history_completed">Sejarah telah dipadam.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Padamkan perbualan ini</string>
   <string name="conversation_action_delete_this_title">Padamkan perbualan ini ?</string>
   <string name="conversation_action_delete_this_message">Aksi ini tidak akan dapat dibuat ulang.</string>
+  <string name="conversation_action_history_clear">Padamkan sejarah</string>
+  <string name="conversation_action_remove_this">Padam kenalan</string>
   <string name="conversation_action_copy_peer_number">Salin nombor</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s telah disalin</string>
   <string name="conversation_action_select_peer_number">Pilih nombor</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Tambah %1$s ?</string>
   <string name="prompt_new_password">Kata laluan baharu</string>
   <string name="prompt_new_password_repeat">Ulang kata laluan baharu</string>
   <string name="account_create_title">Cipta akaun Ring</string>
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 821decd..25d44db 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Avslå</string>
   <string name="ab_action_speakerphone">Aktiver høytaler</string>
   <string name="ab_action_contact_add">Legg til kontakter</string>
-  <string name="ab_action_contact_add_question">Legg til kontakter?</string>
   <string name="hist_contact_added">Kontakt lagt til</string>
   <string name="hist_invitation_received">Invitasjon mottatt</string>
   <string name="ab_action_audio_call">Talesamtale</string>
@@ -110,19 +109,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skann QR-koden tilhørende kontoen du ønsker å legge til.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Nullstill historikk?</string>
-  <string name="clear_history_dialog_message">Denne handlingen kan ikke gjøres om.</string>
   <string name="clear_history_completed">Historikken har blitt tømt.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Slett denne samtalen</string>
   <string name="conversation_action_delete_this_title">Slett denne samtalen?</string>
   <string name="conversation_action_delete_this_message">Denne handlingen kan ikke gjøres om.</string>
+  <string name="conversation_action_history_clear">Slett historikk</string>
+  <string name="conversation_action_remove_this">Slett kontakt</string>
   <string name="conversation_action_copy_peer_number">Kopier nummer</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopiert til utklippstavle</string>
   <string name="conversation_action_select_peer_number">Velg et nummer</string>
-  <string name="conversation_action_block_this">Blokker denne kontakten</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Legg til %1$s?</string>
   <string name="prompt_new_password">Nytt passord</string>
   <string name="prompt_new_password_optional">Nytt passord (valgfritt)</string>
   <string name="prompt_new_password_repeat">Gjenta nytt passord</string>
@@ -133,6 +130,7 @@
   <string name="help_pin_enter">Skriv inn PIN fra en annen oppsatt Ring-konto. Bruk \"eksporter konto på Ring\"-funksjonen for å hente en PIN.</string>
   <string name="wizard_next">Neste</string>
   <string name="wizard_back">Tilbake</string>
+  <string name="wizard_skip">Hopp over</string>
   <!--MenuHeaderView-->
   <string name="profile">Min profil</string>
   <string name="profile_message_warning">Din profil deles bare med dine kontakter</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 33aade0..eb9c666 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Weigeren</string>
   <string name="ab_action_speakerphone">Luidspreker inschakelen</string>
   <string name="ab_action_contact_add">Aan contacten toevoegen</string>
-  <string name="ab_action_contact_add_question">Aan contacten toevoegen?</string>
   <string name="hist_contact_added">Contact toegevoegd</string>
   <string name="hist_invitation_received">Uitnodiging ontvangen</string>
   <string name="ab_action_audio_call">Audio-oproep</string>
@@ -110,19 +109,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scand de QR-code van den toe te voegen account.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
-  <string name="clear_history_dialog_message">Handeling kan nie ongedaan worden gemaakt.</string>
   <string name="clear_history_completed">Geschiedenis is gewist.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Dit gesprek verwijderen</string>
   <string name="conversation_action_delete_this_title">Dit gesprek verwijderen?</string>
   <string name="conversation_action_delete_this_message">Handeling kan nie ongedaan worden gemaakt.</string>
+  <string name="conversation_action_history_clear">Geschiedenis wissen</string>
+  <string name="conversation_action_remove_this">Contact verwijderen</string>
   <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">Kiesd 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 paswoord</string>
   <string name="prompt_new_password_optional">Nieuw paswoord (optioneel)</string>
   <string name="prompt_new_password_repeat">Herhaal nieuw paswoord</string>
@@ -133,6 +130,7 @@
   <string name="help_pin_enter">Voerd de pincode in vanuit uwe Ring-account die al is geconfigureerd op een ander apparaat. Gebruikt de functie ‘account exporteren naar de Ring’ voor een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
+  <string name="wizard_skip">Overslaan</string>
   <!--MenuHeaderView-->
   <string name="profile">Mijn profiel</string>
   <string name="profile_message_warning">Uw profiel word enkel gedeeld met uw contacten</string>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 326d5e4..a4fe535 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
@@ -35,7 +35,6 @@
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
-  <string name="clear_history_dialog_message">Deze actie kan niet ongedaan worden</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this_title">Dit gesprek verwijderen?</string>
   <string name="conversation_action_delete_this_message">Deze actie kan niet ongedaan worden</string>
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 24e9514..701cda9 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -82,7 +82,6 @@
   <string name="action_call_decline">Weigeren</string>
   <string name="ab_action_speakerphone">Luidspreker inschakelen</string>
   <string name="ab_action_contact_add">Aan contacten toevoegen</string>
-  <string name="ab_action_contact_add_question">Aan contacten toevoegen?</string>
   <string name="hist_contact_added">Contact toegevoegd</string>
   <string name="hist_invitation_received">Uitnodiging ontvangen</string>
   <string name="ab_action_audio_call">Audio-oproep</string>
@@ -110,19 +109,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scan de QR-code van het toe te voegen account.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
-  <string name="clear_history_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string>
   <string name="clear_history_completed">Geschiedenis is gewist.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Dit gesprek verwijderen</string>
   <string name="conversation_action_delete_this_title">Dit gesprek verwijderen?</string>
   <string name="conversation_action_delete_this_message">Handeling kan niet ongedaan gemaakt worden.</string>
+  <string name="conversation_action_history_clear">Geschiedenis wissen</string>
+  <string name="conversation_action_remove_this">Contact verwijderen</string>
   <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>
   <string name="prompt_new_password_optional">Nieuw wachtwoord (optioneel)</string>
   <string name="prompt_new_password_repeat">Herhaal nieuwe wachtwoord</string>
@@ -133,6 +131,7 @@
   <string name="help_pin_enter">Voer de pincode in vanuit je Ring-account die al is geconfigureerd op een ander apparaat. Gebruik de functie ‘account exporteren naar de Ring’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
+  <string name="wizard_skip">Overslaan</string>
   <!--MenuHeaderView-->
   <string name="profile">Mijn profiel</string>
   <string name="profile_message_warning">Je profiel wordt enkel gedeeld met je contacten</string>
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 a0fb310..3f676b6 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -88,7 +88,6 @@
   <string name="action_call_decline">Odrzuć</string>
   <string name="ab_action_speakerphone">Włącz głośnik</string>
   <string name="ab_action_contact_add">Dodaj do kontaków</string>
-  <string name="ab_action_contact_add_question">Czy dodać do kontaktów?</string>
   <string name="hist_contact_added">Kontakt dodany</string>
   <string name="hist_invitation_received">Otrzymano zaproszenie</string>
   <string name="ab_action_audio_call">Połączenie głosowe</string>
@@ -119,20 +118,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Zeskanuj kod QR konta, które chcesz dodać.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Wyczyścić historię?</string>
-  <string name="clear_history_dialog_message">Tego działania nie można cofnąć.</string>
   <string name="clear_history_completed">Historia została wyczyszczona.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Usuń tę rozmowę</string>
   <string name="conversation_action_delete_this_title">Czy usunąć tę rozmowę?</string>
   <string name="conversation_action_delete_this_message">Tego działania nie można cofnąć.</string>
+  <string name="conversation_action_history_clear">Wyczyść historię</string>
+  <string name="conversation_action_remove_this">Usuń kontakt</string>
   <string name="conversation_action_copy_peer_number">Skopiuj numer</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s skopiowany do schowka</string>
   <string name="conversation_action_select_peer_number">Wybierz numer</string>
-  <string name="conversation_action_block_this">Zablokuj kontakt</string>
   <string name="conversation_action_go_to_call">Powróć do trwającej rozmowy</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</string>
   <string name="prompt_new_password">Nowe hasło</string>
   <string name="prompt_new_password_optional">Nowe hasło (opcjonalnie)</string>
   <string name="prompt_new_password_repeat">Powtórz nowe hasło</string>
@@ -143,6 +140,7 @@
   <string name="help_pin_enter">Wprowadź PIN z innego skonfigurowanego konta Ring. Użyj opcji \"eksportuj konto w Ring\" aby uzyskać PIN</string>
   <string name="wizard_next">Następne</string>
   <string name="wizard_back">Wstecz</string>
+  <string name="wizard_skip">Pomiń</string>
   <!--MenuHeaderView-->
   <string name="profile">Mój profil</string>
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
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 6e2149f..6f4a9c4 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
@@ -86,7 +86,6 @@
   <string name="action_call_decline">Rejeitar</string>
   <string name="ab_action_speakerphone">Habilitar viva-voz</string>
   <string name="ab_action_contact_add">Adicionar aos contatos</string>
-  <string name="ab_action_contact_add_question">Adicionar aos contatos?</string>
   <string name="hist_contact_added">Contato adicionado</string>
   <string name="hist_invitation_received">Convite recebido</string>
   <string name="ab_action_audio_call">Voz da chamada</string>
@@ -117,20 +116,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escanear o QR Code da conta que deseja adicionar.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Limpar histórico?</string>
-  <string name="clear_history_dialog_message">Esta ação não pode ser revista.</string>
   <string name="clear_history_completed">O histórico foi apagado.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Deletar conversa</string>
   <string name="conversation_action_delete_this_title">Deletar esta conversa ?</string>
   <string name="conversation_action_delete_this_message">Esta ação não pode ser revista.</string>
+  <string name="conversation_action_history_clear">Limpar histórico</string>
+  <string name="conversation_action_remove_this">Deletar contato</string>
   <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>
   <string name="conversation_action_go_to_call">Voltar à chamada em andamento</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
   <string name="prompt_new_password">Nova senha</string>
   <string name="prompt_new_password_optional">Nova senha (opcional)</string>
   <string name="prompt_new_password_repeat">Repita a nova senha</string>
@@ -141,6 +138,7 @@
   <string name="help_pin_enter">Entre com o PIN de uma outra conta Ring já configurada. Utilize a opção \"exportar conta no Ring\" para obter um novo PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
+  <string name="wizard_skip">Pular</string>
   <!--MenuHeaderView-->
   <string name="profile">Meu perfil</string>
   <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
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 d66bbbd..61d99f8 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -51,7 +51,6 @@
   <string name="action_call_decline">Recusar</string>
   <string name="ab_action_speakerphone">Ligar altifalante</string>
   <string name="ab_action_contact_add">Adicionar aos contactos</string>
-  <string name="ab_action_contact_add_question">Adicionar aos contactos ?</string>
   <string name="ab_action_audio_call">Chamada de áudio</string>
   <string name="ab_action_video_call">Chamada de vídeo</string>
   <string name="share_via">Partilhar via</string>
@@ -74,8 +73,6 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Digitalize o código QR da conta que pretende adicionar.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Limpar histórico?</string>
-  <string name="clear_history_dialog_message">Esta ação não pode ser reposta.</string>
   <string name="clear_history_completed">Histórico limpo.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Eliminar conversa</string>
@@ -85,7 +82,6 @@
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado para a área de transferência</string>
   <string name="conversation_action_select_peer_number">Selecione um número</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
   <string name="prompt_new_password">Nova password</string>
   <string name="prompt_new_password_repeat">Repetir nova password</string>
   <string name="account_create_title">Criar uma conta Ring</string>
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 ff0ca70..1e38a7f 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -61,7 +61,6 @@
   <string name="start_error_title">Ring nu a putut porni!</string>
   <string name="action_call_decline">Refuză</string>
   <string name="ab_action_contact_add">Adaugă la contacte</string>
-  <string name="ab_action_contact_add_question">Adaugi la contacte ?</string>
   <string name="ab_action_audio_call">Apel audio</string>
   <string name="ab_action_video_call">Apel video</string>
   <string name="share_via">Distribuie prin</string>
@@ -78,7 +77,6 @@
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
-  <string name="clear_history_dialog_title">Ștergi istoria ?</string>
   <string name="clear_history_completed">Istoria a fost ștearsă</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Șterge aceasta istorie</string>
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 df73e27..dc4c2da 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
@@ -60,7 +60,6 @@
   <string name="action_call_decline">Отказаться</string>
   <string name="ab_action_speakerphone">Включить звук</string>
   <string name="ab_action_contact_add">Добавить контакт</string>
-  <string name="ab_action_contact_add_question">Добавить в контакты?</string>
   <string name="ab_action_audio_call">Аудиовызов</string>
   <string name="ab_action_video_call">Видеозвонок</string>
   <string name="share_via">Поделится</string>
@@ -83,18 +82,16 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Сканировать QR код аккаунта, который хотите добавить</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Очистить историю?</string>
-  <string name="clear_history_dialog_message">Это действие не может быть отменено</string>
   <string name="clear_history_completed">История очищена.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Удалить беседу</string>
   <string name="conversation_action_delete_this_title">Удалить беседу?</string>
   <string name="conversation_action_delete_this_message">Это действие не может быть отменено</string>
+  <string name="conversation_action_remove_this">Удалить контакт</string>
   <string name="conversation_action_copy_peer_number">Скопировать номер</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s скопировано в буфер обмена</string>
   <string name="conversation_action_select_peer_number">Выберите номер</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
   <string name="prompt_new_password">Новый пароль</string>
   <string name="account_create_title">Создать Ring аккаунт</string>
   <string name="wizard_next">Далее</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 61f62c6..1a346c3 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -88,7 +88,6 @@
   <string name="action_call_decline">Отклонить</string>
   <string name="ab_action_speakerphone">Включить громкоговоритель</string>
   <string name="ab_action_contact_add">Добавить в контакты</string>
-  <string name="ab_action_contact_add_question">Добавить в контакты?</string>
   <string name="hist_contact_added">Контакт добавлен</string>
   <string name="hist_invitation_received">Получено приглашение</string>
   <string name="ab_action_audio_call">Голосовой вызов</string>
@@ -119,20 +118,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Отсканируйте QR-код аккаунта, который вы хотите добавить.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Очистить историю ?</string>
-  <string name="clear_history_dialog_message">Это действие нельзя отменить.</string>
   <string name="clear_history_completed">История была очищена.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Удалить этот разговор</string>
   <string name="conversation_action_delete_this_title">Удалить этот разговор?</string>
   <string name="conversation_action_delete_this_message">Это действие нельзя отменить.</string>
+  <string name="conversation_action_history_clear">Очистить историю</string>
+  <string name="conversation_action_remove_this">Удалить контакт</string>
   <string name="conversation_action_copy_peer_number">Копировать номер</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s скопировано в буфер обмена</string>
   <string name="conversation_action_select_peer_number">Выбрать номер</string>
-  <string name="conversation_action_block_this">Заблокировать этот контакт</string>
   <string name="conversation_action_go_to_call">Вернуться к текущему вызову</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Добавить %1$s?</string>
   <string name="prompt_new_password">Новый пароль</string>
   <string name="prompt_new_password_optional">Новый пароль (необязательно)</string>
   <string name="prompt_new_password_repeat">Повторите новый пароль</string>
@@ -143,6 +140,7 @@
   <string name="help_pin_enter">Введите PIN от настроенного аккаунта Ring. Используйте функцию «экспортировать аккаунт в Ring», чтобы получить PIN.</string>
   <string name="wizard_next">Далее</string>
   <string name="wizard_back">Назад</string>
+  <string name="wizard_skip">Пропустить</string>
   <!--MenuHeaderView-->
   <string name="profile">Мой профиль</string>
   <string name="profile_message_warning">Ваш профиль доступен только вашим контактам</string>
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 80a8722..a1a4b66 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -67,7 +67,6 @@
   <string name="action_call_decline">Zavrni</string>
   <string name="ab_action_speakerphone">Omogoči zvočnik</string>
   <string name="ab_action_contact_add">Dodaj v stike</string>
-  <string name="ab_action_contact_add_question">Dodam k stikom ?</string>
   <string name="ab_action_audio_call">Zvočni klic</string>
   <string name="ab_action_video_call">Video klic</string>
   <string name="ab_action_change_screen_orientation">Zammenjaj orientacijo zaslona</string>
@@ -89,19 +88,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Preberi QR kodo stika, ki ga želiš dodati.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Zbrišem zgodovino ?</string>
-  <string name="clear_history_dialog_message">Te operacije ne morete preklicati.</string>
   <string name="clear_history_completed">Zgodovina je bila pobrisana.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Pobriši ta pogovor</string>
   <string name="conversation_action_delete_this_title">Pobrišem ta pogovor ?</string>
   <string name="conversation_action_delete_this_message">Te operacije ne morete preklicati.</string>
+  <string name="conversation_action_history_clear">Pobriši zgodovino</string>
+  <string name="conversation_action_remove_this">Pobriši stik</string>
   <string name="conversation_action_copy_peer_number">Kopiraj številko</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s skopirano na odlođižšče</string>
   <string name="conversation_action_select_peer_number">Izberi številko</string>
-  <string name="conversation_action_block_this">Blokiraj ta stik</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Dodam%1$s ?</string>
   <string name="prompt_new_password">Novo geslo</string>
   <string name="prompt_new_password_repeat">Ponovi novo geslo</string>
   <string name="account_create_title">Ustvari Ring račun</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 8fc5d9f..90fff48 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
@@ -85,7 +85,6 @@
   <string name="action_call_decline">Hidhe tej</string>
   <string name="ab_action_speakerphone">Aktivizoni altoparlantin</string>
   <string name="ab_action_contact_add">Shtoje te kontaktet</string>
-  <string name="ab_action_contact_add_question">Të shtohet te kontaktet?</string>
   <string name="hist_contact_added">Kontakti u shtua</string>
   <string name="hist_invitation_received">Ftesa u mor</string>
   <string name="ab_action_audio_call">Thirrje audio</string>
@@ -116,20 +115,19 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skanoni kodin QR të llogarisë që doni të shtoni.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Të pastrohet historiku?</string>
-  <string name="clear_history_dialog_message">Ky veprim s\’mund të zhbëhet.</string>
   <string name="clear_history_completed">Historiku u pastrua.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Fshije këtë bisedë</string>
   <string name="conversation_action_delete_this_title">Të fshihet kjo bisedë?</string>
   <string name="conversation_action_delete_this_message">Ky veprim s\’mund të zhbëhet.</string>
+  <string name="conversation_action_history_clear">Pastroje historikun</string>
+  <string name="conversation_action_remove_this">Fshije kontaktin</string>
   <string name="conversation_action_copy_peer_number">Kopjoje numrin</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s u kopjua te e papastra</string>
   <string name="conversation_action_select_peer_number">Përzgjidhni një numër</string>
-  <string name="conversation_action_block_this">Bllokoje këtë kontakt</string>
+  <string name="conversation_action_block_this">Bllokojeni kontaktin</string>
   <string name="conversation_action_go_to_call">Rikthehu te thirrja që po bëhej</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Të shtohet %1$s ?</string>
   <string name="prompt_new_password">Fjalëkalim i ri</string>
   <string name="prompt_new_password_optional">Fjalëkalim i ri (opsional)</string>
   <string name="prompt_new_password_repeat">Përsëriteni fjalëkalimin e ri</string>
@@ -140,6 +138,7 @@
   <string name="help_pin_enter">Jepni PIN-in prej një llogarie tjetër Ring të formësuar. Përdorni veçorinë \"eksportoje llogarinë në Ring\" që të merrni një PIN.</string>
   <string name="wizard_next">Pasuesi</string>
   <string name="wizard_back">Mbrapsht</string>
+  <string name="wizard_skip">Anashkaloje</string>
   <!--MenuHeaderView-->
   <string name="profile">Profili im</string>
   <string name="profile_message_warning">Profili juaj ndahet vetëm me kontaktet tuaja</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 6b641e3..f505f21 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -86,7 +86,6 @@
   <string name="action_call_decline">Avslå</string>
   <string name="ab_action_speakerphone">Aktivera högtalare</string>
   <string name="ab_action_contact_add">Lägg till i kontakter</string>
-  <string name="ab_action_contact_add_question">Vill du lägga till i kontakter?</string>
   <string name="hist_contact_added">Kontakt tillagt</string>
   <string name="hist_invitation_received">Inbjudan mottagen</string>
   <string name="ab_action_audio_call">Ljudsamtal</string>
@@ -117,20 +116,19 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scanna in QR-koden för det konto du vill lägga till.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Vill du rensa historiken?</string>
-  <string name="clear_history_dialog_message">Denna åtgärd kan inte ångras.</string>
   <string name="clear_history_completed">Historiken har rensats bort.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Ta bort den här konversationen</string>
   <string name="conversation_action_delete_this_title">Vill du ta bort den här konversationen?</string>
   <string name="conversation_action_delete_this_message">Denna åtgärd kan inte ångras.</string>
+  <string name="conversation_action_history_clear">Rensa historik</string>
+  <string name="conversation_action_remove_this">Ta bort kontakt</string>
   <string name="conversation_action_copy_peer_number">Kopiera nummer</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s kopierat till urklipp</string>
   <string name="conversation_action_select_peer_number">Välj ett nummer</string>
-  <string name="conversation_action_block_this">Blockera den här kontakten</string>
+  <string name="conversation_action_block_this">Blockera kontakt</string>
   <string name="conversation_action_go_to_call">Återgå till pågående samtal</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Vill du lägga till %1$s ?</string>
   <string name="prompt_new_password">Nytt lösenord</string>
   <string name="prompt_new_password_optional">Nytt lösenord (ej obligatoriskt)</string>
   <string name="prompt_new_password_repeat">Upprepa nytt lösenord</string>
@@ -141,6 +139,7 @@
   <string name="help_pin_enter">Ange PIN-koden från ett annat konfigurerat Ring-konto. Använd \"Exportera konto på Ring\", för att få din PIN-kod.</string>
   <string name="wizard_next">Nästa</string>
   <string name="wizard_back">Tillbaka</string>
+  <string name="wizard_skip">Hopa över</string>
   <!--MenuHeaderView-->
   <string name="profile">Min profil</string>
   <string name="profile_message_warning">Din profil delas endast med dina kontakter</string>
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 236f125..b32ab80 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -72,7 +72,6 @@
   <string name="action_call_decline">Reddet</string>
   <string name="ab_action_speakerphone">Hoparlörü etkinleştir</string>
   <string name="ab_action_contact_add">Kişilere ekle</string>
-  <string name="ab_action_contact_add_question">Kişilere eklensin mi?</string>
   <string name="ab_action_audio_call">Sesli arama</string>
   <string name="ab_action_video_call">Görüntülü arama</string>
   <string name="ab_action_change_screen_orientation">Ekran Yönünü değiştir</string>
@@ -97,19 +96,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Eklemek istediğiniz hesabın QR kodunu tarayın.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Geçmişi temizle ?</string>
-  <string name="clear_history_dialog_message">Bu eylem geri alınamaz.</string>
   <string name="clear_history_completed">Geçmiş temizlenmiş.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Bu konuşmayı sil</string>
   <string name="conversation_action_delete_this_title">Bu konuşmayı sil ?</string>
   <string name="conversation_action_delete_this_message">Bu eylem geri alınamaz.</string>
+  <string name="conversation_action_history_clear">Geçmişi temizle</string>
+  <string name="conversation_action_remove_this">Kişiyi sil</string>
   <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>
   <string name="prompt_new_password_repeat">Yeni parola tekrar</string>
   <string name="account_create_title">Bir Ring hesabı oluştur</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index d7692bb..4af046f 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -74,7 +74,6 @@
   <string name="action_call_decline">Відхилити</string>
   <string name="ab_action_speakerphone">Увімкнути гучномовець</string>
   <string name="ab_action_contact_add">Додати до контактів</string>
-  <string name="ab_action_contact_add_question">Додати до контактів?</string>
   <string name="ab_action_audio_call">Голосовий виклик</string>
   <string name="ab_action_video_call">Відео виклик</string>
   <string name="ab_action_change_screen_orientation">Змінити орієнтацію екрану</string>
@@ -99,19 +98,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Проскануйте QR-код облікового запису, який ви хочете додати.</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Очистити історію?</string>
-  <string name="clear_history_dialog_message">Ця дія не може бути скасована.</string>
   <string name="clear_history_completed">Історія була очищена.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Видалити цю розмову</string>
   <string name="conversation_action_delete_this_title">Видалити цю розмову?</string>
   <string name="conversation_action_delete_this_message">Ця дія не може бути скасована.</string>
+  <string name="conversation_action_history_clear">Видалити історію</string>
+  <string name="conversation_action_remove_this">Видалити контакт</string>
   <string name="conversation_action_copy_peer_number">Копіювати номер</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s збережено у буфер</string>
   <string name="conversation_action_select_peer_number">Виберіть номер</string>
-  <string name="conversation_action_block_this">Заблокувати контакт</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">Додати %1$s ?</string>
   <string name="prompt_new_password">Новий пароль</string>
   <string name="prompt_new_password_repeat">Новий пароль ще раз</string>
   <string name="account_create_title">Створити обліковий запис Ring</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index cf829c4..c86c253 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
@@ -70,7 +70,6 @@
   <string name="action_call_decline">拒接</string>
   <string name="ab_action_speakerphone">开启扬声器</string>
   <string name="ab_action_contact_add">加入通讯录</string>
-  <string name="ab_action_contact_add_question">添加至通讯录吗？</string>
   <string name="ab_action_audio_call">语音通话</string>
   <string name="ab_action_video_call">视频通话</string>
   <string name="ab_action_change_screen_orientation">切换屏幕方向</string>
@@ -95,19 +94,17 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">扫描您想添加帐户的二维码。</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">清除历史记录吗？</string>
-  <string name="clear_history_dialog_message">该操作不可撤销。</string>
   <string name="clear_history_completed">已清除历史记录。</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">删除该会话</string>
   <string name="conversation_action_delete_this_title">删除该会话吗？</string>
   <string name="conversation_action_delete_this_message">该操作不可撤销。</string>
+  <string name="conversation_action_history_clear">清除历史记录</string>
+  <string name="conversation_action_remove_this">删除联系人</string>
   <string name="conversation_action_copy_peer_number">复制号码</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s已复制至剪贴板</string>
   <string name="conversation_action_select_peer_number">选择一个数字</string>
-  <string name="conversation_action_block_this">屏蔽该联系人</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">添加%1$s吗？</string>
   <string name="prompt_new_password">新密码</string>
   <string name="prompt_new_password_repeat">确认新密码</string>
   <string name="account_create_title">创建Ring帐户</string>
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 8215102..3611c44 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
@@ -85,7 +85,6 @@
   <string name="action_call_decline">拒絕</string>
   <string name="ab_action_speakerphone">啟用喇叭</string>
   <string name="ab_action_contact_add">加到聯絡人</string>
-  <string name="ab_action_contact_add_question">加到聯絡人？</string>
   <string name="hist_contact_added">已新增聯絡人</string>
   <string name="hist_invitation_received">已收到邀請</string>
   <string name="ab_action_audio_call">音訊通話</string>
@@ -116,20 +115,18 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">掃描你想要加入的帳號的 QR Code 。</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">清除記錄嗎？</string>
-  <string name="clear_history_dialog_message">這個動作無法被復原。</string>
   <string name="clear_history_completed">記錄已經被清除。</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">刪除此對話</string>
   <string name="conversation_action_delete_this_title">刪除此對話嗎？</string>
   <string name="conversation_action_delete_this_message">這個動作無法被復原。</string>
+  <string name="conversation_action_history_clear">清除記錄</string>
+  <string name="conversation_action_remove_this">刪除聯絡人</string>
   <string name="conversation_action_copy_peer_number">複製號碼</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s 複製到剪貼簿</string>
   <string name="conversation_action_select_peer_number">選擇號碼</string>
-  <string name="conversation_action_block_this">阻擋聯絡人</string>
   <string name="conversation_action_go_to_call">回到進行中的通話</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">加入 %1$s 嗎？</string>
   <string name="prompt_new_password">新密碼</string>
   <string name="prompt_new_password_optional">新密碼（選擇性）</string>
   <string name="prompt_new_password_repeat">重新輸入新密碼</string>
@@ -140,6 +137,7 @@
   <string name="help_pin_enter">輸入從其他已設定 Ring 帳號的 PIN 碼。使用「在 RIng 上匯出帳號」功能來取得 PIN 碼。</string>
   <string name="wizard_next">下一個</string>
   <string name="wizard_back">前一個</string>
+  <string name="wizard_skip">略過</string>
   <!--MenuHeaderView-->
   <string name="profile">我的介紹</string>
   <string name="profile_message_warning">您的介紹僅與您的聯絡人分享</string>