diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index a807e9910e0a8ce29c477009de2264158a75af23..226115ab6d5110ae0ffd852fd17aaad44fa357fe 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -135,8 +135,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Envoyer un message vidéo";
 "alerts.recordAudioMessage" = "Envoyer un message vocal";
-"alerts.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.uploadFile" = "Téléverser un fichier";
+"alerts.uploadPhoto" = "Téléverser une photo ou une vidéo";
 
 //Actions
 "actions.blockAction" = "Bloquer";
@@ -148,8 +148,8 @@
 "alerts.incomingCallAllertTitle" = "Appel entrant de";
 "alerts.incomingCallButtonAccept" = "Accepter";
 "alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
+"actions.startAudioCall" = "Appel audio";
+"actions.startVideoCall" = "Appel vidéo";
 
 //Calls
 "calls.callItemTitle" = "Appeler";
@@ -208,16 +208,16 @@
 "accountPage.usernameRegistrationFailed" = "L'enregistrement a échoué. Veuillez vérifier le mot de passe.";
 "accountPage.createPassword" = "Créer mot de passe";
 "accountPage.changePassword" = "Changer le mot de passe";
-"accountPage.oldPasswordPlaceholder" = "Enter old password";
-"accountPage.newPasswordPlaceholder" = "Enter new password";
-"accountPage.newPasswordConfirmPlaceholder" = "Confirm new password";
-"accountPage.changePasswordError" = "Password incorrect";
-"accountPage.enableBoothMode" = "Enable Booth Mode";
-"accountPage.disableBoothMode" = "Disable Booth Mode";
-"accountPage.disableBoothModeExplanation" = "Pleace provide your account password";
-"accountPage.boothModeExplanation" = "In booth mode conversation history not saved and jami functionality limited by making outgoing calls. When you enable booth mode all your conversations will be removed.";
-"accountPage.noBoothMode" = "To enable Booth mode you need to create account password first.";
-"accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
+"accountPage.oldPasswordPlaceholder" = "Entrer votre ancien mot de passe";
+"accountPage.newPasswordPlaceholder" = "Entrer le nouveau mot de passe";
+"accountPage.newPasswordConfirmPlaceholder" = "Confirmer le nouveau mot de passe";
+"accountPage.changePasswordError" = "Mot de passe incorrect";
+"accountPage.enableBoothMode" = "Activer le mode Kiosque";
+"accountPage.disableBoothMode" = "Désactiver le mode Kiosque";
+"accountPage.disableBoothModeExplanation" = "Entrer le mot de passe de votre compte";
+"accountPage.boothModeExplanation" = "Dans le mode Kiosque, l'historique n'est pas sauvegardé et les fonctions de Jami sont limités à faire des appels. Si vous activez le mode Kiosque, toutes vos conversations seront supprimées.";
+"accountPage.noBoothMode" = "Pour activer le mode Kiosque, vous devez d'abord créer un mot de passe.";
+"accountPage.boothModeAlertMessage" = "Après avoir activé le mode Kiosque, toutes vos conversations seront supprimées.";
 
 //Account
 "account.sipUsername" = "Nom d'utilisateur";
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 6a0578da08303c97c0281b80196c321bbf25335f..d3bc46285b3d9c267fb32be08b2a0438e6299ea4 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -69,7 +69,7 @@
 "createProfile.createYourAvatar" = "Create your avatar";
 
 //Create Account form
-"createAccount.createAccountFormTitle" = "Create your account";
+"createAccount.createAccountFormTitle" = "アカウントを作成";
 "createAccount.chooseStrongPassword" = "あなたのJamiアカウントを守るために強固なパスワードを設定してください。また、このパスワードを忘れないでください。";
 "createAccount.enterNewUsernamePlaceholder" = "ユーザー名";
 "createAccount.newPasswordPlaceholder" = "パスワード";
@@ -135,7 +135,7 @@
 "alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
 "alerts.recordVideoMessage" = "ビデオメッセージを録画";
 "alerts.recordAudioMessage" = "音声メッセージを録音";
-"alerts.uploadFile" = "Upload file";
+"alerts.uploadFile" = "ファイルをアップロード";
 "alerts.uploadPhoto" = "Upload photo or movie";
 
 //Actions
@@ -148,8 +148,8 @@
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
 "alerts.incomingCallButtonAccept" = "受け入れ";
 "alerts.incomingCallButtonIgnore" = "無視";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
+"actions.startAudioCall" = "  音声通話";
+"actions.startVideoCall" = "  ビデオ通話";
 
 //Calls
 "calls.callItemTitle" = "通話";
@@ -208,8 +208,8 @@
 "accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
 "accountPage.createPassword" = "Create password";
 "accountPage.changePassword" = "パスワードを変更";
-"accountPage.oldPasswordPlaceholder" = "Enter old password";
-"accountPage.newPasswordPlaceholder" = "Enter new password";
+"accountPage.oldPasswordPlaceholder" = "現在のパスワードを入力";
+"accountPage.newPasswordPlaceholder" = "新しいパスワードを入力";
 "accountPage.newPasswordConfirmPlaceholder" = "Confirm new password";
 "accountPage.changePasswordError" = "Password incorrect";
 "accountPage.enableBoothMode" = "Enable Booth Mode";
@@ -263,10 +263,10 @@
 "dataTransfer.readableStatusError" = "エラー";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "拒否";
-"dataTransfer.readableStatusOngoing" = "Transferring";
+"dataTransfer.readableStatusOngoing" = "転送中";
 "dataTransfer.readableStatusCanceled" = "キャンセルしました";
 "dataTransfer.sendingFailed" = "Failed to send";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusSuccess" = "完了";
 "dataTransfer.readableStatusAccept" = "受け入れ";
 "dataTransfer.readableStatusCancel" = "キャンセル";
 
@@ -278,9 +278,9 @@
 "notifications.newFile" = "新しいファイル";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "拒否";
-"dataTransfer.readableStatusOngoing" = "Transferring";
+"dataTransfer.readableStatusOngoing" = "転送中";
 "dataTransfer.readableStatusCanceled" = "キャンセルしました";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusSuccess" = "完了";
 "dataTransfer.readableStatusAccept" = "受け入れ";
 "dataTransfer.readableStatusCancel" = "キャンセル";
 "dataTransfer.infoMessage" = "Press to start recording";
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index c3e3e0b063ab2e4a154b3b6e6bf9130a5dd74933..f95d3a9ded269b3bc507f5ffa2b2cd6a26ee6220 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -57,7 +57,7 @@
 "welcome.text" = "Jami é uma plataforma de comunicação gratuita e universal que preserva a privacidade e liberdade dos usuários";
 "welcome.linkDevice" = "Associar este dispositivo a uma conta";
 "welcome.createAccount" = "Criar uma conta no Jami";
-"welcome.connectToManager" = "Connect to account manager";
+"welcome.connectToManager" = "Conectar ao gerenciador de contas";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Pular";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index 2d758b7c66c8af5f52992ee766d7aea62a345832..f0aad46b2d945d3502fac049bb496dbbd5ce808d 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -48,23 +48,23 @@
 "conversation.messagePlaceholder" = "Type your message...";
 
 //Invitations
-"invitations.noInvitations" = "No invitations";
+"invitations.noInvitations" = "Nu sînt invitații";
 
 // Walkthrough
 
 //Welcome Screen
 "welcome.title" = "Welcome to Jami !";
 "welcome.text" = "Jami este o platformă de comunicare liberă și universală care păstrează libertățile și intimitatea.";
-"welcome.linkDevice" = "Conectează acest dispozitiv la un cont";
+"welcome.linkDevice" = "Asociază acest dispozitiv unui cont";
 "welcome.createAccount" = "Creează un cont Jami";
-"welcome.connectToManager" = "Connect to account manager";
+"welcome.connectToManager" = "Conectează-te la Administrare cont";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Omite";
-"createProfile.profileCreated" = "Următorul";
+"createProfile.profileCreated" = "Înainte";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Introdu nume";
+"createProfile.enterNamePlaceholder" = "Introdu numele";
 "createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
 "createProfile.createYourAvatar" = "Create your avatar";
 
@@ -73,7 +73,7 @@
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
 "createAccount.enterNewUsernamePlaceholder" = "Nume de Utilizator";
 "createAccount.newPasswordPlaceholder" = "Parolă";
-"createAccount.repeatPasswordPlaceholder" = "Confirm password";
+"createAccount.repeatPasswordPlaceholder" = "Confirmă parola";
 "createAccount.passwordCharactersNumberError" = "6 caractere minim";
 "createAccount.passwordNotMatchingError" = "parolele nu se potrivesc";
 "createAccount.lookingForUsernameAvailability" = "looking for availability…";
@@ -84,7 +84,7 @@
 "createAccount.RegisterAUsername" = "Register a username";
 "createAccount.ChooseAPassword" = "Encrypt my account";
 "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" = "Notifications";
+"createAccount.EnableNotifications" = "Notificări";
 "createAccount.Recommended" = "(Recommended)";
 "createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
@@ -92,22 +92,22 @@
 "createAccount.timeoutMessage" = "Username registration in progress... It could take a few moments.";
 
 //Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Se conectează contul";
-"linkToAccount.linkButtonTitle" = "Conectează Dispozitivul";
+"linkToAccount.waitLinkToAccountTitle" = "Asocierea contului";
+"linkToAccount.linkButtonTitle" = "Asociază dispozitivul";
 "linkToAccount.passwordPlaceholder" = "Parolă";
 "linkToAccount.pinPlaceholder" = "PIN";
 "linkToAccount.passwordLabel" = "Introdu Parola";
 "linkToAccount.pinLabel" = "Introdu PIN-ul";
-"linkToAccount.explanationPinMessage" = "Pentru crearea codului PIN, du-te la reglările contului în dispozitivul care conține contul pe care vrei să-l folosești. În Reglări alege \"Conectează alt dispozitiv la acest cont\" și vei obține PIN-ul necesar. Acest PIN este valabil doar 10 minute.";
+"linkToAccount.explanationPinMessage" = "Pentru generarea codului PIN, du-te la reglările contului în dispozitivul care conține contul pe care vrei să-l folosești. În Reglări alege \"Asociază alt dispozitiv acestui cont\" și vei obține PIN-ul necesar. Acest PIN este valabil doar 10 minute.";
 
 //Link To Account Manager form
-"linkToAccountManager.signIn" = "Sign In";
+"linkToAccountManager.signIn" = "Autentificare";
 "linkToAccountManager.passwordPlaceholder" = "Parolă";
 "linkToAccountManager.passwordLabel" = "Introdu Parola";
 "linkToAccountManager.usernamePlaceholder" = "Nume de Utilizator";
 "linkToAccountManager.usernameLabel" = "Enter Username";
-"linkToAccountManager.accountManagerPlaceholder" = "Administrator cont";
-"linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
+"linkToAccountManager.accountManagerPlaceholder" = "Administrare cont";
+"linkToAccountManager.accountManagerLabel" = "Introdu URI Administrare cont";
 
 //Alerts
 "alerts.accountCannotBeFoundTitle" = "Nu pot găsi contul";
@@ -120,7 +120,7 @@
 "alerts.profileTakePhoto" = "Fă o poză";
 "alerts.profileUploadPhoto" = "Încarcă o poză";
 "alerts.profileCancelPhoto" = "Renunță";
-"alerts.accountLinkedTitle" = "Se conectează contul";
+"alerts.accountLinkedTitle" = "Se asociază contul";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
 "alerts.dbFailedMessage" = "Închide aplicația și încearcă să o deschizi din nou";
 "alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
@@ -132,9 +132,9 @@
 "alerts.confirmClearConversationTitle" = "Clear Conversation";
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
 "alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
-"alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
-"alerts.recordVideoMessage" = "Record a video message";
-"alerts.recordAudioMessage" = "Record an audio message";
+"alerts.errorWrongCredentials" = "Nu mă pot conecta la Administrare cont. Verifică datele de autentificare.";
+"alerts.recordVideoMessage" = "Înregistreză un mesaj video";
+"alerts.recordAudioMessage" = "Înregistreză un mesaj audio";
 "alerts.uploadFile" = "Upload file";
 "alerts.uploadPhoto" = "Upload photo or movie";
 
@@ -145,18 +145,18 @@
 "actions.clearAction" = "Clear";
 "actions.backAction" = "Înapoi";
 "actions.doneAction" = "Făcut";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
+"alerts.incomingCallAllertTitle" = "Apel primit de la";
 "alerts.incomingCallButtonAccept" = "Acceptă";
 "alerts.incomingCallButtonIgnore" = "Ignore";
 "actions.startAudioCall" = "  Audio Call";
 "actions.startVideoCall" = "  Video Call";
 
 //Calls
-"calls.callItemTitle" = "Call";
+"calls.callItemTitle" = "Apel";
 "calls.unknown" = "Necunoscut";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.connecting" = "Se conectează...";
 "calls.searching" = "Căutare...";
 "calls.callFinished" = "Call finished";
 "calls.currentCallWith" = "Call with ";
@@ -191,7 +191,7 @@
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.namePlaceholder" = "Nume";
-"accountPage.linkDeviceTitle" = "Conectează alt dispozitiv";
+"accountPage.linkDeviceTitle" = "Asociază alt dispozitiv";
 "accountPage.other" = "Other";
 "accountPage.removeAccountTitle" = "Elimină contul";
 "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.";
@@ -206,7 +206,7 @@
 "accountPage.usernameRegistering" = "Registering";
 "accountPage.usernameRegisterAction" = "Înscrie-te";
 "accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
-"accountPage.createPassword" = "Create password";
+"accountPage.createPassword" = "Creează parola";
 "accountPage.changePassword" = "Schimbă parola";
 "accountPage.oldPasswordPlaceholder" = "Enter old password";
 "accountPage.newPasswordPlaceholder" = "Enter new password";
@@ -215,7 +215,7 @@
 "accountPage.enableBoothMode" = "Enable Booth Mode";
 "accountPage.disableBoothMode" = "Disable Booth Mode";
 "accountPage.disableBoothModeExplanation" = "Pleace provide your account password";
-"accountPage.boothModeExplanation" = "In booth mode conversation history not saved and jami functionality limited by making outgoing calls. When you enable booth mode all your conversations will be removed.";
+"accountPage.boothModeExplanation" = "În modul Cabină cronologia conversațiilor nu e salvată și Jami este limitat la efectuarea de apeluri. Dacă activezi modul Cabină, toate conversațiile tale vor fi șterse.";
 "accountPage.noBoothMode" = "To enable Booth mode you need to create account password first.";
 "accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
 
@@ -243,23 +243,23 @@
 "blockListPage.noBlockedContacts" = "Niciun contact blocat";
 
 //Link New Device
-"linkDevice.title" = "Link a new device";
+"linkDevice.title" = "Asociază un nou dispozitiv";
 "linkDevice.passwordError" = "Parola introdusă nu deblochează acest cont";
 "linkDevice.networkError" = "O eroare de rețea a apărut în timpul exportării";
 "linkDevice.defaultError" = "O eroare a apărut în timpul exportării";
-"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" = "Pentru a completa procesul, trebuie să deschizi Jami pe noul dispozitiv și să alegi opțiunea \"Asociază acest dispozitiv unui cont\".Codul tău PIN este valabil 10 minute.";
 "linkDevice.hudMessage" = "Se verifică";
 
 //Contact Page
 "contactPage.startAudioCall" = "Start Audio Call";
 "contactPage.startVideoCall" = "Start Video Call";
 "contactPage.sendMessage" = "Send Message";
-"contactPage.clearConversation" = "Clear Chat";
+"contactPage.clearConversation" = "Șterge Discuția";
 "contactPage.blockContact" = "Block Contact";
 "contactPage.removeConversation" = "Remove Conversation";
 
 //DataTransfer
-"dataTransfer.readableStatusCreated" = "Initializing…";
+"dataTransfer.readableStatusCreated" = "Inițializare...";
 "dataTransfer.readableStatusError" = "Eroare";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "Refuză";
@@ -271,7 +271,7 @@
 "dataTransfer.readableStatusCancel" = "Renunță";
 
 //Notifications
-"notifications.incomingCall" = "Incoming Call";
+"notifications.incomingCall" = "Apel Primit";
 "notifications.missedCall" = "Missed Call";
 "notifications.acceptCall" = "ACCEPT";
 "notifications.refuseCall" = "REFUSE";
@@ -290,20 +290,20 @@
 //Generated Message
 "generatedMessage.contactAdded" = "Contact adăugat";
 "generatedMessage.invitationReceived" = "Invitație primită";
-"generatedMessage.invitationAccepted" = "Invitație primită";
+"generatedMessage.invitationAccepted" = "Invitație acceptată";
 "generatedMessage.outgoingCall" = "Apel efectuat";
-"generatedMessage.incomingCall" = "Apel";
-"generatedMessage.missedOutgoingCall" = "Pierdut apel efectuat";
+"generatedMessage.incomingCall" = "Apel primit";
+"generatedMessage.missedOutgoingCall" = "Apelul efectuat a fost pierdut";
 "generatedMessage.missedIncomingCall" = "Apel pierdut";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Reglări generale";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Migrarea contului";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
+"migrateAccount.title" = "Transferul contului";
+"migrateAccount.migrateButton" = "Transferă Contul";
+"migrateAccount.explanation" = "Acest cont trebuie transferat";
 "migrateAccount.passwordPlaceholder" = "Introdu parola";
 "migrateAccount.passwordExplanation" = "To proceed with the migration, you need to enter a password that was used for this account";
 "migrateAccount.removeAccount" = "Elimină contul";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index b4a0481e77713ca11ebf6c720365960391949b84..1d82eb680a0472b53946cc9f6d1458690912ec41 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -64,7 +64,7 @@
 "createProfile.profileCreated" = "Далее";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
+"createProfile.enterNamePlaceholder" = "Введите имя";
 "createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
 "createProfile.createYourAvatar" = "Create your avatar";
 
@@ -181,7 +181,7 @@
 "accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
 "accountPage.revokeDeviceTitle" = "Отозвать устройство";
 "accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
-"accountPage.revokeDeviceButton" = "Revoke";
+"accountPage.revokeDeviceButton" = "Отозвать";
 "accountPage.revokeDevicePlaceholder" = "Enter your passord";
 "accountPage.deviceRevoked" = "Device revocation completed";
 "accountPage.deviceRevocationProgress" = "Revoking...";
@@ -220,9 +220,9 @@
 "accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
 
 //Account
-"account.sipUsername" = "User Name";
+"account.sipUsername" = "Имя пользователя";
 "account.sipPassword" = "Пароль";
-"account.sipServer" = "SIP Server";
+"account.sipServer" = "SIP-сервер";
 "account.port" = "Порт";
 "account.proxyServer" = "Прокси";
 "account.createSipAccount" = "Create Sip Account";
@@ -290,7 +290,7 @@
 //Generated Message
 "generatedMessage.contactAdded" = "Контакт добавлен";
 "generatedMessage.invitationReceived" = "Получено приглашение";
-"generatedMessage.invitationAccepted" = "Invitation accepted";
+"generatedMessage.invitationAccepted" = "Приглашение принято";
 "generatedMessage.outgoingCall" = "Исходящий вызов";
 "generatedMessage.incomingCall" = "Входящий вызов";
 "generatedMessage.missedOutgoingCall" = "Пропущенный исходящий";
diff --git a/Ring/Ring/Resources/tr_TR.lproj/Localizable.strings b/Ring/Ring/Resources/tr_TR.lproj/Localizable.strings
index d84c907a6f841273975e2cf008c2073cf7342209..e8bf6372a2e3e0f4d3df260240b1cefc27290ea9 100644
--- a/Ring/Ring/Resources/tr_TR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr_TR.lproj/Localizable.strings
@@ -19,7 +19,7 @@
  */
 
 // Global
-"global.homeTabBarTitle" = "Başlangıç";
+"global.homeTabBarTitle" = "Conversations";
 "global.contactRequestsTabBarTitle" = "Invitations";
 "global.meTabBarTitle" = "Account";
 "global.ok" = "Ok";
@@ -37,7 +37,7 @@
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
-"smartlist.noNetworkConnectivity" = "No network connectivity";
+"smartlist.noNetworkConnectivity" = "İnternet bağlantısı yok";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
@@ -57,6 +57,7 @@
 "welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
 "welcome.linkDevice" = "Link this device to an account";
 "welcome.createAccount" = "Create a Jami account";
+"welcome.connectToManager" = "Connect to account manager";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Skip";
@@ -132,6 +133,10 @@
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
 "alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
 "alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
+"alerts.recordVideoMessage" = "Record a video message";
+"alerts.recordAudioMessage" = "Record an audio message";
+"alerts.uploadFile" = "Upload file";
+"alerts.uploadPhoto" = "Upload photo or movie";
 
 //Actions
 "actions.blockAction" = "Block";
@@ -139,9 +144,12 @@
 "actions.cancelAction" = "Cancel";
 "actions.clearAction" = "Clear";
 "actions.backAction" = "Back";
+"actions.doneAction" = "Done";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
 "alerts.incomingCallButtonAccept" = "Accept";
 "alerts.incomingCallButtonIgnore" = "Ignore";
+"actions.startAudioCall" = "  Audio Call";
+"actions.startVideoCall" = "  Video Call";
 
 //Calls
 "calls.callItemTitle" = "Call";
@@ -156,12 +164,12 @@
 
 //Account Page
 "accountPage.devicesListHeader" = "Devices";
-"accountPage.settingsHeader" = "Ayarlar";
+"accountPage.settingsHeader" = "Settings";
 "accountPage.username" = "Username";
 "accountPage.usernameNotRegistered" = "username: not registered";
 "accountPage.credentialsHeader" = "Account Details";
 "accountPage.enableProxy" = "Enable Proxy";
-"accountPage.blockedContacts" = "Block List";
+"accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "UNBLOCK";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
 "accountPage.enableProxy" = "Enable Proxy";
@@ -190,7 +198,26 @@
 "accountPage.removeAccountButton" = "Remove";
 "accountPage.shareAccountDetails" = "Share Account Details";
 "accountPage.contactMeOnJamiTitle" = "Contact me on Jami!";
-"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributet communication platform: https://jami.net";
+"accountPage.contactMeOnJamiContant" = "Contact me using \"%s\" on the Jami distributed communication platform: https://jami.net";
+"accountPage.registerNameTitle" = "Register a username";
+"accountPage.passwordPlaceholder" = "Enter account password";
+"accountPage.usernamePlaceholder" = "Enter desired username";
+"accountPage.registerNameErrorMessage" = "Choosen username is not available";
+"accountPage.usernameRegistering" = "Registering";
+"accountPage.usernameRegisterAction" = "Register";
+"accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
+"accountPage.createPassword" = "Create password";
+"accountPage.changePassword" = "Change password";
+"accountPage.oldPasswordPlaceholder" = "Enter old password";
+"accountPage.newPasswordPlaceholder" = "Enter new password";
+"accountPage.newPasswordConfirmPlaceholder" = "Confirm new password";
+"accountPage.changePasswordError" = "Password incorrect";
+"accountPage.enableBoothMode" = "Enable Booth Mode";
+"accountPage.disableBoothMode" = "Disable Booth Mode";
+"accountPage.disableBoothModeExplanation" = "Pleace provide your account password";
+"accountPage.boothModeExplanation" = "In booth mode conversation history not saved and jami functionality limited by making outgoing calls. When you enable booth mode all your conversations will be removed.";
+"accountPage.noBoothMode" = "To enable Booth mode you need to create account password first.";
+"accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
 
 //Account
 "account.sipUsername" = "User Name";
@@ -210,6 +237,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
+"account.needMigration" = "account need to be migrated";
 
 //Block List Page
 "blockListPage.noBlockedContacts" = "No blocked contacts";
@@ -265,10 +293,23 @@
 "generatedMessage.invitationAccepted" = "Invitation accepted";
 "generatedMessage.outgoingCall" = "Giden arama";
 "generatedMessage.incomingCall" = "Gelen arama";
-"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
-"generatedMessage.missedIncomingCall" = "Missed incoming call";
+"generatedMessage.missedOutgoingCall" = "Giden cevapsız çağrı";
+"generatedMessage.missedIncomingCall" = "Gelen cevapsız çağrı";
 
 //General Settings
 "generalSettings.title" = "General settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
+//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";
+
+
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index 4097bceb2c92d688abf5eb54d8261ed8268a3247..12098d44657e220cb2324569ae2ad08db21acc82 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -21,7 +21,7 @@
 // Global
 "global.homeTabBarTitle" = "会话";
 "global.contactRequestsTabBarTitle" = "邀请";
-"global.meTabBarTitle" = "帐户";
+"global.meTabBarTitle" = "账户";
 "global.ok" = "确定";
 "global.versionName" = "\"Free as in Freedom\"";
 
@@ -39,8 +39,8 @@
 "smartlist.searchBarPlaceholder" = "输入名字";
 "smartlist.noNetworkConnectivity" = "无网络连接";
 "smartlist.cellularAccess" = "请确保蜂窝移动网络权限已开启";
-"smartlist.accountsTitle" = "帐户";
-"smartlist.addAccountButton" = "+添加帐户";
+"smartlist.accountsTitle" = "账户";
+"smartlist.addAccountButton" = "+ 添加账户";
 "smartlist.noNumber" = "选定的连接没有任何数字";
 "smartlist.selectOneNumber" = "选择这些数字中的一个";
 
@@ -55,7 +55,7 @@
 //Welcome Screen
 "welcome.title" = "欢迎来到Jami!";
 "welcome.text" = "Ring 是一个保护用户的隐私和自由的通用自由软件。";
-"welcome.linkDevice" = "将此设备与一个帐户进行连接";
+"welcome.linkDevice" = "将此设备与一个账户进行关联";
 "welcome.createAccount" = "创建一个Jami账户";
 "welcome.connectToManager" = "连接到账户管理器";
 
@@ -69,7 +69,7 @@
 "createProfile.createYourAvatar" = "建立你的头像";
 
 //Create Account form
-"createAccount.createAccountFormTitle" = "创建Ring帐户";
+"createAccount.createAccountFormTitle" = "创建您的账户";
 "createAccount.chooseStrongPassword" = "选择一个强密码并记住它来保护你的 Jami 帐号";
 "createAccount.enterNewUsernamePlaceholder" = "用户名";
 "createAccount.newPasswordPlaceholder" = "密码";
@@ -80,7 +80,7 @@
 "createAccount.invalidUsername" = "无效的用户名";
 "createAccount.usernameAlreadyTaken" = "用户名已被他人使用";
 "createAccount.loading" = "载入中";
-"createAccount.waitCreateAccountTitle" = "添加帐户";
+"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.RegisterAUsername" = "注册一个用户名";
 "createAccount.ChooseAPassword" = "加密我的账户";
 "createAccount.PasswordInformation" = "选择一个密码来加密你的账户。请记下它,否则你将无法恢复你的账户。";
@@ -98,7 +98,7 @@
 "linkToAccount.pinPlaceholder" = "PIN";
 "linkToAccount.passwordLabel" = "输入密码";
 "linkToAccount.pinLabel" = "输入PIN";
-"linkToAccount.explanationPinMessage" = "要获取一个PIN,请进入你已登陆的设备中的用户管理界面,选择“链接另一台设备到这个用户”。输入你的用户密码后,你会得到在此处所需的PIN,它在10分钟内有效。";
+"linkToAccount.explanationPinMessage" = "要生成 PIN 码,请在包含您想使用的账户的设备上打开本应用的账户管理设置,在设备设置中选择“将另一台设备关联至此账户”。您会获得完成本项内容所需的 PIN 码,该 PIN 码有效期为 10 分钟。";
 
 //Link To Account Manager form
 "linkToAccountManager.signIn" = "注册";
@@ -110,11 +110,11 @@
 "linkToAccountManager.accountManagerLabel" = "输入账户管理器的 URI";
 
 //Alerts
-"alerts.accountCannotBeFoundTitle" = "无法找到帐户";
+"alerts.accountCannotBeFoundTitle" = "无法找到账户";
 "alerts.accountCannotBeFoundMessage" = "无法在Jami网络中找到账户。 请确保它是从现有设备的Jami上导出的,并且提供的凭证是有效的。";
 "alerts.accountAddedTitle" = "用户已添加";
 "alerts.accountNoNetworkTitle" = "无法连接至网络";
-"alerts.accountNoNetworkMessage" = "无法添加帐户,因为Jami无法连接到分布式网络。检查您设备的连接。";
+"alerts.accountNoNetworkMessage" = "因 Jami 无法连接到分布式网络而无法添加账户。检查您设备的网络连接。";
 "alerts.accountDefaultErrorTitle" = "未知错误";
 "alerts.accountDefaultErrorMessage" = "用户不能被创建";
 "alerts.profileTakePhoto" = "拍照";
@@ -135,8 +135,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.uploadFile" = "上传文件";
+"alerts.uploadPhoto" = "上传照片或视频";
 
 //Actions
 "actions.blockAction" = "屏蔽";
@@ -144,12 +144,12 @@
 "actions.cancelAction" = "取消";
 "actions.clearAction" = "清除";
 "actions.backAction" = "上一步";
-"actions.doneAction" = "已完成";
+"actions.doneAction" = "完成";
 "alerts.incomingCallAllertTitle" = "通话来自";
 "alerts.incomingCallButtonAccept" = "接听";
 "alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
+"actions.startAudioCall" = "语音通话";
+"actions.startVideoCall" = "视频通话";
 
 //Calls
 "calls.callItemTitle" = "通话";
@@ -191,7 +191,7 @@
 "accountPage.deviceRevocationUnknownDevice" = "未知设备";
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.namePlaceholder" = "姓名";
-"accountPage.linkDeviceTitle" = "链接另一台设备";
+"accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "其他";
 "accountPage.removeAccountTitle" = "移除账户";
 "accountPage.removeAccountMessage" = "点击“删除”将从此设备上删除该帐号!此操作无法撤销。同时,您也会失去已注册的用户名。";
@@ -206,18 +206,18 @@
 "accountPage.usernameRegistering" = "注册中";
 "accountPage.usernameRegisterAction" = "注册";
 "accountPage.usernameRegistrationFailed" = "注册失败。请检查密码。";
-"accountPage.createPassword" = "Create password";
+"accountPage.createPassword" = "创建密码";
 "accountPage.changePassword" = "更改密码";
-"accountPage.oldPasswordPlaceholder" = "Enter old password";
-"accountPage.newPasswordPlaceholder" = "Enter new password";
-"accountPage.newPasswordConfirmPlaceholder" = "Confirm new password";
-"accountPage.changePasswordError" = "Password incorrect";
-"accountPage.enableBoothMode" = "Enable Booth Mode";
-"accountPage.disableBoothMode" = "Disable Booth Mode";
-"accountPage.disableBoothModeExplanation" = "Pleace provide your account password";
-"accountPage.boothModeExplanation" = "In booth mode conversation history not saved and jami functionality limited by making outgoing calls. When you enable booth mode all your conversations will be removed.";
-"accountPage.noBoothMode" = "To enable Booth mode you need to create account password first.";
-"accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
+"accountPage.oldPasswordPlaceholder" = "输入旧密码";
+"accountPage.newPasswordPlaceholder" = "输入新密码";
+"accountPage.newPasswordConfirmPlaceholder" = "确认新密码";
+"accountPage.changePasswordError" = "密码错误";
+"accountPage.enableBoothMode" = "启用话亭模式";
+"accountPage.disableBoothMode" = "禁用话亭模式";
+"accountPage.disableBoothModeExplanation" = "请输入您的账户密码";
+"accountPage.boothModeExplanation" = "话亭模式中,不会保存会话历史,且 jami 的功能会受限为外拨电话。启用话亭模式后,现有会话将全部被删除。";
+"accountPage.noBoothMode" = "要使用话亭模式,您需要先设置账户密码。";
+"accountPage.boothModeAlertMessage" = "启用话亭模式后您的现有会话都将被删除。";
 
 //Account
 "account.sipUsername" = "用户名";
@@ -244,10 +244,10 @@
 
 //Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "您输入的密码无法解锁该帐户";
+"linkDevice.passwordError" = "您输入的密码无法解锁该账户";
 "linkDevice.networkError" = "导出时发生网络错误";
 "linkDevice.defaultError" = "导出时发生错误";
-"linkDevice.explanationMessage" = "要完成关联过程,请在您的新设备上打开 Jami 并选择“将这台设备关联到到账户”。PIN 码有效期为 10分钟。";
+"linkDevice.explanationMessage" = "要完成关联过程,请在您的新设备上打开 Jami 并选择“将这台设备关联到账户”。PIN 码有效期为 10 分钟。";
 "linkDevice.hudMessage" = "认证中";
 
 //Contact Page
@@ -301,13 +301,13 @@
 "generalSettings.videoAcceleration" = "启用视频加速";
 
 //Migrate Account
-"migrateAccount.title" = "帐户迁移";
+"migrateAccount.title" = "账户迁移";
 "migrateAccount.migrateButton" = "迁移账户";
 "migrateAccount.explanation" = "该账户需迁移";
 "migrateAccount.passwordPlaceholder" = "输入密码";
 "migrateAccount.passwordExplanation" = "若要进行迁移,您需要输入此账户的密码。";
 "migrateAccount.removeAccount" = "移除账户";
-"migrateAccount.error" = "帐户迁移失败。您可重试或删除您的帐户。";
+"migrateAccount.error" = "账户迁移失败。您可重试或删除您的账户。";
 "migrateAccount.migrating" = "迁移中...";
 "migrateAccount.cancel" = "取消";
 "migrateAccount.migrateAnother" = "迁移另一个账户";