diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index e5afc0886b2c03e3c6e9af70782e94d2e85800e6..994f07df432378890890e43c104fc303bf324e36 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -284,12 +284,12 @@
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "أدخِل كلمة المرور";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "ألغِ";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index 9924676ada724ea9d9459f273e28cecf51c1585d..eecec2f84f9fdc0c6e655fe50b1a1b3565e16791 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Пренасяне на профил";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Въведете парола";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Премахване на профил";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Отказ";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index d810f08c186843b098d5a3284178e9fed1a37490..620e562fc256e3ed46576ef077c81e7c0b3a2495 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migració de compte";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Introduïu la contrasenya";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancel·la";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index 5d22a8e307c3b2769638e1fa80123a3a6cc6ac1b..ce235f99ec0b91e8351dc221f08582beb5fd21bf 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Převod účtu";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Zadejte heslo";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Zrušit";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index 235ae9ef0e3992b19d720ab60fb4826ab578ca71..92c8a1ff7736827d6e12a08868ab9145e8ddf041 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Konto-migrering";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Indtast adgangskode";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuller";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index 01983d16f0b46eb73b0005759c37f265131b5fb3..f7509f54c6e136adbffbb140b51c2259af926614 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -284,12 +284,12 @@
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Passwort eingeben";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Abbrechen";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index f73247f7ce8efe46e82232a657e7ad8f56ab9b0f..eca01e5b08262e96aed28b95edd21e9a2593599e 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -146,7 +146,7 @@
 //Calls
 "calls.callItemTitle" = "Anruf";
 "calls.unknown" = "Unbekannt";
-"calls.incomingCallInfo" = "möchte mit Dir sprechen.";
+"calls.incomingCallInfo" = "möchte mit Ihnen sprechen.";
 "calls.ringing" = "Klingelt …";
 "calls.connecting" = "Verbinde...";
 "calls.searching" = "Suchen…";
@@ -190,7 +190,7 @@
 "accountPage.removeAccountButton" = "Entfernen";
 "accountPage.shareAccountDetails" = "Kontodetails teilen";
 "accountPage.contactMeOnJamiTitle" = "Kontaktieren Sie mich über Jami!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.contactMeOnJamiContant" = "Kontaktieren Sie mich über \"%s\" auf der verteilten Kommunikationsplattform Jami: https://jami.net";
 "accountPage.registerNameTitle" = "Benutzername registrieren";
 "accountPage.passwordPlaceholder" = "Geben Sie ihr Kontopasswort ein";
 "accountPage.usernamePlaceholder" = "Gewünschten Benutzername eingeben";
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "Verbindet";
 "account.statusUnknown" = "Unbekannt";
 "account.statusConnectionerror" = "Verbindungsfehler";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Konto muss migriert werden";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "Keine gesperrten Kontakte";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Videobeschleunigung aktivieren";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Kontomigration";
+"migrateAccount.migrateButton" = "Konto migrieren";
+"migrateAccount.explanation" = "Ihr Konto muss migriert werden";
+"migrateAccount.passwordPlaceholder" = "Passwort eingeben";
+"migrateAccount.passwordExplanation" = "Um mit der Migration fortzufahren, muss das für das Konto verwendete Passwort eingegeben werden";
+"migrateAccount.removeAccount" = "Konto entfernen";
+"migrateAccount.error" = "Ihr Konto konnte nicht migriert werden. Sie können es erneut versuchen oder Ihr Konto löschen.";
+"migrateAccount.migrating" = "Migriere...";
+"migrateAccount.cancel" = "Abbrechen";
+"migrateAccount.migrateAnother" = "Anderes Konto migrieren";
 
 
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index 7e56c67ccda971346c6ab62cce44846b62a18d9c..53f14a354fd889d57e52184bf2b0c45bd4bc725a 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -284,12 +284,12 @@
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Εισάγετε τον κωδικό πρόσβασης";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Ακύρωση";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index f2e56bee91432f14bcda386e2b412ffdd38d7d10..8178695139f2741d0d1968cbcf805200c003196a 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Rezigni";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index a731fe9685d3935e5ac0022b56227bb04f294318..f7a186edf56cf83c64837668236fb7a314a2a2c6 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -190,7 +190,7 @@
 "accountPage.removeAccountButton" = "Eliminar";
 "accountPage.shareAccountDetails" = "Compartir detalles de la cuenta";
 "accountPage.contactMeOnJamiTitle" = "¡Contáctame en Jami!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.contactMeOnJamiContant" = "Contáctame buscándome como \"%s\" en Jami, plataforma de comunicación distribuida: https://jami.net";
 "accountPage.registerNameTitle" = "Registrar nombre de usuario";
 "accountPage.passwordPlaceholder" = "Introduce la contraseña de la cuenta";
 "accountPage.usernamePlaceholder" = "Introduzca el nombre de usuario deseado";
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Es necesario migrar su cuenta";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "No hay contactos bloqueados";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Habilitar aceleración de video";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Migración de la cuenta";
+"migrateAccount.migrateButton" = "Migrar Cuenta";
+"migrateAccount.explanation" = "Es necesario migrar esta cuenta";
+"migrateAccount.passwordPlaceholder" = "Ingresa la contraseña";
+"migrateAccount.passwordExplanation" = "Para realizar la migración, es necesario que ingreses la contraseña de esta cuenta.";
+"migrateAccount.removeAccount" = "Eliminar cuenta";
+"migrateAccount.error" = "Se produjo un error al migrar tu cuenta. Puedes reintentarlo o eliminar tu cuenta.";
+"migrateAccount.migrating" = "Migrando...";
+"migrateAccount.cancel" = "Cancelar";
+"migrateAccount.migrateAnother" = "Migrar otra cuenta";
 
 
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 8d775334fd03a251647616604967a7f47de16fea..25b02dcda1b2b24df972c6fc18748f53481989ec 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migración de cuenta";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Ingresar contraseña";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancelar";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index 4f5f5af14a5f94c4e0d97e3f5bddba87ce0b43e5..e0972cfe770cccd64b0f992fc5d67863df1ddf91 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Kontuaren migrazioa";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Sartu pasahitza";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Ezeztatu";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index daf9b088fbe2e28c840d902d25d35dc612c08cc3..71043462b03e02fa629b330023b18a1ec969a6d9 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 "smartlist.conversations" = "گفتگو‌ها";
 "smartlist.searching" = "در حال جستجو...";
 "smartlist.noResults" = "بدون نتیجه";
-"smartlist.noConversation" = "بدون مکالمه";
+"smartlist.noConversation" = "بدون گفتگو";
 "smartlist.searchBarPlaceholder" = "نام را وارد کنید...";
 "smartlist.noNetworkConnectivity" = "بدون اتصال شبکه";
 "smartlist.cellularAccess" = "اطمینان حاصل کنید که دسترسی به تلفن همراه در تنظیمات شما اعمال شده";
@@ -100,13 +100,13 @@
 "linkToAccount.explanationPinMessage" = "برای تولید پین کد ( یا PIN)، به تنظیمات مدیریت حساب در دستگاهی که حاوی حساب کاربری مورد نظر شماست رجوع کنید. در تنظیمات دستگاه، «یک دستگاه دیگر را به این حساب پیوند دهید» را انتخاب کنید. برای تکمیل این فرم پین لازم را دریافت خواهید کرد. پین فقط ده (10) دقیقه معتبر است";
 
 //Link To Account Manager form
-"linkToAccountManager.signIn" = "Sign In";
+"linkToAccountManager.signIn" = "ورود";
 "linkToAccountManager.passwordPlaceholder" = "گذرواژه";
 "linkToAccountManager.passwordLabel" = "گذرواژه را وارد کنید";
 "linkToAccountManager.usernamePlaceholder" = "نام کاربری";
 "linkToAccountManager.usernameLabel" = "نام‌کاربری را وارد کنید";
 "linkToAccountManager.accountManagerPlaceholder" = "مدیر حساب کاربری";
-"linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
+"linkToAccountManager.accountManagerLabel" = "ورود URI مدیریت حساب";
 
 //Alerts
 "alerts.accountCannotBeFoundTitle" = "نمی توان حساب را پیدا کرد";
@@ -122,16 +122,16 @@
 "alerts.accountLinkedTitle" = "پیوند دادن حسابها";
 "alerts.dbFailedTitle" = "خطایی هنگام راه‌اندازی جامی رخ داد";
 "alerts.dbFailedMessage" = "لطفا برنامه را ببندید و دوباره آن را باز کنید.";
-"alerts.confirmBlockContact" = "آیا مطمئن هستید که میخواهید این مخاطب را مسدود کنید؟ تاریخچه مکالمه با این مخاطب برای همیشه پاک خواهد شد.";
+"alerts.confirmBlockContact" = "آیا مطمئن هستید که میخواهید این مخاطب را مسدود کنید؟ تاریخچه گفتگو با این مخاطب برای همیشه پاک خواهد شد.";
 "alerts.confirmBlockContactTitle" = "مسدود سازی مخاطب";
-"alerts.confirmDeleteConversation" = "آیا اطمینان دارید که میخواهید این مکالمه را برای همیشه پاک کنید؟";
-"alerts.confirmDeleteConversationFromContact" = "آیا مطمئن هستید که میخواهید این مکالمه با این مخاطب را پاک کنید؟";
-"alerts.confirmDeleteConversationTitle" = "پاک کردن مکالمه";
-"alerts.confirmClearConversation" = "اطمینان دارید که می‌خواهید مکالمه با این مخاطب را پاک کنید؟";
-"alerts.confirmClearConversationTitle" = "پاک کردن مکالمه";
+"alerts.confirmDeleteConversation" = "آیا اطمینان دارید که می‌خواهید این گفتگو را برای همیشه پاک کنید؟";
+"alerts.confirmDeleteConversationFromContact" = "آیا مطمئن هستید که میخواهید این گفتگو با این مخاطب را پاک کنید؟";
+"alerts.confirmDeleteConversationTitle" = "پاک کردن گفتگو";
+"alerts.confirmClearConversation" = "اطمینان دارید که می‌خواهید گفتگو با این مخاطب را پاک کنید؟";
+"alerts.confirmClearConversationTitle" = "پاک کردن گفتگو";
 "alerts.noMediaPermissionsTitle" = "مجوز رسانه داده نشده است";
 "alerts.noLibraryPermissionsTitle" = "دسترسی به کتابخانه تصاویر داده نشده است";
-"alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
+"alerts.errorWrongCredentials" = "توانایی اتصال به مدیریت حساب ارائه‌شده را نداریم. لطفا اعتبارنامه‌های خود را بررسی کنید.";
 
 //Actions
 "actions.blockAction" = "مسدود";
@@ -190,14 +190,14 @@
 "accountPage.removeAccountButton" = "حذف کن";
 "accountPage.shareAccountDetails" = "اشتراک جزییات حساب";
 "accountPage.contactMeOnJamiTitle" = "با من روی جمی در تماس باشید!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.contactMeOnJamiContant" = "با استفاده از \"%s\" روی بستر ارتباط توزیع‌شده جمی، با من در تماس باشید: https://jami.net";
 "accountPage.registerNameTitle" = "ثبت یک نام‌کاربری";
-"accountPage.passwordPlaceholder" = "Enter account password";
-"accountPage.usernamePlaceholder" = "Enter desired username";
-"accountPage.registerNameErrorMessage" = "Choosen username is not available";
-"accountPage.usernameRegistering" = "Registering";
+"accountPage.passwordPlaceholder" = "گذرواژه حساب را وارد کنید";
+"accountPage.usernamePlaceholder" = "نام کاربری دلخواه را وارد کنید";
+"accountPage.registerNameErrorMessage" = "نام کاربری انتخاب‌شده در دسترس نیست";
+"accountPage.usernameRegistering" = "ثبت‌نام";
 "accountPage.usernameRegisterAction" = "ثبت‌نام";
-"accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
+"accountPage.usernameRegistrationFailed" = "انتقال ناموفق بود، لطفا گذرواژه را بررسی کنید.";
 
 //Account
 "account.sipUsername" = "نام کاربر";
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "در حال اتصال";
 "account.statusUnknown" = "ناشناخته";
 "account.statusConnectionerror" = "خطای ارتباط";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "نیاز است که حساب شما انتقال یابد.";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "مخاطب مسدودی وجود ندارد";
@@ -236,7 +236,7 @@
 "contactPage.sendMessage" = "ارسال پیام";
 "contactPage.clearConversation" = "پاکسازی چت";
 "contactPage.blockContact" = "مسدود سازی مخاطب";
-"contactPage.removeConversation" = "حذف مکالمه";
+"contactPage.removeConversation" = "حذف گفتگو";
 
 //DataTransfer
 "dataTransfer.readableStatusCreated" = "آغازِ فرایند...";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "فعال‌سازی شتاب‌دهی ویدیو";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "مهاجرت حساب";
+"migrateAccount.migrateButton" = "انتقال حساب";
+"migrateAccount.explanation" = "نیاز است که این حساب انتقال یابد.";
+"migrateAccount.passwordPlaceholder" = "گذرواژه را وارد کنید";
+"migrateAccount.passwordExplanation" = "برای پیشبرد انتقال، باید گذرواژه‌ای را که برای این حساب استفاده شده، وارد کنید.";
+"migrateAccount.removeAccount" = "حذف حساب";
+"migrateAccount.error" = "انتقال حساب ناموفق بود. می‌توانید دوباره سعی کرده و یا حساب خود را حذف کنید.";
+"migrateAccount.migrating" = "در حال انتقال...";
+"migrateAccount.cancel" = "لغو";
+"migrateAccount.migrateAnother" = "انتقال حساب دیگر";
 
 
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 59c5abc266e1a63f1f6e8a066df9de3b9cd8070a..52f33a66dd94b626ebb39111e4732ecf63d56e9d 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -23,7 +23,7 @@
 "global.contactRequestsTabBarTitle" = "Kutsut";
 "global.meTabBarTitle" = "Tunnus";
 "global.ok" = "Vahvista";
-"global.versionName" = "Free as in Freedom";
+"global.versionName" = "Ilmainen kuin vapaus";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -59,7 +59,7 @@
 "welcome.createAccount" = "Tee Jami-tili";
 
 //Creation Profile Screen
-"createProfile.skipCreateProfile" = "Skip";
+"createProfile.skipCreateProfile" = "Ohita";
 "createProfile.profileCreated" = "Seuraava";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
@@ -85,19 +85,19 @@
 "createAccount.PasswordInformation" = "Choose a password to encrypt your local account. Don’t forget it or you will not be able to recover your account";
 "createAccount.EnableNotifications" = "Ilmoitukset";
 "createAccount.Recommended" = "(Recommended)";
-"createAccount.UsernameNotRegisteredTitle" = "Network error";
+"createAccount.UsernameNotRegisteredTitle" = "Verkkovirhe";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
 "createAccount.timeoutMessage" = "Username registration in progress... It could take a few moments.";
 
 //Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "Link device";
+"linkToAccount.waitLinkToAccountTitle" = "Tilin linkittäminen";
+"linkToAccount.linkButtonTitle" = "Linkitä laite";
 "linkToAccount.passwordPlaceholder" = "Salasana";
 "linkToAccount.pinPlaceholder" = "PIN";
 "linkToAccount.passwordLabel" = "Syötä salasana";
 "linkToAccount.pinLabel" = "Syötä PIN-koodi";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account managment settings on device that contain account you want to use. In devices settings Select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"linkToAccount.explanationPinMessage" = "Voit luoda PIN-koodin siirtymällä asetuksiin laitteessa, joka sisältää haluamasi tilin. Valitse laiteasetuksissa \"Linkitä toinen laite tähän tiliin\". Saat tarvittavan PIN-koodin tämän lomakkeen lopusta. PIN-koodi on voimassa vain 10 minuuttia.";
 
 //Link To Account Manager form
 "linkToAccountManager.signIn" = "Sign In";
@@ -105,21 +105,21 @@
 "linkToAccountManager.passwordLabel" = "Syötä salasana";
 "linkToAccountManager.usernamePlaceholder" = "Käyttäjänimi";
 "linkToAccountManager.usernameLabel" = "Enter Username";
-"linkToAccountManager.accountManagerPlaceholder" = "Account manager";
+"linkToAccountManager.accountManagerPlaceholder" = "Tilin hallinta";
 "linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
 
 //Alerts
-"alerts.accountCannotBeFoundTitle" = "Can't find account";
+"alerts.accountCannotBeFoundTitle" = "Tiliä ei löydy";
 "alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.";
-"alerts.accountAddedTitle" = "Account Added";
+"alerts.accountAddedTitle" = "Tili lisätty";
 "alerts.accountNoNetworkTitle" = "Verkkoon ei saada yhteyttä";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
+"alerts.accountNoNetworkMessage" = "Tiliä ei voitu lisätä, koska Jami ei voinut muodostaa yhteyttä hajautettuun verkkoon. Tarkista laitteen yhteydet.";
 "alerts.accountDefaultErrorTitle" = "Tuntematon virhe";
-"alerts.accountDefaultErrorMessage" = "The account couldn't be created.";
+"alerts.accountDefaultErrorMessage" = "Tiliä ei voitu luoda.";
 "alerts.profileTakePhoto" = "Ota valokuva";
-"alerts.profileUploadPhoto" = "Upload photo";
+"alerts.profileUploadPhoto" = "Lähetä kuva";
 "alerts.profileCancelPhoto" = "Peruuta";
-"alerts.accountLinkedTitle" = "Linking account";
+"alerts.accountLinkedTitle" = "Tilin linkittäminen";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
 "alerts.dbFailedMessage" = "Sulje sovellus ja yritä avata se uudelleen";
 "alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
@@ -138,7 +138,7 @@
 "actions.deleteAction" = "Poista";
 "actions.cancelAction" = "Peruuta";
 "actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Takaisin";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
 "alerts.incomingCallButtonAccept" = "Hyväksy";
 "alerts.incomingCallButtonIgnore" = "Sivuuta";
@@ -148,7 +148,7 @@
 "calls.unknown" = "Tuntematon";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.connecting" = "Yhdistää...";
 "calls.searching" = "Searching…";
 "calls.callFinished" = "Call finished";
 "calls.currentCallWith" = "Call with ";
@@ -160,18 +160,18 @@
 "accountPage.username" = "Käyttäjänimi";
 "accountPage.usernameNotRegistered" = "username: not registered";
 "accountPage.credentialsHeader" = "Account Details";
-"accountPage.enableProxy" = "Enable Proxy";
+"accountPage.enableProxy" = "Proxy käyttöön";
 "accountPage.blockedContacts" = "Block List";
 "accountPage.unblockContact" = "UNBLOCK";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
-"accountPage.enableProxy" = "Enable Proxy";
+"accountPage.enableProxy" = "Proxy käyttöön";
 "accountPage.noProxyExplanationLabel" = "Your device won't receive notifications when proxy is disabled";
 "accountPage.saveProxyAddress" = "Tallenna";
 "accountPage.proxyPaceholder" = "Proxy address";
 "accountPage.enableNotifications" = "Ilmoitukset päälle";
 "accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
 "accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
-"accountPage.revokeDeviceTitle" = "Revoke device";
+"accountPage.revokeDeviceTitle" = "Peruuta laite";
 "accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
 "accountPage.revokeDeviceButton" = "Revoke";
 "accountPage.revokeDevicePlaceholder" = "Enter your passord";
@@ -179,13 +179,13 @@
 "accountPage.deviceRevocationProgress" = "Revoking...";
 "accountPage.deviceRevocationSuccess" = "Device was revoked";
 "accountPage.deviceRevocationTryAgain" = "Try again";
-"accountPage.deviceRevocationWrongPassword" = "Incorrect password";
+"accountPage.deviceRevocationWrongPassword" = "Väärä salasana";
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.namePlaceholder" = "Nimi";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Linkitä toinen laite";
 "accountPage.other" = "Muu";
-"accountPage.removeAccountTitle" = "Remove account";
+"accountPage.removeAccountTitle" = "Poista tili";
 "accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
 "accountPage.removeAccountButton" = "Poista";
 "accountPage.shareAccountDetails" = "Share Account Details";
@@ -212,8 +212,8 @@
 "account.portLabel" = "Enter Port Number";
 "account.accountStatus" = "Account Status";
 "account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
+"account.statusOnline" = "Verkossa";
+"account.statusOffline" = "Poissa";
 "account.statusConnecting" = "Yhdistää";
 "account.statusUnknown" = "Tuntematon";
 "account.statusConnectionerror" = "Connection Error";
@@ -228,7 +228,7 @@
 "linkDevice.networkError" = "Tiedonviennissä tapahtui verkkoyhteysvirhe";
 "linkDevice.defaultError" = "Tiedonviennissä tapahtui virhe";
 "linkDevice.explanationMessage" = "To complete the process, you need to open Jami on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
-"linkDevice.hudMessage" = "Verifying";
+"linkDevice.hudMessage" = "Tarkistetaan";
 
 //Contact Page
 "contactPage.startAudioCall" = "Start Audio Call";
@@ -239,7 +239,7 @@
 "contactPage.removeConversation" = "Remove Conversation";
 
 //DataTransfer
-"dataTransfer.readableStatusCreated" = "Initializing…";
+"dataTransfer.readableStatusCreated" = "Valmistellaan...";
 "dataTransfer.readableStatusError" = "Virhe";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "Kieltäydy";
@@ -270,26 +270,26 @@
 //Generated Message
 "generatedMessage.contactAdded" = "Yhteystieto lisätty";
 "generatedMessage.invitationReceived" = "Kutsu vastaanotettu";
-"generatedMessage.invitationAccepted" = "Invitation accepted";
+"generatedMessage.invitationAccepted" = "Kutsu hyväksytty";
 "generatedMessage.outgoingCall" = "Lähtevä puhelu";
 "generatedMessage.incomingCall" = "Saapuva puhelu";
 "generatedMessage.missedOutgoingCall" = "Vastaamaton lähtevä puhelu";
 "generatedMessage.missedIncomingCall" = "Vastaamaton puhelu";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Yleiset asetukset";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Tilin siirto";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Syötä salasana";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Poista tili";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Peruuta";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 122c9966e72d14e0dc30f18a950467fec08d8c5e..acdfad7cf62fa39397df2c63a0ad396fc242fac8 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -283,13 +283,13 @@
 //Migrate Account
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Votre compte doit être migré. ";
+"migrateAccount.passwordPlaceholder" = "Entrez votre mot de passe";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Supprimer le compte";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuler";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index 0828f9be716f6b8b9a2f0e5bc30bebe32443f04f..d95f96981f088fa84c4cfccb97dbd1245f7a056d 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migration du compte";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Votre compte doit être migré. ";
+"migrateAccount.passwordPlaceholder" = "Entrer le mot de passe";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Supprimer le compte";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuler";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 122c9966e72d14e0dc30f18a950467fec08d8c5e..acdfad7cf62fa39397df2c63a0ad396fc242fac8 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -283,13 +283,13 @@
 //Migrate Account
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Votre compte doit être migré. ";
+"migrateAccount.passwordPlaceholder" = "Entrez votre mot de passe";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Supprimer le compte";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuler";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index 85e2509ac67ddd14f79c5623237a76699257cbe2..7f186f8b6147a670cf45fabb714934010bf0b2d0 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -283,13 +283,13 @@
 //Migrate Account
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Votre compte doit être migré. ";
+"migrateAccount.passwordPlaceholder" = "Entrez votre mot de passe";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Supprimer le compte";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuler";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index ce775774220bf524d34fdab7d798ae248ef561b0..d53739b6dcf649a8b407c962682ab0c2ffd6ebd1 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "En cours de connexion";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Votre compte doit être migré";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "Aucun contact bloqué";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Migration du compte";
+"migrateAccount.migrateButton" = "Migrer le compte";
+"migrateAccount.explanation" = "Votre compte doit être migré. ";
+"migrateAccount.passwordPlaceholder" = "Entrez votre mot de passe";
+"migrateAccount.passwordExplanation" = "Pour effectuer la migration, vous devez entrer le mot de passe que vous avez utilisé pour ce compte";
+"migrateAccount.removeAccount" = "Supprimer le compte";
+"migrateAccount.error" = "Échec de la migration. Réessayer en pressant Ok ou supprimer ce compte.";
+"migrateAccount.migrating" = "Migration du compte…";
+"migrateAccount.cancel" = "Annuler";
+"migrateAccount.migrateAnother" = "Migrer d'une autre compte";
 
 
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index cd728a95d29c4465f157aff941458f3712a1c06c..2520be34efe15c3417ffcc7f22e3b425224dd094 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -72,7 +72,7 @@
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
 "createAccount.enterNewUsernamePlaceholder" = "Nome de usuaria";
 "createAccount.newPasswordPlaceholder" = "Contrasinal";
-"createAccount.repeatPasswordPlaceholder" = "Confirm password";
+"createAccount.repeatPasswordPlaceholder" = "Confirmar contrasinal";
 "createAccount.passwordCharactersNumberError" = "mínimo 6 caracteres";
 "createAccount.passwordNotMatchingError" = "os contrasinais non coinciden";
 "createAccount.lookingForUsernameAvailability" = "looking for availability…";
@@ -144,7 +144,7 @@
 "alerts.incomingCallButtonIgnore" = "Ignore";
 
 //Calls
-"calls.callItemTitle" = "Call";
+"calls.callItemTitle" = "Chamar";
 "calls.unknown" = "Descoñecido";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migración de conta";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Esta conta precisa ser migrada";
+"migrateAccount.passwordPlaceholder" = "Escribir contrasinal";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Eliminar conta";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancelar";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index bed319acb6f97a04ff2b39f41e09a92abec9a4a7..a83b2efb09d6764715793d2c96637b5b08daf342 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "ביטול";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index 1d4f981f63804ae0e0afee154f129a5bc5d62f13..7ac7151e29a05e5c646b23763544249821d2ecb9 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -284,12 +284,12 @@
 "migrateAccount.title" = "Account migration";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Unesite lozinku";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Poništi";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 0e4a5e185965e3b663ad2285e7cb757b4088d2af..5c3355df9379016dc68d934dbb9ab7d4de9da20e 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "Kapcsolódás";
 "account.statusUnknown" = "Ismeretlen";
 "account.statusConnectionerror" = "Csatlakozási hiba";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Fiók áttelepítés szükséges";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "Nincsenek letiltott kapcsolatok";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Videó gyorsítás engedélyezése";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Fiók áttelepítése";
+"migrateAccount.migrateButton" = "Fiók áttelepítés";
+"migrateAccount.explanation" = "Fiók áttelepítés szükséges";
+"migrateAccount.passwordPlaceholder" = "Adja meg a jelszót";
+"migrateAccount.passwordExplanation" = "Adja meg a fiók jelszavát az áttelepítés folytatásához";
+"migrateAccount.removeAccount" = "Fiók eltávolítása";
+"migrateAccount.error" = "Nem sikerült a fiók áttelepítése. Megpróbálhatja újra vagy törölheti fiókját.";
+"migrateAccount.migrating" = "Áttelepítése…";
+"migrateAccount.cancel" = "Mégse";
+"migrateAccount.migrateAnother" = "Másik fiók áttelepítése";
 
 
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index 01802d761634bffebd681ab8c95d63fc02ccd1b5..2a2c4048bed048bb48cb6906e3c48d345039e7bb 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -190,14 +190,14 @@
 "accountPage.removeAccountButton" = "Rimuovi";
 "accountPage.shareAccountDetails" = "Condividi dettagli account";
 "accountPage.contactMeOnJamiTitle" = "Contattami su Jami!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.contactMeOnJamiContant" = "Contattami usando \"%s\" su Jami, una piattaforma distribuita di comunicazione: https://jami.net";
 "accountPage.registerNameTitle" = "Registra un nome utente";
-"accountPage.passwordPlaceholder" = "Enter account password";
-"accountPage.usernamePlaceholder" = "Enter desired username";
-"accountPage.registerNameErrorMessage" = "Choosen username is not available";
-"accountPage.usernameRegistering" = "Registering";
+"accountPage.passwordPlaceholder" = "Inserisci la password dell'account";
+"accountPage.usernamePlaceholder" = "Inserisci il nome utente desiderato";
+"accountPage.registerNameErrorMessage" = "Il nome utente scelto non è disponibile";
+"accountPage.usernameRegistering" = "Registrazione";
 "accountPage.usernameRegisterAction" = "Salva";
-"accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
+"accountPage.usernameRegistrationFailed" = "Registrazione fallita. Si prega di controllare la password.";
 
 //Account
 "account.sipUsername" = "Nome Utente";
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "Collegamento";
 "account.statusUnknown" = "Sconosciuto";
 "account.statusConnectionerror" = "Errore di connessione";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "l'account deve essere migrato";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "Nessun contatto bloccato";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Attiva l'accelerazione video";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Migrazione account";
+"migrateAccount.migrateButton" = "Migra account";
+"migrateAccount.explanation" = "Questo account deve essere migrato";
+"migrateAccount.passwordPlaceholder" = "Inserire password";
+"migrateAccount.passwordExplanation" = "Per procedere con la migrazione, è necessario inserire una password utilizzata per questo account";
+"migrateAccount.removeAccount" = "Rimuovi l'account";
+"migrateAccount.error" = "Migrazione account fallita. Puoi riprovare o cancellare l'account.";
+"migrateAccount.migrating" = "Migrazione...";
+"migrateAccount.cancel" = "Annulla";
+"migrateAccount.migrateAnother" = "Migra un altro Account";
 
 
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index bfc33b2fc2886a6ba9bf4273270f5e974c683f3d..9e68160529f078241a92639ad5bb9cdca18e08c2 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migrazione account";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Inserisci la password";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Rimuovi account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annulla";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 79cbe2bb300597e0caf293639b288fe79d07f4ce..0d81e728a9a45ace7c671c4df1d7944ac102444a 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -31,16 +31,16 @@
 
 // Smartlist
 "smartlist.yesterday" = "昨日";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "検索結果";
 "smartlist.conversations" = "会話";
 "smartlist.searching" = "検索中...";
 "smartlist.noResults" = "検索結果はありません";
-"smartlist.noConversation" = "No conversations";
+"smartlist.noConversation" = "会話はありません";
 "smartlist.searchBarPlaceholder" = "名前を入力...";
 "smartlist.noNetworkConnectivity" = "ネットワーク接続がありません";
 "smartlist.cellularAccess" = "設定から写真へのアクセスが許可されていることを確認してください";
 "smartlist.accountsTitle" = "アカウント";
-"smartlist.addAccountButton" = "+ Add Account";
+"smartlist.addAccountButton" = "+ アカウントを追加";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
 
@@ -48,13 +48,13 @@
 "conversation.messagePlaceholder" = "メッセージを入力...";
 
 //Invitations
-"invitations.noInvitations" = "No invitations";
+"invitations.noInvitations" = "招待はありません";
 
 // Walkthrough
 
 //Welcome Screen
 "welcome.title" = "Jamiへようこそ!";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.text" = "Jamiは、世界中のユーザーと繋がることができる、ユーザーの自由とプライバシーを尊重したフリーソフトウェアです。";
 "welcome.linkDevice" = "このデバイスをアカウントへリンク";
 "welcome.createAccount" = "Jamiアカウントを作成";
 
@@ -75,7 +75,7 @@
 "createAccount.repeatPasswordPlaceholder" = "パスワードの再入力";
 "createAccount.passwordCharactersNumberError" = "6文字以上";
 "createAccount.passwordNotMatchingError" = "パスワードが一致しません";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "利用可能か確認しています…";
 "createAccount.invalidUsername" = "不正なユーザー名";
 "createAccount.usernameAlreadyTaken" = "このユーザー名は既に取得されています。";
 "createAccount.loading" = "読み込み中";
@@ -119,14 +119,14 @@
 "alerts.profileTakePhoto" = "撮影";
 "alerts.profileUploadPhoto" = "写真のアップロード";
 "alerts.profileCancelPhoto" = "キャンセル";
-"alerts.accountLinkedTitle" = "アカウントを連結しています";
+"alerts.accountLinkedTitle" = "アカウントをリンクしています";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
 "alerts.dbFailedMessage" = "アプリケーションを終了し、起動し直してください";
 "alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmBlockContactTitle" = "ブロックした連絡先";
-"alerts.confirmDeleteConversation" = "Are you sure you want to delete this conversation permanently?";
+"alerts.confirmDeleteConversation" = "この会話を完全に削除してもよろしいですか?";
 "alerts.confirmDeleteConversationFromContact" = "Are you sure you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete Conversation";
+"alerts.confirmDeleteConversationTitle" = "会話を消去";
 "alerts.confirmClearConversation" = "Are you sure you want to clear the conversation with this contact?";
 "alerts.confirmClearConversationTitle" = "Clear Conversation";
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
@@ -166,7 +166,7 @@
 "accountPage.proxyAddressAlert" = "Provide proxy address";
 "accountPage.enableProxy" = "プロキシを有効にする";
 "accountPage.noProxyExplanationLabel" = "Your device won't receive notifications when proxy is disabled";
-"accountPage.saveProxyAddress" = "Save";
+"accountPage.saveProxyAddress" = "保存";
 "accountPage.proxyPaceholder" = "プロキシアドレス";
 "accountPage.enableNotifications" = "通知を有効化";
 "accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "アカウントの移行";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "パスワードを入力してください";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "キャンセル";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 696a6e021f7f9b3334cc78132d565a6635452aaf..395b0270acbaddd543702b5cd5359c4d010766b4 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "취소";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index c2fd8cf8feb0bc2c2f558919b1edfa26b1ff09e5..8431114bd832b3a844fae70a2a7df82f392d8944 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Įjungti vaizdo spartinimą";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Paskyros perkėlimas";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Įveskite slaptažodį";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Šalinti paskyrą";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Atsisakyti";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 0247862407148fe88bfe21a56c0791cfd5b73878..9543663bba882a7b020d987f8e05cba5200e79bb 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Permindahan akaun";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Masukkan kata laluan";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Batal";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index d3b5abe3a06d6d5fa5524c4b94cf172e6889948a..1f1fd8d32344a4ad2e7865d97671bbc26d17b669 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Kontoflytting";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Skriv inn passord";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Avbryt";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index dd1870cf29babe30ed793b457a06b0bac8176d89..e29d25a9fab0b9ffef80d7f7ec8d251d483da813 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Videoversnelling inschakelen";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Accountmigratie";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Voer wachtwoord in";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Account verwijderen";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuleren";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
index b46ac875a97e5064f0a432197d482ceb128cdbb7..c2861479b7686f620eca17b5f8144e12e4dc43d4 100644
--- a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Videoversnelling inschakelen";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Accountmigratie";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Geef paswoord in";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Account verwijderen";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Annuleren";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index 222a8a17f7cb6a984cba0e64dff470f6f8d12878..1ef246e4dab6a66f72a39cee4ab1c2eb0024eb65 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "ਖਾਤਾ ਤਬਾਦਲਾ";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "ਰੱਦ ਕਰੋ";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index 941d01248b9ba68b08e8bf12935a2dd861bab7fd..80ec7a97edeb2b4c7e4578725c93568cc41ba8f6 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Włącz przyspieszenie video";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Przenoszenie konta";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Wprowadź hasło";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Usuń konto";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Anuluj";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 14a670cc45065504eeae93e20e9c9333eec4d7e9..89f42b833e7649147aaa5c69ae11bd9a21afa91f 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migração de conta";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Entre a senha";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancelar";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index 55bdb71908d130a58321bcf32df52377f6df891e..13ae59d49f58e19231c3c321dd25d487064ab891 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Ativar aceleração de vídeo";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migração de conta";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "introduza a palavra-chave";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Remover conta";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancelar";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index dfe938db8e3dbaa77d0d10a507bdc23c2a85beef..4f6a7c53058631d932fec6fc93cd05d0d40e6323 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Ativar aceleração de vídeo";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migração de conta";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Esta conta precisa de ser migrada";
+"migrateAccount.passwordPlaceholder" = "Introduza a palavra-chave";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Remover conta";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Cancelar";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index 95955d8cbed415bb580667bb4d21b8a8958fc36d..90b1cb7b5f6f32f9c4aa2ea52db17fed729f2e87 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Миграция аккаунта";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Введите пароль";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Отмена";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 2c2c671555de9de75a23dcf9d5a2983b43ed8774..139c7f29f7dddbd9dee63c6dd2293cea69e22b91 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Разрешить видео-ускорение";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Перенос аккаунта";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Этот аккаунт должен быть перенесен";
+"migrateAccount.passwordPlaceholder" = "Введите пароль";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Удаление учетной записи";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Отмена";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index c2018ef0465b4884570650693906aaa782539fa5..3c7178b94acad67f9faa0ca680950cf0fa6538c7 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migrácia účtu";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Zadajte heslo";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Zrušiť";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index e0266609922a32dae50e92b0639898307e172685..9b8c873f1b7ca3885836960bb0c203f69196b9c5 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "Po lidhet";
 "account.statusUnknown" = "I panjohur";
 "account.statusConnectionerror" = "Gabim Lidhjeje";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "llogari që duhet migruar";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "S’ka kontakte të bllokuar";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Aktivizo përshpejtim videosh";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "Migrim llogarie";
+"migrateAccount.migrateButton" = "Migroni Llogari";
+"migrateAccount.explanation" = "Kjo llogari lypset të migrohet";
+"migrateAccount.passwordPlaceholder" = "Jepni fjalëkalimin";
+"migrateAccount.passwordExplanation" = "Që të vazhdohet me migrimin, lypset të jepni një fjalëkalim që qe përdorur për këtë llogari";
+"migrateAccount.removeAccount" = "Hiqe llogarinë";
+"migrateAccount.error" = "S’u arrit të migrohej llogaria juaj. Mund të riprovoni ose të fshini llogarinë tuaj.";
+"migrateAccount.migrating" = "Po migrohet…";
+"migrateAccount.cancel" = "Anuloje";
+"migrateAccount.migrateAnother" = "Migroni Llogari Tjetër";
 
 
diff --git a/Ring/Ring/Resources/sr@latin.lproj/Localizable.strings b/Ring/Ring/Resources/sr@latin.lproj/Localizable.strings
index ed7afaee3ad68a34f5cd2fe45e98e57f63954559..98224663991775bd8490162d1e19f8a1d8d21cfd 100644
--- a/Ring/Ring/Resources/sr@latin.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@latin.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Otkaži";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index 40a918eb0775a5b2af7a761708244ef3ad24f747..94db3bd436b459f9f65fa4e5a54b08932fbd2dc9 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Aktivera videoacceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Kontodelning";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Ange lösenord";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Ta bort konto";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Avbryt";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index dea93c0cb383185a7fa3002b24b32e3d919ea57e..84572b5acd231a7d743877fab08de691d1e22766 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Görüntü hızlandırmayı etkinleştir";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Hesap taşıma";
 "migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.explanation" = "Bu hesabın taşınması gerekli";
+"migrateAccount.passwordPlaceholder" = "Parolayı gir";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
+"migrateAccount.removeAccount" = "Hesabı Kaldır";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "İptal";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index c726cf56c26dd7971a1bdd44f54c1eb1f39ff0a6..e3f1e0b5a11c18f720341c6371e7721a06f357b4 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Переведення облікового запису";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"migrateAccount.passwordPlaceholder" = "Ввести пароль";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "Відміна";
 "migrateAccount.migrateAnother" = "Migrate Another Account";
 
 
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index ffbe491c78c625227739323a99311acb7d7aeb80..8362661a975a01108ac86358bf9872f1e8b5a6b8 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -41,7 +41,7 @@
 "smartlist.cellularAccess" = "请确保蜂窝移动网络权限已开启";
 "smartlist.accountsTitle" = "帐户";
 "smartlist.addAccountButton" = "+添加帐户";
-"smartlist.noNumber" = "Selected contact does not have any number";
+"smartlist.noNumber" = "选定的连接没有任何数字";
 "smartlist.selectOneNumber" = "选择这些数字中的一个";
 
 //Conversation
@@ -62,9 +62,9 @@
 "createProfile.skipCreateProfile" = "跳过";
 "createProfile.profileCreated" = "下一步";
 "createProfile.title" = "个性化你的个人信息";
-"createProfile.enterNameLabel" = "Enter a display name";
+"createProfile.enterNameLabel" = "选择一个显示名";
 "createProfile.enterNamePlaceholder" = "输入名称";
-"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
+"createProfile.subtitle" = "您的资料会分享给您的联系人。您可随时修改。";
 "createProfile.createYourAvatar" = "建立你的头像";
 
 //Create Account form
@@ -100,13 +100,13 @@
 "linkToAccount.explanationPinMessage" = "要获取一个PIN,请进入你已登陆的设备中的用户管理界面,选择“链接另一台设备到这个用户”。输入你的用户密码后,你会得到在此处所需的PIN,它在10分钟内有效。";
 
 //Link To Account Manager form
-"linkToAccountManager.signIn" = "Sign In";
+"linkToAccountManager.signIn" = "注册";
 "linkToAccountManager.passwordPlaceholder" = "密码";
 "linkToAccountManager.passwordLabel" = "输入密码";
 "linkToAccountManager.usernamePlaceholder" = "用户名";
-"linkToAccountManager.usernameLabel" = "Enter Username";
+"linkToAccountManager.usernameLabel" = "输入用户名";
 "linkToAccountManager.accountManagerPlaceholder" = "账户管理器";
-"linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
+"linkToAccountManager.accountManagerLabel" = "输入账户管理器的 URI";
 
 //Alerts
 "alerts.accountCannotBeFoundTitle" = "无法找到帐户";
@@ -123,7 +123,7 @@
 "alerts.dbFailedTitle" = "启动Jami时出现了一个问题";
 "alerts.dbFailedMessage" = "请关闭应用,并试试重新启动它。";
 "alerts.confirmBlockContact" = "你确定想要封锁这个联系人?与这个联系人的对话历史也将被永久删除。";
-"alerts.confirmBlockContactTitle" = "封锁联系人";
+"alerts.confirmBlockContactTitle" = "屏蔽联系人";
 "alerts.confirmDeleteConversation" = "你确定要永久删除这个对话?";
 "alerts.confirmDeleteConversationFromContact" = "你确定要删除与该联系人的对话?";
 "alerts.confirmDeleteConversationTitle" = "删除对话";
@@ -131,7 +131,7 @@
 "alerts.confirmClearConversationTitle" = "清空对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
-"alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
+"alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 
 //Actions
 "actions.blockAction" = "屏蔽";
@@ -151,53 +151,53 @@
 "calls.connecting" = "正在连接…";
 "calls.searching" = "正在搜索…";
 "calls.callFinished" = "通话已结束";
-"calls.currentCallWith" = "Call with ";
+"calls.currentCallWith" = "通话到";
 "calls.haghUp" = "挂断";
 
 //Account Page
 "accountPage.devicesListHeader" = "设备";
 "accountPage.settingsHeader" = "设置";
 "accountPage.username" = "用户名";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
+"accountPage.usernameNotRegistered" = "用户名:未被注册";
+"accountPage.credentialsHeader" = "账户详情";
 "accountPage.enableProxy" = "启用代理";
-"accountPage.blockedContacts" = "Block List";
-"accountPage.unblockContact" = "UNBLOCK";
-"accountPage.proxyAddressAlert" = "Provide proxy address";
+"accountPage.blockedContacts" = "屏蔽列表";
+"accountPage.unblockContact" = "取消屏蔽";
+"accountPage.proxyAddressAlert" = "提供代理地址";
 "accountPage.enableProxy" = "启用代理";
-"accountPage.noProxyExplanationLabel" = "Your device won't receive notifications when proxy is disabled";
+"accountPage.noProxyExplanationLabel" = "代理禁用后您将无法收到通知";
 "accountPage.saveProxyAddress" = "保存";
-"accountPage.proxyPaceholder" = "Proxy address";
-"accountPage.enableNotifications" = "Enable Notifications";
-"accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
-"accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
+"accountPage.proxyPaceholder" = "代理地址";
+"accountPage.enableNotifications" = "启用通知";
+"accountPage.proxyDisabledAlertTitle" = "代理服务器已禁用";
+"accountPage.proxyDisabledAlertBody" = "为了接受通知,请开启代理";
 "accountPage.revokeDeviceTitle" = "吊销设备";
-"accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
+"accountPage.revokeDeviceMessage" = "您确定要吊销此设备吗?此操作不能撤销。";
 "accountPage.revokeDeviceButton" = "吊销";
-"accountPage.revokeDevicePlaceholder" = "Enter your passord";
-"accountPage.deviceRevoked" = "Device revocation completed";
-"accountPage.deviceRevocationProgress" = "Revoking...";
-"accountPage.deviceRevocationSuccess" = "Device was revoked";
-"accountPage.deviceRevocationTryAgain" = "Try again";
+"accountPage.revokeDevicePlaceholder" = "输入你的密码";
+"accountPage.deviceRevoked" = "设备吊销完成";
+"accountPage.deviceRevocationProgress" = "吊销中...";
+"accountPage.deviceRevocationSuccess" = "设备已被吊销";
+"accountPage.deviceRevocationTryAgain" = "重试";
 "accountPage.deviceRevocationWrongPassword" = "密码错误";
-"accountPage.deviceRevocationUnknownDevice" = "Unknown device";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.deviceRevocationUnknownDevice" = "未知设备";
+"accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.namePlaceholder" = "姓名";
 "accountPage.linkDeviceTitle" = "链接另一台设备";
 "accountPage.other" = "其他";
 "accountPage.removeAccountTitle" = "移除账户";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "点击“删除”将从此设备上删除该帐号!此操作无法撤销。同时,您也会失去已注册的用户名。";
 "accountPage.removeAccountButton" = "删除";
-"accountPage.shareAccountDetails" = "Share Account Details";
-"accountPage.contactMeOnJamiTitle" = "Contact me on Jami!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.shareAccountDetails" = "分享账户详情";
+"accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
+"accountPage.contactMeOnJamiContant" = "在Jami分布式通信平台:https://jami.net 上使用“%s”与我联系";
 "accountPage.registerNameTitle" = "注册一个用户名";
-"accountPage.passwordPlaceholder" = "Enter account password";
-"accountPage.usernamePlaceholder" = "Enter desired username";
-"accountPage.registerNameErrorMessage" = "Choosen username is not available";
-"accountPage.usernameRegistering" = "Registering";
+"accountPage.passwordPlaceholder" = "输入账户密码";
+"accountPage.usernamePlaceholder" = "输入想使用的用户名";
+"accountPage.registerNameErrorMessage" = "选择的用户名不可用";
+"accountPage.usernameRegistering" = "注册中";
 "accountPage.usernameRegisterAction" = "注册";
-"accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
+"accountPage.usernameRegistrationFailed" = "注册失败。请检查密码。";
 
 //Account
 "account.sipUsername" = "用户名";
@@ -205,65 +205,65 @@
 "account.sipServer" = "SIP 服务器";
 "account.port" = "端口";
 "account.proxyServer" = "代理";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.createSipAccount" = "创建 Sip 账户";
+"account.usernameLabel" = "输入用户名";
 "account.passwordLabel" = "输入密码";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "输入地址";
+"account.portLabel" = "输入端口号";
+"account.accountStatus" = "账户状态";
+"account.enableAccount" = "启用账户";
 "account.statusOnline" = "在线";
 "account.statusOffline" = "离线";
 "account.statusConnecting" = "正在连接";
 "account.statusUnknown" = "未知";
-"account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.statusConnectionerror" = "连接错误";
+"account.needMigration" = "该账户需迁移";
 
 //Block List Page
-"blockListPage.noBlockedContacts" = "No blocked contacts";
+"blockListPage.noBlockedContacts" = "没有被屏蔽的联系人";
 
 //Link New Device
-"linkDevice.title" = "Link a new device";
+"linkDevice.title" = "关联新设备";
 "linkDevice.passwordError" = "您输入的密码无法解锁该帐户";
 "linkDevice.networkError" = "导出时发生网络错误";
 "linkDevice.defaultError" = "导出时发生错误";
-"linkDevice.explanationMessage" = "To complete the process, you need to open Jami on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
+"linkDevice.explanationMessage" = "要完成关联过程,请在您的新设备上打开 Jami 并选择“将这台设备关联到到账户”。PIN 码有效期为 10分钟。";
 "linkDevice.hudMessage" = "认证中";
 
 //Contact Page
-"contactPage.startAudioCall" = "Start Audio Call";
-"contactPage.startVideoCall" = "Start Video Call";
-"contactPage.sendMessage" = "Send Message";
-"contactPage.clearConversation" = "Clear Chat";
-"contactPage.blockContact" = "封锁联系人";
-"contactPage.removeConversation" = "Remove Conversation";
+"contactPage.startAudioCall" = "发起语音通话";
+"contactPage.startVideoCall" = "发起视频通话";
+"contactPage.sendMessage" = "发送信息";
+"contactPage.clearConversation" = "清除聊天";
+"contactPage.blockContact" = "屏蔽联系人";
+"contactPage.removeConversation" = "删除会话";
 
 //DataTransfer
 "dataTransfer.readableStatusCreated" = "正在初始化…";
 "dataTransfer.readableStatusError" = "错误";
-"dataTransfer.readableStatusAwaiting" = "Pending…";
+"dataTransfer.readableStatusAwaiting" = "验证中";
 "dataTransfer.readableStatusRefuse" = "拒接";
-"dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
-"dataTransfer.sendingFailed" = "Failed to send";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusOngoing" = "传递中";
+"dataTransfer.readableStatusCanceled" = "已取消";
+"dataTransfer.sendingFailed" = "发送失败";
+"dataTransfer.readableStatusSuccess" = "完成";
 "dataTransfer.readableStatusAccept" = "接听";
 "dataTransfer.readableStatusCancel" = "取消";
 
 //Notifications
-"notifications.incomingCall" = "Incoming Call";
-"notifications.missedCall" = "Missed Call";
-"notifications.acceptCall" = "ACCEPT";
-"notifications.refuseCall" = "REFUSE";
-"notifications.newFile" = "New file";
-"dataTransfer.readableStatusAwaiting" = "Pending…";
+"notifications.incomingCall" = "来电";
+"notifications.missedCall" = "未接来电";
+"notifications.acceptCall" = "接受";
+"notifications.refuseCall" = "拒绝";
+"notifications.newFile" = "新文件";
+"dataTransfer.readableStatusAwaiting" = "验证中";
 "dataTransfer.readableStatusRefuse" = "拒接";
-"dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusOngoing" = "传递中";
+"dataTransfer.readableStatusCanceled" = "已取消";
+"dataTransfer.readableStatusSuccess" = "完成";
 "dataTransfer.readableStatusAccept" = "接听";
 "dataTransfer.readableStatusCancel" = "取消";
-"dataTransfer.infoMessage" = "Press to start recording";
+"dataTransfer.infoMessage" = "按下开始录音";
 "dataTransfer.sendMessage" = "发送";
 
 
@@ -278,18 +278,18 @@
 
 //General Settings
 "generalSettings.title" = "常规设置";
-"generalSettings.videoAcceleration" = "Enable video acceleration";
+"generalSettings.videoAcceleration" = "启用视频加速";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "帐户迁移";
+"migrateAccount.migrateButton" = "迁移账户";
+"migrateAccount.explanation" = "该账户需迁移";
+"migrateAccount.passwordPlaceholder" = "输入密码";
+"migrateAccount.passwordExplanation" = "若要进行迁移,您需要输入此账户的密码。";
+"migrateAccount.removeAccount" = "移除账户";
+"migrateAccount.error" = "帐户迁移失败。您可重试或删除您的帐户。";
+"migrateAccount.migrating" = "迁移中...";
+"migrateAccount.cancel" = "取消";
+"migrateAccount.migrateAnother" = "迁移另一个账户";
 
 
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 1f0790cc1b7a811080f40e4bb1270e59fc5d2888..6a06441f8ef1a6199e9a0ab78fd033d83d4df0cc 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -217,7 +217,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "連線錯誤";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "需要遷移帳號";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "沒有已封鎖的聯絡人";
@@ -281,15 +281,15 @@
 "generalSettings.videoAcceleration" = "啟用視訊加速";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
-"migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
-"migrateAccount.removeAccount" = "Remove account";
-"migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
-"migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.title" = "帳號遷移";
+"migrateAccount.migrateButton" = "遷移帳號";
+"migrateAccount.explanation" = "此帳號需要遷移";
+"migrateAccount.passwordPlaceholder" = "輸入密碼";
+"migrateAccount.passwordExplanation" = "要繼續遷移,您必須輸入用於此帳號的密碼";
+"migrateAccount.removeAccount" = "移除帳號";
+"migrateAccount.error" = "遷移您的帳號失敗。您可以重試或刪除您的帳號。";
+"migrateAccount.migrating" = "正在遷移……";
+"migrateAccount.cancel" = "取消";
+"migrateAccount.migrateAnother" = "遷移其他帳號";
 
 
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index fee28e4696773e551b98a1b09d07af350c261132..5506e63e98018c8171e4b9364141f121b066dc34 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "migrateAccount.removeAccount" = "Remove account";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
-"migrateAccount.cancel" = "Cancel";
+"migrateAccount.cancel" = "取消";
 "migrateAccount.migrateAnother" = "Migrate Another Account";