diff --git a/Ring/Ring.xcodeproj/project.pbxproj b/Ring/Ring.xcodeproj/project.pbxproj
index a737cb9..258453e 100644
--- a/Ring/Ring.xcodeproj/project.pbxproj
+++ b/Ring/Ring.xcodeproj/project.pbxproj
@@ -2293,7 +2293,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = MSHYCBXK85;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2333,7 +2333,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2498,7 +2498,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Ring/Ring/Info.plist b/Ring/Ring/Info.plist
index 9bbd27b..6581c82 100644
--- a/Ring/Ring/Info.plist
+++ b/Ring/Ring/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.17</string>
+	<string>2.18</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>0</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 5f71a24..ed48da1 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -54,20 +54,20 @@
 //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" = "Link this device to an account";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.linkDevice" = "Yhdistä tämä laite tiliin";
+"welcome.createAccount" = "Tee Jami-tili";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Skip";
 "createProfile.profileCreated" = "Seuraava";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
+"createProfile.enterNamePlaceholder" = "Syötä nimesi";
 "createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
 "createProfile.createYourAvatar" = "Create your avatar";
 
 //Create Account form
-"createAccount.createAccountFormTitle" = "Create your account";
+"createAccount.createAccountFormTitle" = "Tee tilisi";
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
 "createAccount.enterNewUsernamePlaceholder" = "Käyttäjänimi";
 "createAccount.newPasswordPlaceholder" = "Salasana";
@@ -121,7 +121,7 @@
 "alerts.confirmClearConversationTitle" = "Clear Conversation";
 
 //Actions
-"actions.blockAction" = "Block";
+"actions.blockAction" = "Estä";
 "actions.deleteAction" = "Poista";
 "actions.cancelAction" = "Peruuta";
 "actions.clearAction" = "Clear";
@@ -238,12 +238,12 @@
 
 //Generated Message
 "generatedMessage.contactAdded" = "Yhteystieto lisätty";
-"generatedMessage.invitationReceived" = "Invitation received";
+"generatedMessage.invitationReceived" = "Kutsu vastaanotettu";
 "generatedMessage.invitationAccepted" = "Invitation accepted";
 "generatedMessage.outgoingCall" = "Lähtevä puhelu";
 "generatedMessage.incomingCall" = "Saapuva puhelu";
-"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
-"generatedMessage.missedIncomingCall" = "Missed incoming call";
+"generatedMessage.missedOutgoingCall" = "Vastaamaton lähtevä puhelu";
+"generatedMessage.missedIncomingCall" = "Vastaamaton puhelu";
 
 //General Settings
 "generalSettings.title" = "General settings";
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 710dfad..14a1759 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -31,14 +31,14 @@
 // Smartlist
 "smartlist.yesterday" = "Ieri";
 "smartlist.results" = "Search Result";
-"smartlist.conversations" = "Converzazioni";
-"smartlist.searching" = "Searching...";
-"smartlist.noResults" = "No results";
+"smartlist.conversations" = "Conversazioni";
+"smartlist.searching" = "Ricerca...";
+"smartlist.noResults" = "Nessun risultato";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
 "smartlist.noNetworkConnectivity" = "Connessione di rete assente";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "Account";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
@@ -58,7 +58,7 @@
 "welcome.createAccount" = "Crea un account Jami";
 
 //Creation Profile Screen
-"createProfile.skipCreateProfile" = "Skip";
+"createProfile.skipCreateProfile" = "Salta";
 "createProfile.profileCreated" = "Seguente";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
@@ -75,9 +75,9 @@
 "createAccount.passwordCharactersNumberError" = "6 caratteri minimo";
 "createAccount.passwordNotMatchingError" = "passwords do not match";
 "createAccount.lookingForUsernameAvailability" = "looking for availability…";
-"createAccount.invalidUsername" = "invalid username";
+"createAccount.invalidUsername" = "nome utente non valido";
 "createAccount.usernameAlreadyTaken" = "username already taken";
-"createAccount.loading" = "Loading";
+"createAccount.loading" = "Caricamento";
 "createAccount.waitCreateAccountTitle" = "Aggiunta account ";
 "createAccount.RegisterAUsername" = "Register a username";
 "createAccount.ChooseAPassword" = "Encrypt my account";
@@ -94,21 +94,21 @@
 "linkToAccount.linkButtonTitle" = "Link device";
 "linkToAccount.passwordPlaceholder" = "Password";
 "linkToAccount.pinPlaceholder" = "PIN";
-"linkToAccount.passwordLabel" = "Enter Password";
-"linkToAccount.pinLabel" = "Enter PIN";
+"linkToAccount.passwordLabel" = "Inserisci Password";
+"linkToAccount.pinLabel" = "Inserisci PIN";
 "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.";
 
 //Alerts
 "alerts.accountCannotBeFoundTitle" = "Can't find account";
 "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" = "Account Aggiunto";
 "alerts.accountNoNetworkTitle" = "Can't connect to the network";
 "alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
 "alerts.accountDefaultErrorTitle" = "Errore sconosciuto";
 "alerts.accountDefaultErrorMessage" = "The account couldn't be created.";
 "alerts.profileTakePhoto" = "Scattare una foto";
-"alerts.profileUploadPhoto" = "Upload photo";
-"alerts.profileCancelPhoto" = "Cancella";
+"alerts.profileUploadPhoto" = "Carica foto";
+"alerts.profileCancelPhoto" = "Annulla";
 "alerts.accountLinkedTitle" = "Linking account";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
 "alerts.dbFailedMessage" = "Please close application and try to open it again";
@@ -122,13 +122,13 @@
 
 //Actions
 "actions.blockAction" = "Blocca";
-"actions.deleteAction" = "Cancella";
-"actions.cancelAction" = "Cancella";
+"actions.deleteAction" = "Elimina";
+"actions.cancelAction" = "Annulla";
 "actions.clearAction" = "Clear";
 "actions.backAction" = "Indietro";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonAccept" = "Accettare";
-"alerts.incomingCallButtonIgnore" = "Ignore";
+"alerts.incomingCallButtonAccept" = "Accetta";
+"alerts.incomingCallButtonIgnore" = "Ignora";
 
 //Calls
 "calls.callItemTitle" = "Chiama";
@@ -182,7 +182,7 @@
 "account.proxyServer" = "Proxy";
 "account.createSipAccount" = "Create Sip Account";
 "account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
+"account.passwordLabel" = "Inserisci Password";
 "account.serverLabel" = "Enter Address";
 "account.portLabel" = "Enter Port Number";
 "account.accountStatus" = "Account Status";
@@ -220,8 +220,8 @@
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accettare";
-"dataTransfer.readableStatusCancel" = "Cancella";
+"dataTransfer.readableStatusAccept" = "Accetta";
+"dataTransfer.readableStatusCancel" = "Annulla";
 
 //Notifications
 "notifications.incomingCall" = "Incoming Call";
@@ -233,8 +233,8 @@
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accettare";
-"dataTransfer.readableStatusCancel" = "Cancella";
+"dataTransfer.readableStatusAccept" = "Accetta";
+"dataTransfer.readableStatusCancel" = "Annulla";
 
 //Generated Message
 "generatedMessage.contactAdded" = "Contatto aggiunto";
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index 720bff0..d2f6fe3 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -55,7 +55,7 @@
 "welcome.title" = "Welcome to Jami !";
 "welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
 "welcome.linkDevice" = "Lenk denne enheten til en konto";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.createAccount" = "Opprett en Jami-konto";
 
 //Creation Profile Screen
 "createProfile.skipCreateProfile" = "Hopp over";
@@ -82,7 +82,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" = "Varsler";
 "createAccount.Recommended" = "(Recommended)";
 "createAccount.UsernameNotRegisteredTitle" = "Nettverksfeil";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
@@ -135,7 +135,7 @@
 "calls.unknown" = "Ukjent";
 "calls.incomingCallInfo" = "ønsker å snakke med deg";
 "calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.connecting" = "Kobler opp...";
 "calls.searching" = "Searching…";
 "calls.callFinished" = "Samtale fullført";
 "calls.currentCallWith" = "Call with ";
@@ -169,7 +169,7 @@
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.namePlaceholder" = "Navn";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Koble til ny enhet";
 "accountPage.other" = "Andre";
 "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.";
@@ -246,6 +246,6 @@
 "generatedMessage.missedIncomingCall" = "Tapt innkommende anrop";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Generelt oppsett";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index cea048c..1c5bdc8 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -19,26 +19,26 @@
  */
 
 // Global
-"global.homeTabBarTitle" = "Home";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
-"global.ok" = "Ok";
+"global.homeTabBarTitle" = "ਮੁੱਖ ਪੰਨਾ";
+"global.contactRequestsTabBarTitle" = "ਸੱਦੇ";
+"global.meTabBarTitle" = "ਖਾਤਾ";
+"global.ok" = "ਠੀਕ ਹੈ";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
 "scan.search" = "Searching…";
 
 // Smartlist
-"smartlist.yesterday" = "Yesterday";
+"smartlist.yesterday" = "ਕੱਲ੍ਹ";
 "smartlist.results" = "Search Result";
-"smartlist.conversations" = "Conversations";
-"smartlist.searching" = "Searching...";
-"smartlist.noResults" = "No results";
+"smartlist.conversations" = "ਗੱਲਾਂਬਾਤਾਂ";
+"smartlist.searching" = "ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ...";
+"smartlist.noResults" = "ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
-"smartlist.noNetworkConnectivity" = "No network connectivity";
-"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.noNetworkConnectivity" = "ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ";
+"smartlist.cellularAccess" = "ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਸੈਲਿਊਲਰ ਪਹੁੰਚ ਦਿੱਤੀ ਹੋਵੇ";
+"smartlist.accountsTitle" = "ਖਾਤੇ";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
@@ -54,12 +54,12 @@
 //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" = "Link this device to an account";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.linkDevice" = "ਇਹ ਡੀਵਾਈਸ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕਰੋ";
+"welcome.createAccount" = "Jami ਖਾਤਾ ਬਣਾਓ";
 
 //Creation Profile Screen
-"createProfile.skipCreateProfile" = "Skip";
-"createProfile.profileCreated" = "Next";
+"createProfile.skipCreateProfile" = "ਲੰਘਾਓ";
+"createProfile.profileCreated" = "ਅੱਗੇ";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
 "createProfile.enterNamePlaceholder" = "Enter name";
@@ -69,49 +69,49 @@
 //Create Account form
 "createAccount.createAccountFormTitle" = "Create your account";
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
-"createAccount.enterNewUsernamePlaceholder" = "Username";
-"createAccount.newPasswordPlaceholder" = "Password";
+"createAccount.enterNewUsernamePlaceholder" = "ਵਰਤੋਂਕਾਰ ਨਾਂ";
+"createAccount.newPasswordPlaceholder" = "ਪਾਸਵਰਡ";
 "createAccount.repeatPasswordPlaceholder" = "Confirm password";
-"createAccount.passwordCharactersNumberError" = "6 characters minimum";
-"createAccount.passwordNotMatchingError" = "passwords do not match";
+"createAccount.passwordCharactersNumberError" = "ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰ-ਚਿੰਨ੍ਹ";
+"createAccount.passwordNotMatchingError" = "ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ";
 "createAccount.lookingForUsernameAvailability" = "looking for availability…";
-"createAccount.invalidUsername" = "invalid username";
-"createAccount.usernameAlreadyTaken" = "username already taken";
-"createAccount.loading" = "Loading";
-"createAccount.waitCreateAccountTitle" = "Adding account";
+"createAccount.invalidUsername" = "ਅਵੈਧ ਵਰਤੋਂਕਾਰ ਨਾਂ";
+"createAccount.usernameAlreadyTaken" = "ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ";
+"createAccount.loading" = "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
+"createAccount.waitCreateAccountTitle" = "ਖਾਤਾ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
 "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.UsernameNotRegisteredTitle" = "Network error";
+"createAccount.UsernameNotRegisteredTitle" = "ਨੈੱਟਵਰਕ ਗੜਬੜ";
 "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.passwordPlaceholder" = "Password";
-"linkToAccount.pinPlaceholder" = "PIN";
-"linkToAccount.passwordLabel" = "Enter Password";
-"linkToAccount.pinLabel" = "Enter PIN";
-"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.waitLinkToAccountTitle" = "ਖਾਤਾ ਲਿੰਕ ਕਰਨਾ";
+"linkToAccount.linkButtonTitle" = "ਡੀਵਾਈਸ ਲਿੰਕ ਕਰੋ";
+"linkToAccount.passwordPlaceholder" = "ਪਾਸਵਰਡ";
+"linkToAccount.pinPlaceholder" = "ਪਿੰਨ";
+"linkToAccount.passwordLabel" = "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ";
+"linkToAccount.pinLabel" = "ਪਿੰਨ ਦਾਖਲ ਕਰੋ";
+"linkToAccount.explanationPinMessage" = "ਪਿੰਨ ਕੋਡ ਸਿਰਜਣ ਲਈ, ਉਸ ਖਾਤੇ ਵਾਲੇ ਡੀਵਾਈਸ 'ਤੇ ਖਾਤਾ ਪ੍ਰਬੰਧਨ ਸੈਟਿੰਗਾਂ 'ਤੇ ਜਾਓ, ਜਿਸਨੂੰ ਤੁਸੀਂ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵਿੱਚ \"ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ ਨੂੰ ਇਸ ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕਰੋ\" ਨੂੰ ਚੁਣੋ। ਤੁਹਾਨੂੰ ਇਹ ਫਾਰਮ ਪੂਰਾ ਕਰਨ ਲਈ ਜ਼ਰੂਰੀ ਪਿੰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਪਿੰਨ ਸਿਰਫ਼ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।";
 
 //Alerts
-"alerts.accountCannotBeFoundTitle" = "Can't find account";
+"alerts.accountCannotBeFoundTitle" = "ਖਾਤਾ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ";
 "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.accountNoNetworkTitle" = "Can't connect to the network";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
-"alerts.accountDefaultErrorTitle" = "Unknown error";
-"alerts.accountDefaultErrorMessage" = "The account couldn't be created.";
-"alerts.profileTakePhoto" = "Take photo";
-"alerts.profileUploadPhoto" = "Upload photo";
-"alerts.profileCancelPhoto" = "Cancel";
-"alerts.accountLinkedTitle" = "Linking account";
+"alerts.accountAddedTitle" = "ਖਾਤਾ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ";
+"alerts.accountNoNetworkTitle" = "ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ";
+"alerts.accountNoNetworkMessage" = "ਖਾਤਾ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਕਿਉਂਕਿ Jami ਵੰਡਮਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕੀ। ਆਪਣੇ ਡੀਵਾਈਸ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ।";
+"alerts.accountDefaultErrorTitle" = "ਅਣਪਛਾਤੀ ਗੜਬੜ";
+"alerts.accountDefaultErrorMessage" = "ਖਾਤਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।";
+"alerts.profileTakePhoto" = "ਫ਼ੋਟੋ ਖਿੱਚੋ";
+"alerts.profileUploadPhoto" = "ਫ਼ੋਟੋ ਅੱਪਲੋਡ ਕਰੋ";
+"alerts.profileCancelPhoto" = "ਰੱਦ ਕਰੋ";
+"alerts.accountLinkedTitle" = "ਖਾਤਾ ਲਿੰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
-"alerts.dbFailedMessage" = "Please close application and try to open it again";
+"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" = "Block Contact";
 "alerts.confirmDeleteConversation" = "Are you sure you want to delete this conversation permanently?";
@@ -121,18 +121,18 @@
 "alerts.confirmClearConversationTitle" = "Clear Conversation";
 
 //Actions
-"actions.blockAction" = "Block";
+"actions.blockAction" = "ਬਲਾਕ ਕਰੋ";
 "actions.deleteAction" = "ਮਿਟਾਓ";
-"actions.cancelAction" = "Cancel";
+"actions.cancelAction" = "ਰੱਦ ਕਰੋ";
 "actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "ਪਿੱਛੇ";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonAccept" = "Accept";
+"alerts.incomingCallButtonAccept" = "ਮਨਜ਼ੂਰ ਕਰੋ";
 "alerts.incomingCallButtonIgnore" = "Ignore";
 
 //Calls
 "calls.callItemTitle" = "Call";
-"calls.unknown" = "Unknown";
+"calls.unknown" = "ਅਣਪਛਾਤਾ";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
@@ -141,8 +141,8 @@
 "calls.currentCallWith" = "Call with ";
 
 //Account Page
-"accountPage.devicesListHeader" = "Devices";
-"accountPage.settingsHeader" = "ਸੈਟਿੰਗ";
+"accountPage.devicesListHeader" = "ਡੀਵਾਈਸ";
+"accountPage.settingsHeader" = "ਸੈਟਿੰਗਾਂ";
 "accountPage.username" = "username:";
 "accountPage.usernameNotRegistered" = "username: not registered";
 "accountPage.credentialsHeader" = "Account Details";
@@ -157,7 +157,7 @@
 "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" = "ਡੀਵਾਈਸ ਹਟਾਓ";
 "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";
@@ -168,29 +168,29 @@
 "accountPage.deviceRevocationWrongPassword" = "Incorrect password";
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
 "accountPage.deviceRevocationError" = "Device revocation error";
-"accountPage.namePlaceholder" = "Name";
+"accountPage.namePlaceholder" = "ਨਾਂ";
 "accountPage.linkDeviceTitle" = "Link another device";
-"accountPage.other" = "Other";
+"accountPage.other" = "ਹੋਰ";
 "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.removeAccountButton" = "Remove";
 //Account
 "account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipPassword" = "ਪਾਸਵਰਡ";
 "account.sipServer" = "SIP Server";
 "account.port" = "Port";
-"account.proxyServer" = "Proxy";
+"account.proxyServer" = "ਪ੍ਰੌਕਸੀ";
 "account.createSipAccount" = "Create Sip Account";
 "account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
+"account.passwordLabel" = "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ";
 "account.serverLabel" = "Enter Address";
 "account.portLabel" = "Enter Port Number";
 "account.accountStatus" = "Account Status";
 "account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusOnline" = "ਆਨਲਾਈਨ";
+"account.statusOffline" = "ਆਫ਼ਲਾਈਨ";
+"account.statusConnecting" = "ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
+"account.statusUnknown" = "ਅਣਪਛਾਤਾ";
 "account.statusConnectionerror" = "Connection Error";
 
 //Block List Page
@@ -198,11 +198,11 @@
 
 //Link New Device
 "linkDevice.title" = "Link a new device";
-"linkDevice.passwordError" = "The password you entered does not unlock this account";
-"linkDevice.networkError" = "A network error occured during the export";
-"linkDevice.defaultError" = "An error occured during the export";
+"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.hudMessage" = "Verifying";
+"linkDevice.hudMessage" = "ਪੁਸ਼ਟੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ";
 
 //Contact Page
 "contactPage.startAudioCall" = "Start Audio Call";
@@ -214,14 +214,14 @@
 
 //DataTransfer
 "dataTransfer.readableStatusCreated" = "Initializing…";
-"dataTransfer.readableStatusError" = "Error";
+"dataTransfer.readableStatusError" = "ਗੜਬੜ";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "ਨਾ-ਮਨਜ਼ੂਰ ਕਰੋ";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accept";
-"dataTransfer.readableStatusCancel" = "Cancel";
+"dataTransfer.readableStatusAccept" = "ਮਨਜ਼ੂਰ ਕਰੋ";
+"dataTransfer.readableStatusCancel" = "ਰੱਦ ਕਰੋ";
 
 //Notifications
 "notifications.incomingCall" = "Incoming Call";
@@ -229,21 +229,21 @@
 "notifications.acceptCall" = "ACCEPT";
 "notifications.refuseCall" = "REFUSE";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "ਨਾ-ਮਨਜ਼ੂਰ ਕਰੋ";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accept";
-"dataTransfer.readableStatusCancel" = "Cancel";
+"dataTransfer.readableStatusAccept" = "ਮਨਜ਼ੂਰ ਕਰੋ";
+"dataTransfer.readableStatusCancel" = "ਰੱਦ ਕਰੋ";
 
 //Generated Message
-"generatedMessage.contactAdded" = "Contact added";
-"generatedMessage.invitationReceived" = "Invitation received";
+"generatedMessage.contactAdded" = "ਸੰਪਰਕ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ";
+"generatedMessage.invitationReceived" = "ਸੱਦਾ ਮਿਲਿਆ";
 "generatedMessage.invitationAccepted" = "Invitation accepted";
-"generatedMessage.outgoingCall" = "Outgoing call";
-"generatedMessage.incomingCall" = "Incoming call";
-"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
-"generatedMessage.missedIncomingCall" = "Missed incoming call";
+"generatedMessage.outgoingCall" = "ਜਾਂਦੀ ਕਾਲ";
+"generatedMessage.incomingCall" = "ਆਉਂਦੀ ਕਾਲ";
+"generatedMessage.missedOutgoingCall" = "ਖੁੰਝੀ ਜਾਂਦੀ ਕਾਲ";
+"generatedMessage.missedIncomingCall" = "ਖੁੰਝੀ ਆਉਂਦੀ ਕਾਲ";
 
 //General Settings
 "generalSettings.title" = "General settings";
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 3198fed..d648964 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -20,25 +20,25 @@
 
 // Global
 "global.homeTabBarTitle" = "Domov";
-"global.contactRequestsTabBarTitle" = "Invitations";
+"global.contactRequestsTabBarTitle" = "Pozvánky";
 "global.meTabBarTitle" = "Účet";
-"global.ok" = "Ok";
+"global.ok" = "OK";
 
 // Scan
-"scan.badQrCode" = "Bad QR code";
+"scan.badQrCode" = "Zlý QR kód";
 "scan.search" = "Searching…";
 
 // Smartlist
 "smartlist.yesterday" = "Včera";
 "smartlist.results" = "Search Result";
-"smartlist.conversations" = "Conversations";
-"smartlist.searching" = "Searching...";
-"smartlist.noResults" = "No results";
+"smartlist.conversations" = "Konverzácie";
+"smartlist.searching" = "Hľadanie...";
+"smartlist.noResults" = "Žiadne výsledky";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
 "smartlist.noNetworkConnectivity" = "Žiadne sieťové pripojenie";
-"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Nastavenie účtov";
+"smartlist.cellularAccess" = "Uistite, že v nastaveniach je povolený prístup k mobilnej sieti";
+"smartlist.accountsTitle" = "Účty";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
@@ -53,65 +53,65 @@
 
 //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" = "Link this device to an account";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.text" = "Jami je slobodná a univerzálna komunikačná platforma, ktorá zachováva súkromie a slobody používateľov.";
+"welcome.linkDevice" = "Prepojiť toto zariadenie s účtom";
+"welcome.createAccount" = "Vytvoriť Jami účet";
 
 //Creation Profile Screen
-"createProfile.skipCreateProfile" = "Skip";
+"createProfile.skipCreateProfile" = "Preskočiť";
 "createProfile.profileCreated" = "Ďalej";
 "createProfile.title" = "Personalise your profile";
 "createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
+"createProfile.enterNamePlaceholder" = "Zadajte meno";
 "createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
 "createProfile.createYourAvatar" = "Create your avatar";
 
 //Create Account form
-"createAccount.createAccountFormTitle" = "Create your account";
+"createAccount.createAccountFormTitle" = "Vytvoriť váš účet";
 "createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
-"createAccount.enterNewUsernamePlaceholder" = "Username";
-"createAccount.newPasswordPlaceholder" = "Password";
-"createAccount.repeatPasswordPlaceholder" = "Confirm password";
-"createAccount.passwordCharactersNumberError" = "6 characters minimum";
-"createAccount.passwordNotMatchingError" = "passwords do not match";
+"createAccount.enterNewUsernamePlaceholder" = "Používateľské meno";
+"createAccount.newPasswordPlaceholder" = "Heslo";
+"createAccount.repeatPasswordPlaceholder" = "Potvrďte heslo";
+"createAccount.passwordCharactersNumberError" = "Minimálne 6 znakov";
+"createAccount.passwordNotMatchingError" = "heslá sa nezhodujú";
 "createAccount.lookingForUsernameAvailability" = "looking for availability…";
-"createAccount.invalidUsername" = "invalid username";
-"createAccount.usernameAlreadyTaken" = "username already taken";
-"createAccount.loading" = "Loading";
-"createAccount.waitCreateAccountTitle" = "Adding account";
-"createAccount.RegisterAUsername" = "Register a username";
+"createAccount.invalidUsername" = "neplatné používateľské meno";
+"createAccount.usernameAlreadyTaken" = "používateľské meno je už zabraté";
+"createAccount.loading" = "Načítavanie";
+"createAccount.waitCreateAccountTitle" = "Pridávanie účtu";
+"createAccount.RegisterAUsername" = "Registrovať používateľské meno";
 "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" = "Notifikácie";
 "createAccount.Recommended" = "(Recommended)";
-"createAccount.UsernameNotRegisteredTitle" = "Network error";
-"createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
+"createAccount.UsernameNotRegisteredTitle" = "Chyba siete";
+"createAccount.UsernameNotRegisteredMessage" = "Účet bol vytvorený, ale používateľské meno nebolo zaregistrované";
 "createAccount.timeoutTitle" = "Account Created";
-"createAccount.timeoutMessage" = "Username registration in progress... It could take a few moments.";
+"createAccount.timeoutMessage" = "Prebieha registrácia používateľského mena... Chvíľu to potrvá.";
 
 //Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "Link device";
-"linkToAccount.passwordPlaceholder" = "Password";
+"linkToAccount.waitLinkToAccountTitle" = "Prepájanie účtu";
+"linkToAccount.linkButtonTitle" = "Prepájanie zariadenia";
+"linkToAccount.passwordPlaceholder" = "Heslo";
 "linkToAccount.pinPlaceholder" = "PIN";
-"linkToAccount.passwordLabel" = "Enter Password";
-"linkToAccount.pinLabel" = "Zadaj PIN";
-"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.passwordLabel" = "Zadajte heslo";
+"linkToAccount.pinLabel" = "Zadajte PIN";
+"linkToAccount.explanationPinMessage" = "Pre vygenerovanie PIN kódu musíte ísť do nastavení účtu na zariadení, ktoré už obsahuje účet, ktorý chcete použiť. Zvoľte \"Prepojiť ďalšie zariadenie s týmto účtom\". Potom obdržíte PIN potrebný na vyplnenie tohto formulára. PIN je platný 10 minút.";
 
 //Alerts
-"alerts.accountCannotBeFoundTitle" = "Can't find account";
+"alerts.accountCannotBeFoundTitle" = "Účet sa nedá nájsť";
 "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.accountNoNetworkTitle" = "Can't connect to the network";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
-"alerts.accountDefaultErrorTitle" = "Unknown error";
-"alerts.accountDefaultErrorMessage" = "The account couldn't be created.";
-"alerts.profileTakePhoto" = "Take photo";
-"alerts.profileUploadPhoto" = "Upload photo";
-"alerts.profileCancelPhoto" = "Zruš";
-"alerts.accountLinkedTitle" = "Linking account";
+"alerts.accountAddedTitle" = "Účet pridaný";
+"alerts.accountNoNetworkTitle" = "Nedá sa pripojiť ku sieti";
+"alerts.accountNoNetworkMessage" = "Účet sa nedal pridať, pretože Jami sa nedokázal pripojiť k distribuovanej sieti. Skontrolujte pripojenie vášho zariadenia.";
+"alerts.accountDefaultErrorTitle" = "Neznáma chyba";
+"alerts.accountDefaultErrorMessage" = "Účet nemohol byť vytvorený.";
+"alerts.profileTakePhoto" = "Urobiť fotografiu";
+"alerts.profileUploadPhoto" = "Nahrať fotografiu";
+"alerts.profileCancelPhoto" = "Zrušiť";
+"alerts.accountLinkedTitle" = "Prepájanie účtu";
 "alerts.dbFailedTitle" = "An error happned when launching Jami";
-"alerts.dbFailedMessage" = "Please close application and try to open it again";
+"alerts.dbFailedMessage" = "Zavrite a znovu otvorte aplikáciu";
 "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?";
@@ -121,45 +121,45 @@
 "alerts.confirmClearConversationTitle" = "Clear Conversation";
 
 //Actions
-"actions.blockAction" = "Block";
-"actions.deleteAction" = "Vymaž";
-"actions.cancelAction" = "Zruš";
+"actions.blockAction" = "Blokovať";
+"actions.deleteAction" = "Vymazať";
+"actions.cancelAction" = "Zrušiť";
 "actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Späť";
 "alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonAccept" = "Accept";
-"alerts.incomingCallButtonIgnore" = "Ignore";
+"alerts.incomingCallButtonAccept" = "Prijať";
+"alerts.incomingCallButtonIgnore" = "Ignorovať";
 
 //Calls
-"calls.callItemTitle" = "Volaj";
+"calls.callItemTitle" = "Volať";
 "calls.unknown" = "Neznámy";
 "calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.connecting" = "Pripájanie...";
 "calls.searching" = "Searching…";
 "calls.callFinished" = "Call finished";
 "calls.currentCallWith" = "Call with ";
 
 //Account Page
 "accountPage.devicesListHeader" = "Zariadenia";
-"accountPage.settingsHeader" = "Nastavenie";
-"accountPage.username" = "username:";
-"accountPage.usernameNotRegistered" = "username: not registered";
+"accountPage.settingsHeader" = "Nastavenia";
+"accountPage.username" = "používateľské meno:";
+"accountPage.usernameNotRegistered" = "používateľské meno: nezaregistrované";
 "accountPage.credentialsHeader" = "Account Details";
-"accountPage.enableProxy" = "Enable Proxy";
+"accountPage.enableProxy" = "Povoliť proxy";
 "accountPage.blockedContacts" = "Block List";
 "accountPage.unblockContact" = "UNBLOCK";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
-"accountPage.enableProxy" = "Enable Proxy";
+"accountPage.enableProxy" = "Povoliť 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.revokeDeviceTitle" = "Revoke device";
+"accountPage.revokeDeviceTitle" = "Odobrať zariadenie";
 "accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
-"accountPage.revokeDeviceButton" = "Revoke";
+"accountPage.revokeDeviceButton" = "Odobrať";
 "accountPage.revokeDevicePlaceholder" = "Enter your passord";
 "accountPage.deviceRevoked" = "Device revocation completed";
 "accountPage.deviceRevocationProgress" = "Revoking...";
@@ -167,29 +167,29 @@
 "accountPage.deviceRevocationTryAgain" = "Try again";
 "accountPage.deviceRevocationWrongPassword" = "Incorrect password";
 "accountPage.deviceRevocationUnknownDevice" = "Unknown device";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.deviceRevocationError" = "Chyba odstraňovania zariadenia";
 "accountPage.namePlaceholder" = "Meno";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Prepojiť ďalšie zariadenie";
 "accountPage.other" = "Iné";
 "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.removeAccountButton" = "Remove";
+"accountPage.removeAccountButton" = "Odstrániť";
 //Account
-"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipUsername" = "Používateľské meno";
+"account.sipPassword" = "Heslo";
 "account.sipServer" = "SIP Server";
 "account.port" = "Port";
 "account.proxyServer" = "Proxy";
 "account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
+"account.usernameLabel" = "Zadajte používateľské meno";
+"account.passwordLabel" = "Zadajte heslo";
 "account.serverLabel" = "Enter Address";
 "account.portLabel" = "Enter Port Number";
 "account.accountStatus" = "Account Status";
 "account.enableAccount" = "Enable Account";
 "account.statusOnline" = "Online";
 "account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
+"account.statusConnecting" = "Pripájanie";
 "account.statusUnknown" = "Neznámy";
 "account.statusConnectionerror" = "Connection Error";
 
@@ -198,11 +198,11 @@
 
 //Link New Device
 "linkDevice.title" = "Link a new device";
-"linkDevice.passwordError" = "The password you entered does not unlock this account";
-"linkDevice.networkError" = "A network error occured during the export";
-"linkDevice.defaultError" = "An error occured during the export";
+"linkDevice.passwordError" = "Heslo, ktoré ste zadali, neodomyká tento účet";
+"linkDevice.networkError" = "Počas exportu sa vyskytla chyba siete";
+"linkDevice.defaultError" = "Počas exportu sa vyskytla chyba";
 "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" = "Overovanie";
 
 //Contact Page
 "contactPage.startAudioCall" = "Start Audio Call";
@@ -213,15 +213,15 @@
 "contactPage.removeConversation" = "Remove Conversation";
 
 //DataTransfer
-"dataTransfer.readableStatusCreated" = "Initializing…";
+"dataTransfer.readableStatusCreated" = "Inicializácia...";
 "dataTransfer.readableStatusError" = "Chyba";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "Odmietnuť";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accept";
-"dataTransfer.readableStatusCancel" = "Zruš";
+"dataTransfer.readableStatusAccept" = "Prijať";
+"dataTransfer.readableStatusCancel" = "Zrušiť";
 
 //Notifications
 "notifications.incomingCall" = "Incoming Call";
@@ -229,23 +229,23 @@
 "notifications.acceptCall" = "ACCEPT";
 "notifications.refuseCall" = "REFUSE";
 "dataTransfer.readableStatusAwaiting" = "Pending…";
-"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusRefuse" = "Odmietnuť";
 "dataTransfer.readableStatusOngoing" = "Transferring";
 "dataTransfer.readableStatusCanceled" = "Canceled";
 "dataTransfer.readableStatusSuccess" = "Complete";
-"dataTransfer.readableStatusAccept" = "Accept";
-"dataTransfer.readableStatusCancel" = "Zruš";
+"dataTransfer.readableStatusAccept" = "Prijať";
+"dataTransfer.readableStatusCancel" = "Zrušiť";
 
 //Generated Message
-"generatedMessage.contactAdded" = "Contact added";
-"generatedMessage.invitationReceived" = "Invitation received";
-"generatedMessage.invitationAccepted" = "Invitation accepted";
-"generatedMessage.outgoingCall" = "Outgoing call";
-"generatedMessage.incomingCall" = "Incoming call";
-"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
-"generatedMessage.missedIncomingCall" = "Missed incoming call";
+"generatedMessage.contactAdded" = "Kontakt pridaný";
+"generatedMessage.invitationReceived" = "Bola prijatá pozvánka";
+"generatedMessage.invitationAccepted" = "Pozvánka prijatá";
+"generatedMessage.outgoingCall" = "Odchádzajúci hovor";
+"generatedMessage.incomingCall" = "Prichádzajúci hovor";
+"generatedMessage.missedOutgoingCall" = "Zmeškaný odchádzajúci hovory";
+"generatedMessage.missedIncomingCall" = "Zmeškaný príchodzí hovor";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Všeobecné nastavenia";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index 360aa27..94b084d 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -20,7 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "主页";
-"global.contactRequestsTabBarTitle" = "Invitations";
+"global.contactRequestsTabBarTitle" = "邀请";
 "global.meTabBarTitle" = "帐户";
 "global.ok" = "确定";
 
@@ -33,7 +33,7 @@
 "smartlist.results" = "Search Result";
 "smartlist.conversations" = "会话";
 "smartlist.searching" = "正在搜索…";
-"smartlist.noResults" = "No results";
+"smartlist.noResults" = "无结果";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
 "smartlist.noNetworkConnectivity" = "无网络连接";