diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 3d4eb90976c7d51905ce0b5f2fdf7e0b853ece71..71e9969472fcdd5b5cb32101011ad8c232bdcc18 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -135,8 +135,8 @@
 "alerts.errorWrongCredentials" = "No se pudo conectar al administrador de cuenta proporcionado. Por favor verifica tus credenciales";
 "alerts.recordVideoMessage" = "Grabar mensaje de video";
 "alerts.recordAudioMessage" = "Grabar mensaje de audio";
-"alerts.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.uploadFile" = "Subir archivo";
+"alerts.uploadPhoto" = "Subir foto o película";
 
 //Actions
 "actions.blockAction" = "Bloquear";
@@ -148,8 +148,8 @@
 "alerts.incomingCallAllertTitle" = "Llamada entrante de ";
 "alerts.incomingCallButtonAccept" = "Aceptar";
 "alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
+"actions.startAudioCall" = "Llamada de voz";
+"actions.startVideoCall" = "Videollamada";
 
 //Calls
 "calls.callItemTitle" = "Llamar";
@@ -208,16 +208,16 @@
 "accountPage.usernameRegistrationFailed" = "El registro ha fallado. Por favor, compruebe la contraseña.";
 "accountPage.createPassword" = "Crear contraseña";
 "accountPage.changePassword" = "Cambiar contraseña";
-"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" = "Ingrese su contraseña anterior";
+"accountPage.newPasswordPlaceholder" = "Ingrese su nueva contraseña";
+"accountPage.newPasswordConfirmPlaceholder" = "Confirme la nueva contraseña";
+"accountPage.changePasswordError" = "Contraseña incorrecta";
+"accountPage.enableBoothMode" = "Habilitar modo reservado";
+"accountPage.disableBoothMode" = "Deshabilitar modo reservado";
+"accountPage.disableBoothModeExplanation" = "Por favor Introduzca la contraseña de su cuenta";
+"accountPage.boothModeExplanation" = "En el modo de conversación reservada, el historial de conversaciones no se guarda y la funcionalidad de Jami se limita al realizar llamadas salientes. Cuando habilite el modo de conversación reservada, se eliminarán todas sus conversaciones.";
+"accountPage.noBoothMode" = "Para habilitar el modo reservado, primero debe crear una contraseña de cuenta.";
+"accountPage.boothModeAlertMessage" = "Después de habilitar el modo reservado, se eliminarán todas sus conversaciones.";
 
 //Account
 "account.sipUsername" = "Nombre de usuario";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 6fcc0a73145ce025e0be5ad2be29154851673d4c..1a0a8f979c93afd3026090481cee05ecbd6dcdc5 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -26,7 +26,7 @@
 "global.versionName" = "Libre en el sentido de libertad";
 
 // Scan
-"scan.badQrCode" = "Bad QR code";
+"scan.badQrCode" = "Código QR erróneo";
 "scan.search" = "Buscando...";
 
 // Smartlist
@@ -35,61 +35,61 @@
 "smartlist.conversations" = "Conversaciones";
 "smartlist.searching" = "Buscando...";
 "smartlist.noResults" = "Sin resultados";
-"smartlist.noConversation" = "No conversations";
-"smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.noConversation" = "Sin conversaciones";
+"smartlist.searchBarPlaceholder" = "Ingresá tu nombre...";
 "smartlist.noNetworkConnectivity" = "Sin conexión a la red";
 "smartlist.cellularAccess" = "Asegúrate de que el acceso a la red móvil esté activado en tu configuración";
 "smartlist.accountsTitle" = "Cuentas";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Añadir cuenta";
+"smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
+"smartlist.selectOneNumber" = "Seleccioná uno de los números";
 
 //Conversation
-"conversation.messagePlaceholder" = "Type your message...";
+"conversation.messagePlaceholder" = "Escribí tu mensaje...";
 
 //Invitations
-"invitations.noInvitations" = "No invitations";
+"invitations.noInvitations" = "Sin invitaciones";
 
 // Walkthrough
 
 //Welcome Screen
-"welcome.title" = "Welcome to Jami !";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.title" = "¡Bienvenido a Jami!";
+"welcome.text" = "Jami es una plataforma de comunicación libre y universal que preserva la privacidad y las libertades de los usuarios.";
 "welcome.linkDevice" = "Vincular este dispositivo a una cuenta";
 "welcome.createAccount" = "Crear una cuenta de Jami";
-"welcome.connectToManager" = "Connect to account manager";
+"welcome.connectToManager" = "Conectar a administrador de cuenta";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Saltar";
 "createProfile.profileCreated" = "Siguiente";
-"createProfile.title" = "Personalise your profile";
-"createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
-"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
-"createProfile.createYourAvatar" = "Create your avatar";
+"createProfile.title" = "Personalizá tu perfil";
+"createProfile.enterNameLabel" = "Ingresá un nombre para mostrar";
+"createProfile.enterNamePlaceholder" = "Ingresá tu nombre";
+"createProfile.subtitle" = "Tu perfil será compartido con tus contactos. Puedes cambiarlo en cualquier momento.";
+"createProfile.createYourAvatar" = "Creá tu avatar";
 
 //Create Account form
 "createAccount.createAccountFormTitle" = "Creá tu cuenta";
-"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
+"createAccount.chooseStrongPassword" = "Elegí una contraseña robusta que recordarás para proteger tu cuenta de Jami.";
 "createAccount.enterNewUsernamePlaceholder" = "Nombre de usuario";
 "createAccount.newPasswordPlaceholder" = "Contraseña";
 "createAccount.repeatPasswordPlaceholder" = "Confirmar contraseña";
 "createAccount.passwordCharactersNumberError" = "6 carateres mínimo";
 "createAccount.passwordNotMatchingError" = "las contraseñas no coinciden";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "buscando disponibilidad ...";
 "createAccount.invalidUsername" = "usuario inválido";
 "createAccount.usernameAlreadyTaken" = "usuario ya en uso";
 "createAccount.loading" = "Cargando";
 "createAccount.waitCreateAccountTitle" = "Añadiendo cuenta";
-"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.Recommended" = "(Recommended)";
+"createAccount.RegisterAUsername" = "Registrá un nombre de usuario";
+"createAccount.ChooseAPassword" = "Cifrar mi cuenta";
+"createAccount.PasswordInformation" = "Eligí una contraseña para cifrar tu cuenta local. No lo olvides o no podrás recuperar tu cuenta";
+"createAccount.EnableNotifications" = "Norificaciones";
+"createAccount.Recommended" = "(Recomendado)";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
-"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.";
+"createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
+"createAccount.timeoutTitle" = "Cuenta creada";
+"createAccount.timeoutMessage" = "Registro de nombre de usuario en curso ... Podría tomar unos minutos.";
 
 //Link To Account form
 "linkToAccount.waitLinkToAccountTitle" = "Vincular cuenta";
@@ -101,17 +101,17 @@
 "linkToAccount.explanationPinMessage" = "Para generar el código PIN, ve a los ajustes de administración de cuenta en el dispositivo que contenga la cuenta que querés usar. En ajustes de dispositivo seleccioná \"Enlazar otro dispositivo a esta cuenta\". Obtendrás el PIN necesario para completar este formulario. El PIN sólo es valido por 10 minutos.";
 
 //Link To Account Manager form
-"linkToAccountManager.signIn" = "Sign In";
+"linkToAccountManager.signIn" = "Registrarse";
 "linkToAccountManager.passwordPlaceholder" = "Contraseña";
 "linkToAccountManager.passwordLabel" = "Introducir Contraseña";
 "linkToAccountManager.usernamePlaceholder" = "Nombre de usuario";
-"linkToAccountManager.usernameLabel" = "Enter Username";
-"linkToAccountManager.accountManagerPlaceholder" = "Account manager";
-"linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
+"linkToAccountManager.usernameLabel" = "Ingresá el nombre de usuario";
+"linkToAccountManager.accountManagerPlaceholder" = "Administrador de cuentas";
+"linkToAccountManager.accountManagerLabel" = "Ingresá la URI del administrador de cuenta";
 
 //Alerts
 "alerts.accountCannotBeFoundTitle" = "No se pudo encontrar la cuenta";
-"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.accountCannotBeFoundMessage" = "No se pudo encontrar la cuenta en la red Jami. Asegurate de que se haya exportado en Jami desde un dispositivo existente y que las credenciales proporcionadas sean correctas.";
 "alerts.accountAddedTitle" = "Cuenta Añadida";
 "alerts.accountNoNetworkTitle" = "No se puede conectar a la red";
 "alerts.accountNoNetworkMessage" = "No se pudo añadir la cuenta debido a que Jami no ha podido conectarse a la red. Revisa la conectividad de tu dispositivo.";
@@ -121,169 +121,169 @@
 "alerts.profileUploadPhoto" = "Subir foto";
 "alerts.profileCancelPhoto" = "Cancelar";
 "alerts.accountLinkedTitle" = "Vincular cuenta";
-"alerts.dbFailedTitle" = "An error happned when launching Jami";
+"alerts.dbFailedTitle" = "Se produjo un error al iniciar Jami";
 "alerts.dbFailedMessage" = "Por favor cierra la aplicación e intenta abrirla de nuevo.";
-"alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
-"alerts.confirmBlockContactTitle" = "Block Contact";
-"alerts.confirmDeleteConversation" = "Are you sure you want to delete this conversation permanently?";
-"alerts.confirmDeleteConversationFromContact" = "Are you sure you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete Conversation";
-"alerts.confirmClearConversation" = "Are you sure you want to clear the conversation with this contact?";
-"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.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.confirmBlockContact" = "¿Estás seguro de que querés bloquear este contacto? El historial de conversaciones con este contacto también se eliminará de forma permanente.";
+"alerts.confirmBlockContactTitle" = "Bloquear contacto";
+"alerts.confirmDeleteConversation" = "¿Realmente querés eliminar esta conversación definitivamente?";
+"alerts.confirmDeleteConversationFromContact" = "¿Realmente querés eliminar la conversación con este contacto?";
+"alerts.confirmDeleteConversationTitle" = "Eliminar conversación";
+"alerts.confirmClearConversation" = "¿Estás seguro de que querés borrar la conversación con este contacto?";
+"alerts.confirmClearConversationTitle" = "Borrar conversación";
+"alerts.noMediaPermissionsTitle" = "Permiso a medios no concedido";
+"alerts.noLibraryPermissionsTitle" = "Acceso a librería de fotos no concedido";
+"alerts.errorWrongCredentials" = "No se puede conectar con el administrador de cuenta proporcionado. Por favor revise sus credenciales";
+"alerts.recordVideoMessage" = "Grabar un mensaje de video";
+"alerts.recordAudioMessage" = "Grabar un mensaje de audio";
+"alerts.uploadFile" = "Subir archivo";
+"alerts.uploadPhoto" = "Subir foto o película";
 
 //Actions
 "actions.blockAction" = "Bloquear";
 "actions.deleteAction" = "Eliminar";
 "actions.cancelAction" = "Cancelar";
-"actions.clearAction" = "Clear";
+"actions.clearAction" = "Limpiar";
 "actions.backAction" = "Atrás";
-"actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
+"actions.doneAction" = "Hecho";
+"alerts.incomingCallAllertTitle" = "Llamada entrante de";
 "alerts.incomingCallButtonAccept" = "Aceptar";
 "alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
+"actions.startAudioCall" = "Llamada de voz";
+"actions.startVideoCall" = "Videollamada";
 
 //Calls
 "calls.callItemTitle" = "Llamar";
 "calls.unknown" = "Desconocido";
-"calls.incomingCallInfo" = "wants to talk to you";
-"calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.incomingCallInfo" = "quiere hablar con vos";
+"calls.ringing" = "Sonando...";
+"calls.connecting" = "Conectando...";
 "calls.searching" = "Buscando...";
-"calls.callFinished" = "Call finished";
-"calls.currentCallWith" = "Call with ";
-"calls.haghUp" = "hang up";
+"calls.callFinished" = "Llamada finalizada";
+"calls.currentCallWith" = "Llamada con";
+"calls.haghUp" = "Colgar";
 
 //Account Page
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Ajustes";
 "accountPage.username" = "Nombre de usuario";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
+"accountPage.usernameNotRegistered" = "Nombre de usuario: no registrado";
+"accountPage.credentialsHeader" = "Detalles de cuenta";
 "accountPage.enableProxy" = "Habilitar Proxy";
 "accountPage.blockedContacts" = "Contactos bloqueados";
-"accountPage.unblockContact" = "UNBLOCK";
-"accountPage.proxyAddressAlert" = "Provide proxy address";
+"accountPage.unblockContact" = "DESBLOQUEAR";
+"accountPage.proxyAddressAlert" = "Provea dirección proxy";
 "accountPage.enableProxy" = "Habilitar Proxy";
-"accountPage.noProxyExplanationLabel" = "Your device won't receive notifications when proxy is disabled";
-"accountPage.saveProxyAddress" = "Save";
-"accountPage.proxyPaceholder" = "Proxy address";
-"accountPage.enableNotifications" = "Enable Notifications";
-"accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
-"accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
+"accountPage.noProxyExplanationLabel" = "Tu dispositivo no recibirá notificaciones cuando el proxy esté deshabilitado";
+"accountPage.saveProxyAddress" = "Guardar";
+"accountPage.proxyPaceholder" = "Dirección proxy";
+"accountPage.enableNotifications" = "Habilitar notificaciones";
+"accountPage.proxyDisabledAlertTitle" = "Servidor proxy deshabilitado";
+"accountPage.proxyDisabledAlertBody" = "Para recibir notificaciones, por favor habilite el proxy";
 "accountPage.revokeDeviceTitle" = "Revocar dispositivo";
-"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";
-"accountPage.deviceRevoked" = "Device revocation completed";
-"accountPage.deviceRevocationProgress" = "Revoking...";
-"accountPage.deviceRevocationSuccess" = "Device was revoked";
-"accountPage.deviceRevocationTryAgain" = "Try again";
+"accountPage.revokeDeviceMessage" = "¿Estás seguro de  querer revocar este dispositivo? Esta acción es irreversible.";
+"accountPage.revokeDeviceButton" = "Revocar";
+"accountPage.revokeDevicePlaceholder" = "Ingresá tu contraseña";
+"accountPage.deviceRevoked" = "Revocación del dispositivo completada";
+"accountPage.deviceRevocationProgress" = "Revocando";
+"accountPage.deviceRevocationSuccess" = "El dispositivo fue revocado";
+"accountPage.deviceRevocationTryAgain" = "Volvé a intentar";
 "accountPage.deviceRevocationWrongPassword" = "Contraseña incorrecta";
-"accountPage.deviceRevocationUnknownDevice" = "Unknown device";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.deviceRevocationUnknownDevice" = "Dispositivo desconocido";
+"accountPage.deviceRevocationError" = "Error de revocación del dispositivo";
 "accountPage.namePlaceholder" = "Nombre";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Vincula otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountTitle" = "Remove account";
-"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.removeAccountTitle" = "Eliminar cuenta";
+"accountPage.removeAccountMessage" = "¡Al hacer clic en \"Eliminar\", eliminarás esta cuenta en este dispositivo! Esta acción no se puede deshacer. Además, tu nombre registrado puede perderse.";
 "accountPage.removeAccountButton" = "Eliminar";
-"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.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.shareAccountDetails" = "Compartir detalles de cuenta";
+"accountPage.contactMeOnJamiTitle" = "Contactame en Jami";
+"accountPage.contactMeOnJamiContant" = "Contácteme usando \"%s\" en la plataforma de comunicación distribuida Jami: https://jami.net";
+"accountPage.registerNameTitle" = "Registrá un nombre de usuario";
+"accountPage.passwordPlaceholder" = "Ingresá la contraseña de la cuenta";
+"accountPage.usernamePlaceholder" = "Ingresá el nombre de usuario deseado";
+"accountPage.registerNameErrorMessage" = "El nombre de usuario elegido no está disponible";
+"accountPage.usernameRegistering" = "Registrando";
 "accountPage.usernameRegisterAction" = "Registrar";
-"accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
-"accountPage.createPassword" = "Create password";
+"accountPage.usernameRegistrationFailed" = "Falló la registración. Por favor revisá tu contraseña.";
+"accountPage.createPassword" = "Crear contraseña";
 "accountPage.changePassword" = "Cambiar contraseña";
-"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" = "Ingresar contraseña anterior";
+"accountPage.newPasswordPlaceholder" = "Ingresar nueva contraseña";
+"accountPage.newPasswordConfirmPlaceholder" = "Confirmar nueva contraseña";
+"accountPage.changePasswordError" = "Contraseña incorrecta";
+"accountPage.enableBoothMode" = "Habilitar modo reservado";
+"accountPage.disableBoothMode" = "Deshabilitar modo reservado";
+"accountPage.disableBoothModeExplanation" = "Por favor ingresá la contraseña de tu cuenta";
+"accountPage.boothModeExplanation" = "En el modo de conversación reservada, el historial de conversaciones no se guarda y la funcionalidad de Jami se limita al realizar llamadas salientes. Cuando habilite el modo de conversación reservada, se eliminarán todas sus conversaciones.";
+"accountPage.noBoothMode" = "Para habilitar el modo de conversación reservada, primero debe crear una contraseña de cuenta.";
+"accountPage.boothModeAlertMessage" = "Después de habilitar el modo de conversación reservada, se eliminarán todas sus conversaciones.";
 
 //Account
-"account.sipUsername" = "User Name";
+"account.sipUsername" = "Nombre de usuario";
 "account.sipPassword" = "Contraseña";
-"account.sipServer" = "SIP Server";
+"account.sipServer" = "Servidor SIP";
 "account.port" = "Puerto";
 "account.proxyServer" = "Proxy";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.createSipAccount" = "Crear cuenta SIP";
+"account.usernameLabel" = "Ingresá el nombre de usuario";
 "account.passwordLabel" = "Introducir Contraseña";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Ingresá dirección";
+"account.portLabel" = "Ingresá número de puerto";
+"account.accountStatus" = "Estado de cuenta";
+"account.enableAccount" = "Habilitar cuenta";
 "account.statusOnline" = "En línea";
 "account.statusOffline" = "Desconectado";
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Desconocido";
-"account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.statusConnectionerror" = "Error de conexión";
+"account.needMigration" = "cuenta necesita ser migrada";
 
 //Block List Page
-"blockListPage.noBlockedContacts" = "No blocked contacts";
+"blockListPage.noBlockedContacts" = "No hay contactos bloqueados";
 
 //Link New Device
-"linkDevice.title" = "Link a new device";
+"linkDevice.title" = "Vincular un nuevo dispositivo";
 "linkDevice.passwordError" = "La contraseña ingresada no es válida";
 "linkDevice.networkError" = "Ocurrió un error durante la exportación";
 "linkDevice.defaultError" = "Ocurrió un error al exportar";
-"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" = "Para completar el procedimiento, necesitás abrir Jami en el nuevo dispositivo y elegir la opción \"Vincular este dispositivo a una cuenta\". Tu PIN es válido por 10 minutos.";
 "linkDevice.hudMessage" = "Verificando";
 
 //Contact Page
-"contactPage.startAudioCall" = "Start Audio Call";
-"contactPage.startVideoCall" = "Start Video Call";
-"contactPage.sendMessage" = "Send Message";
-"contactPage.clearConversation" = "Clear Chat";
-"contactPage.blockContact" = "Block Contact";
-"contactPage.removeConversation" = "Remove Conversation";
+"contactPage.startAudioCall" = "Iniciar una llamada de voz";
+"contactPage.startVideoCall" = "Iniciar una videollamada";
+"contactPage.sendMessage" = "Enviar mensaje";
+"contactPage.clearConversation" = "Limpiar conversación";
+"contactPage.blockContact" = "Bloquear contacto";
+"contactPage.removeConversation" = "Eliminar conversación";
 
 //DataTransfer
-"dataTransfer.readableStatusCreated" = "Initializing…";
+"dataTransfer.readableStatusCreated" = "Inicializando...";
 "dataTransfer.readableStatusError" = "Error";
-"dataTransfer.readableStatusAwaiting" = "Pending…";
+"dataTransfer.readableStatusAwaiting" = "Pendiente...";
 "dataTransfer.readableStatusRefuse" = "Rechazar";
-"dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
-"dataTransfer.sendingFailed" = "Failed to send";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusOngoing" = "Transferiendo";
+"dataTransfer.readableStatusCanceled" = "Cancelado";
+"dataTransfer.sendingFailed" = "falló el envío";
+"dataTransfer.readableStatusSuccess" = "Completado";
 "dataTransfer.readableStatusAccept" = "Aceptar";
 "dataTransfer.readableStatusCancel" = "Cancelar";
 
 //Notifications
-"notifications.incomingCall" = "Incoming Call";
-"notifications.missedCall" = "Missed Call";
-"notifications.acceptCall" = "ACCEPT";
-"notifications.refuseCall" = "REFUSE";
-"notifications.newFile" = "New file";
-"dataTransfer.readableStatusAwaiting" = "Pending…";
+"notifications.incomingCall" = "Llamada entrante";
+"notifications.missedCall" = "Llamada perdida";
+"notifications.acceptCall" = "ACEPTAR";
+"notifications.refuseCall" = "RECHAZAR";
+"notifications.newFile" = "Nuevo archivo";
+"dataTransfer.readableStatusAwaiting" = "Pendiente...";
 "dataTransfer.readableStatusRefuse" = "Rechazar";
-"dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
-"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusOngoing" = "Transferiendo";
+"dataTransfer.readableStatusCanceled" = "Cancelado";
+"dataTransfer.readableStatusSuccess" = "Completado";
 "dataTransfer.readableStatusAccept" = "Aceptar";
 "dataTransfer.readableStatusCancel" = "Cancelar";
-"dataTransfer.infoMessage" = "Press to start recording";
+"dataTransfer.infoMessage" = "Presioná para comenzar a grabar";
 "dataTransfer.sendMessage" = "Enviar";
 
 
@@ -297,19 +297,19 @@
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 
 //General Settings
-"generalSettings.title" = "General settings";
-"generalSettings.videoAcceleration" = "Enable video acceleration";
+"generalSettings.title" = "Configuración general";
+"generalSettings.videoAcceleration" = "Habilitar aceleración de video";
 
 //Migrate Account
 "migrateAccount.title" = "Migración de cuenta";
-"migrateAccount.migrateButton" = "Migrate Account";
-"migrateAccount.explanation" = "This account needs to be migrated";
+"migrateAccount.migrateButton" = "Migrar cuenta";
+"migrateAccount.explanation" = "Esta cuenta necesita ser migrada";
 "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.passwordExplanation" = "Para continuar con la migración, necesitás ingresar la contraseña que se utilizó para esta cuenta.";
+"migrateAccount.removeAccount" = "Eliminar cuenta";
+"migrateAccount.error" = "Falló la migración de tu cuenta. Podés volver a intentar o eliminar tu cuenta.";
+"migrateAccount.migrating" = "Migrando...";
 "migrateAccount.cancel" = "Cancelar";
-"migrateAccount.migrateAnother" = "Migrate Another Account";
+"migrateAccount.migrateAnother" = "Migrar otra cuenta";
 
 
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index 6a1a88e5de1f17c4091ffdc93d90d06507709687..a90d56f2d0b38177eb4471e5583c4d6d67e5358e 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -139,7 +139,7 @@
 "alerts.uploadPhoto" = "Upload photo or movie";
 
 //Actions
-"actions.blockAction" = "Block";
+"actions.blockAction" = "חסום";
 "actions.deleteAction" = "מחק";
 "actions.cancelAction" = "ביטול";
 "actions.clearAction" = "Clear";
@@ -262,7 +262,7 @@
 "dataTransfer.readableStatusCreated" = "Initializing…";
 "dataTransfer.readableStatusError" = "שגיאה";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "סרב";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.sendingFailed" = "Failed to send";
@@ -277,7 +277,7 @@
 "notifications.refuseCall" = "REFUSE";
 "notifications.newFile" = "New file";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "סרב";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index 072a277209468e61bb60823cd852ac7f0518085f..2d758b7c66c8af5f52992ee766d7aea62a345832 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -39,7 +39,7 @@
 "smartlist.searchBarPlaceholder" = "Enter name...";
 "smartlist.noNetworkConnectivity" = "Nicio legătură la rețea";
 "smartlist.cellularAccess" = "Asigură-te că accesul la rețea este permis în reglările tale";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "Conturi";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
@@ -54,8 +54,8 @@
 
 //Welcome Screen
 "welcome.title" = "Welcome to Jami !";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
-"welcome.linkDevice" = "Leagă acest dispozitiv la un cont";
+"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.createAccount" = "Creează un cont Jami";
 "welcome.connectToManager" = "Connect to account manager";
 
@@ -64,7 +64,7 @@
 "createProfile.profileCreated" = "Următorul";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
+"createProfile.enterNamePlaceholder" = "Introdu nume";
 "createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
 "createProfile.createYourAvatar" = "Create your avatar";
 
@@ -72,7 +72,7 @@
 "createAccount.createAccountFormTitle" = "Create your account";
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
 "createAccount.enterNewUsernamePlaceholder" = "Nume de Utilizator";
-"createAccount.newPasswordPlaceholder" = "Password";
+"createAccount.newPasswordPlaceholder" = "Parolă";
 "createAccount.repeatPasswordPlaceholder" = "Confirm password";
 "createAccount.passwordCharactersNumberError" = "6 caractere minim";
 "createAccount.passwordNotMatchingError" = "parolele nu se potrivesc";
@@ -86,27 +86,27 @@
 "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.Recommended" = "(Recommended)";
-"createAccount.UsernameNotRegisteredTitle" = "Network error";
+"createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "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" = "Se conectează contul";
-"linkToAccount.linkButtonTitle" = "Conectează dispozitivul";
-"linkToAccount.passwordPlaceholder" = "Password";
+"linkToAccount.linkButtonTitle" = "Conectează Dispozitivul";
+"linkToAccount.passwordPlaceholder" = "Parolă";
 "linkToAccount.pinPlaceholder" = "PIN";
 "linkToAccount.passwordLabel" = "Introdu Parola";
 "linkToAccount.pinLabel" = "Introdu PIN-ul";
-"linkToAccount.explanationPinMessage" = "Pentru crearea codului PIN, dute la reglările contului în dispozitivul care conține contul pe care vrei să-l folosești. În reglări alege \"Leagă alt dispozitiv la acest cont\" și vei obține PIN-ul necesar. Acest PIN este valabil doar 10 minute";
+"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.";
 
 //Link To Account Manager form
 "linkToAccountManager.signIn" = "Sign In";
-"linkToAccountManager.passwordPlaceholder" = "Password";
+"linkToAccountManager.passwordPlaceholder" = "Parolă";
 "linkToAccountManager.passwordLabel" = "Introdu Parola";
 "linkToAccountManager.usernamePlaceholder" = "Nume de Utilizator";
 "linkToAccountManager.usernameLabel" = "Enter Username";
-"linkToAccountManager.accountManagerPlaceholder" = "Account manager";
+"linkToAccountManager.accountManagerPlaceholder" = "Administrator cont";
 "linkToAccountManager.accountManagerLabel" = "Enter account manager URI";
 
 //Alerts
@@ -114,7 +114,7 @@
 "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" = "Cont Adăugat";
 "alerts.accountNoNetworkTitle" = "Nu mă pot conecta la rețea";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
+"alerts.accountNoNetworkMessage" = "Contul nu poate fi adăugat deoarece Jami nu se poate conecta la rețea. Verifică conectarea la rețea.";
 "alerts.accountDefaultErrorTitle" = "Eroare necunoscută";
 "alerts.accountDefaultErrorMessage" = "Contul nu a putut fi creat";
 "alerts.profileTakePhoto" = "Fă o poză";
@@ -144,7 +144,7 @@
 "actions.cancelAction" = "Renunță";
 "actions.clearAction" = "Clear";
 "actions.backAction" = "ÃŽnapoi";
-"actions.doneAction" = "Done";
+"actions.doneAction" = "Făcut";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
 "alerts.incomingCallButtonAccept" = "Acceptă";
 "alerts.incomingCallButtonIgnore" = "Ignore";
@@ -153,7 +153,7 @@
 
 //Calls
 "calls.callItemTitle" = "Call";
-"calls.unknown" = "Unknown";
+"calls.unknown" = "Necunoscut";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
@@ -169,7 +169,7 @@
 "accountPage.usernameNotRegistered" = "username: not registered";
 "accountPage.credentialsHeader" = "Account Details";
 "accountPage.enableProxy" = "Enable Proxy";
-"accountPage.blockedContacts" = "Blocked contacts";
+"accountPage.blockedContacts" = "Contacte blocate";
 "accountPage.unblockContact" = "UNBLOCK";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
 "accountPage.enableProxy" = "Enable Proxy";
@@ -179,9 +179,9 @@
 "accountPage.enableNotifications" = "Enable Notifications";
 "accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
 "accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
-"accountPage.revokeDeviceTitle" = "Revoke device";
+"accountPage.revokeDeviceTitle" = "Deconectează dispozitivul";
 "accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
-"accountPage.revokeDeviceButton" = "Revoke";
+"accountPage.revokeDeviceButton" = "Deconectează";
 "accountPage.revokeDevicePlaceholder" = "Enter your passord";
 "accountPage.deviceRevoked" = "Device revocation completed";
 "accountPage.deviceRevocationProgress" = "Revoking...";
@@ -191,23 +191,23 @@
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.namePlaceholder" = "Nume";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Conectează alt dispozitiv";
 "accountPage.other" = "Other";
-"accountPage.removeAccountTitle" = "Remove account";
+"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.";
 "accountPage.removeAccountButton" = "Remove";
 "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.registerNameTitle" = "Register a username";
-"accountPage.passwordPlaceholder" = "Enter account password";
+"accountPage.passwordPlaceholder" = "Introdu parola contului";
 "accountPage.usernamePlaceholder" = "Enter desired username";
 "accountPage.registerNameErrorMessage" = "Choosen username is not available";
 "accountPage.usernameRegistering" = "Registering";
-"accountPage.usernameRegisterAction" = "Register";
+"accountPage.usernameRegisterAction" = "ÃŽnscrie-te";
 "accountPage.usernameRegistrationFailed" = "Registration failed. Please check password.";
 "accountPage.createPassword" = "Create password";
-"accountPage.changePassword" = "Change password";
+"accountPage.changePassword" = "Schimbă parola";
 "accountPage.oldPasswordPlaceholder" = "Enter old password";
 "accountPage.newPasswordPlaceholder" = "Enter new password";
 "accountPage.newPasswordConfirmPlaceholder" = "Confirm new password";
@@ -220,9 +220,9 @@
 "accountPage.boothModeAlertMessage" = "After enabling booth mode all your conversations will be removed.";
 
 //Account
-"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
-"account.sipServer" = "SIP Server";
+"account.sipUsername" = "Nume de Utilizator";
+"account.sipPassword" = "Parolă";
+"account.sipServer" = "Server SIP";
 "account.port" = "Port";
 "account.proxyServer" = "Proxy";
 "account.createSipAccount" = "Create Sip Account";
@@ -232,10 +232,10 @@
 "account.portLabel" = "Enter Port Number";
 "account.accountStatus" = "Account Status";
 "account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
+"account.statusOnline" = "Conectat";
+"account.statusOffline" = "Deconectat";
 "account.statusConnecting" = "Se conectează";
-"account.statusUnknown" = "Unknown";
+"account.statusUnknown" = "Necunoscut";
 "account.statusConnectionerror" = "Connection Error";
 "account.needMigration" = "account need to be migrated";
 
@@ -264,7 +264,7 @@
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "Refuză";
 "dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
+"dataTransfer.readableStatusCanceled" = "Anulat";
 "dataTransfer.sendingFailed" = "Failed to send";
 "dataTransfer.readableStatusSuccess" = "Complete";
 "dataTransfer.readableStatusAccept" = "Acceptă";
@@ -279,11 +279,11 @@
 "dataTransfer.readableStatusAwaiting" = "Pending…";
 "dataTransfer.readableStatusRefuse" = "Refuză";
 "dataTransfer.readableStatusOngoing" = "Transferring";
-"dataTransfer.readableStatusCanceled" = "Canceled";
+"dataTransfer.readableStatusCanceled" = "Anulat";
 "dataTransfer.readableStatusSuccess" = "Complete";
 "dataTransfer.readableStatusAccept" = "Acceptă";
 "dataTransfer.readableStatusCancel" = "Renunță";
-"dataTransfer.infoMessage" = "Press to start recording";
+"dataTransfer.infoMessage" = "Apasă pentru a începe înregistrarea";
 "dataTransfer.sendMessage" = "Trimite";
 
 
@@ -301,12 +301,12 @@
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
-"migrateAccount.title" = "Account migration";
+"migrateAccount.title" = "Migrarea contului";
 "migrateAccount.migrateButton" = "Migrate Account";
 "migrateAccount.explanation" = "This account needs to be migrated";
-"migrateAccount.passwordPlaceholder" = "Enter password";
+"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" = "Remove account";
+"migrateAccount.removeAccount" = "Elimină contul";
 "migrateAccount.error" = "Failed to migrate your account. You can retry or delete your account.";
 "migrateAccount.migrating" = "Migrating...";
 "migrateAccount.cancel" = "Renunță";