i18n: update translations

Change-Id: I12d7b5984645f6def242f89e963b2a69a143cf59
Reviewed-by: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
diff --git a/ui/Base.lproj/RingWizardLinkAccount.strings b/ui/Base.lproj/RingWizardLinkAccount.strings
index b1ee701..e826b2b 100644
--- a/ui/Base.lproj/RingWizardLinkAccount.strings
+++ b/ui/Base.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Next";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancel";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancel";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancel";
diff --git a/ui/ar.lproj/Localizable.strings b/ui/ar.lproj/Localizable.strings
index 252f106..ac8792b 100644
--- a/ui/ar.lproj/Localizable.strings
+++ b/ui/ar.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "مكالمة قادمة من %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "مشاركة";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/ar.lproj/RingWizardLinkAccount.strings b/ui/ar.lproj/RingWizardLinkAccount.strings
index 28c86c6..c550308 100644
--- a/ui/ar.lproj/RingWizardLinkAccount.strings
+++ b/ui/ar.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "ألغِ";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "التالي";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "الرجاء الإنتظار لحظة...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "ألغِ";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "ألغِ";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "ألغِ";
diff --git a/ui/ar.lproj/RingWizardNewAccount.strings b/ui/ar.lproj/RingWizardNewAccount.strings
index 4571b21..d59c702 100644
--- a/ui/ar.lproj/RingWizardNewAccount.strings
+++ b/ui/ar.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "اختر اسم مستخدمك";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "ألغِ";
diff --git a/ui/bg.lproj/AccAdvanced.strings b/ui/bg.lproj/AccAdvanced.strings
index 33d1ed2..6504ada 100644
--- a/ui/bg.lproj/AccAdvanced.strings
+++ b/ui/bg.lproj/AccAdvanced.strings
@@ -3,10 +3,10 @@
 "0eY-9x-bAr.placeholderString" = "Адрес на сървъра…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
-"6u9-cM-ep0.placeholderString" = "realm...";
+"6u9-cM-ep0.placeholderString" = "област…";
 
 /* Class = "NSButtonCell"; title = "Same as local parameters"; ObjectID = "Atv-t7-5YJ"; */
-"Atv-t7-5YJ.title" = "Same as local parameters";
+"Atv-t7-5YJ.title" = "Използване на местните параметри";
 
 /* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "FQ4-fp-Pxj"; */
 "FQ4-fp-Pxj.title" = "Минимум";
diff --git a/ui/bg.lproj/AccRing.strings b/ui/bg.lproj/AccRing.strings
index bead776..2733ced 100644
--- a/ui/bg.lproj/AccRing.strings
+++ b/ui/bg.lproj/AccRing.strings
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "Права";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Регистриране на име";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Име или псевдоним…";
diff --git a/ui/bg.lproj/Accounts.strings b/ui/bg.lproj/Accounts.strings
index 7f43984..de1a348 100644
--- a/ui/bg.lproj/Accounts.strings
+++ b/ui/bg.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Име";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Устройства";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Състояние";
diff --git a/ui/bg.lproj/ExportPasswordWindow.strings b/ui/bg.lproj/ExportPasswordWindow.strings
index ff692d2..3c0ae97 100644
--- a/ui/bg.lproj/ExportPasswordWindow.strings
+++ b/ui/bg.lproj/ExportPasswordWindow.strings
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Парола";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Свързване на друго устройство с този акаунт";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Парола…";
diff --git a/ui/bg.lproj/Localizable.strings b/ui/bg.lproj/Localizable.strings
index 0707a1e..5ec5a2f 100644
--- a/ui/bg.lproj/Localizable.strings
+++ b/ui/bg.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Входящо обаждане от %@";
 
@@ -86,7 +83,7 @@
 "Password is too short" = "Password is too short";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Паролите не съвпадат.";
 
 /* Button label */
 "Pause" = "Пауза";
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Споделяне";
 
@@ -116,13 +116,13 @@
 "Text Actions" = "Текстови действия";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Въведеното потребителско име е свободно";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Въведеното потребителско име не е свободно";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
diff --git a/ui/bg.lproj/RegisterNameWindow.strings b/ui/bg.lproj/RegisterNameWindow.strings
index a708fc6..7433548 100644
--- a/ui/bg.lproj/RegisterNameWindow.strings
+++ b/ui/bg.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Задължително*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Останалите могат да го използват вместо идентификатора Ви за Ring";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Възникна грешка при регистрацията на потребителското Ви име";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Въведете паролата за акаунта си в Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Прозорец";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Един момент…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Потребителско име…";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Отказ";
diff --git a/ui/bg.lproj/RingWizardChoose.strings b/ui/bg.lproj/RingWizardChoose.strings
index 5c0a029..e836988 100644
--- a/ui/bg.lproj/RingWizardChoose.strings
+++ b/ui/bg.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Отказ";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Свържете това устройство с акаунт";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Създаване на акаунт за Ring";
diff --git a/ui/bg.lproj/RingWizardLinkAccount.strings b/ui/bg.lproj/RingWizardLinkAccount.strings
index 8ff45f7..214a538 100644
--- a/ui/bg.lproj/RingWizardLinkAccount.strings
+++ b/ui/bg.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отказ";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Напред";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Един момент…";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Отказ";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Въведете паролата за акаунта си в Ring";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Отказ";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Отказ";
diff --git a/ui/bg.lproj/RingWizardNewAccount.strings b/ui/bg.lproj/RingWizardNewAccount.strings
index a4677c9..70d1d94 100644
--- a/ui/bg.lproj/RingWizardNewAccount.strings
+++ b/ui/bg.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Задължително*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Въведете парола";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Задължително*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Един момент…";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Повторете паролата";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
+"gEy-ak-Cgq.placeholderString" = "„Неизвестно“, ако е празно";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Изберете потребителско име";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Отказ";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Паролата трябва да бъде поне 6 знака. Тя ще бъде използвана за шифроване на данните на акаунта Ви, както и за свързване на нови устройства към акаунта.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Създаване";
diff --git a/ui/cs_CZ.lproj/AccAdvanced.strings b/ui/cs_CZ.lproj/AccAdvanced.strings
index 825defe..03142eb 100644
--- a/ui/cs_CZ.lproj/AccAdvanced.strings
+++ b/ui/cs_CZ.lproj/AccAdvanced.strings
@@ -1,9 +1,9 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "0eY-9x-bAr"; */
-"0eY-9x-bAr.placeholderString" = "Server url...";
+"0eY-9x-bAr.placeholderString" = "Adresa (URL) serveru...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
-"6u9-cM-ep0.placeholderString" = "realm...";
+"6u9-cM-ep0.placeholderString" = "Oblast...";
 
 /* Class = "NSButtonCell"; title = "Same as local parameters"; ObjectID = "Atv-t7-5YJ"; */
 "Atv-t7-5YJ.title" = "Stejné jako místní parametry";
@@ -12,28 +12,28 @@
 "FQ4-fp-Pxj.title" = "Min";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Jho-hi-Mvg"; */
-"Jho-hi-Mvg.title" = "Audio RTP port Range";
+"Jho-hi-Mvg.title" = "Rozsah portů pro zvuk RTP";
 
 /* Class = "NSTextFieldCell"; title = "Network Interface"; ObjectID = "K9I-vh-jeu"; */
 "K9I-vh-jeu.title" = "Síťové rozhraní";
 
 /* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
-"OL5-DI-aCq.title" = "Set published address and port";
+"OL5-DI-aCq.title" = "Zadat veřejnou adresu a port";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
-"OR2-la-DUE.placeholderString" = "password...";
+"OR2-la-DUE.placeholderString" = "Heslo…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "username..."; ObjectID = "P7k-xH-2mr"; */
-"P7k-xH-2mr.placeholderString" = "username...";
+"P7k-xH-2mr.placeholderString" = "Uživatelské jméno…";
 
 /* Class = "NSButtonCell"; title = "Using TURN"; ObjectID = "QS0-TJ-NQh"; */
-"QS0-TJ-NQh.title" = "Using TURN";
+"QS0-TJ-NQh.title" = "Použít TURN";
 
 /* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
 "Qf3-E3-5U6.title" = "Zveřejněná Adresa";
 
 /* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
-"XA8-Sy-CYG.title" = "Video RTP port Range";
+"XA8-Sy-CYG.title" = "Rozsah portů pro obraz RTP";
 
 /* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "a6W-wm-OmC"; */
 "a6W-wm-OmC.title" = "Min";
@@ -42,13 +42,13 @@
 "dbq-qU-93x.title" = "Max";
 
 /* Class = "NSButtonCell"; title = "Radio"; ObjectID = "fB0-X8-GXk"; */
-"fB0-X8-GXk.title" = "Radio";
+"fB0-X8-GXk.title" = "Rádio";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire"; ObjectID = "fCd-4d-sP0"; */
-"fCd-4d-sP0.title" = "Registration expire";
+"fCd-4d-sP0.title" = "Vypršení registrace";
 
 /* Class = "NSButtonCell"; title = "Using STUN"; ObjectID = "gVd-Dw-1B4"; */
-"gVd-Dw-1B4.title" = "Using STUN";
+"gVd-Dw-1B4.title" = "Použít STUN";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "oa2-Pe-6Uw"; */
 "oa2-Pe-6Uw.title" = "Max";
@@ -57,16 +57,16 @@
 "sTk-1C-1KO.title" = "Adresa";
 
 /* Class = "NSTextFieldCell"; title = "Local port"; ObjectID = "shs-Xm-qnY"; */
-"shs-Xm-qnY.title" = "Local port";
+"shs-Xm-qnY.title" = "Místní port";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
-"uzg-09-8vi.placeholderString" = "Server url...";
+"uzg-09-8vi.placeholderString" = "Adresa (URL) serveru...";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "wl8-YK-M76"; */
 "wl8-YK-M76.title" = "Port";
 
 /* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "xGw-j0-4ID"; */
-"xGw-j0-4ID.title" = "seconds";
+"xGw-j0-4ID.title" = "sekund";
 
 /* Class = "NSTextFieldCell"; title = "Registration"; ObjectID = "yB5-ET-gBL"; */
 "yB5-ET-gBL.title" = "Registrace";
diff --git a/ui/cs_CZ.lproj/AccGeneral.strings b/ui/cs_CZ.lproj/AccGeneral.strings
index 5a34a67..e186524 100644
--- a/ui/cs_CZ.lproj/AccGeneral.strings
+++ b/ui/cs_CZ.lproj/AccGeneral.strings
@@ -3,22 +3,22 @@
 "0D8-im-2uM.title" = "RTP";
 
 /* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
-"21g-eQ-0Sc.title" = "Try Registration";
+"21g-eQ-0Sc.title" = "Vyzkoušet registraci";
 
 /* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
-"3uy-g0-eCm.title" = "Server hostname";
+"3uy-g0-eCm.title" = "Hostitelské jméno serveru";
 
 /* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
 "4Nm-hw-379.title" = "Uživatelské jméno";
 
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
-"KSm-ZB-4aj.title" = "Use custom user-agent";
+"KSm-ZB-4aj.title" = "Použít vlastního uživatelského agenta";
 
 /* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
 "Mxv-Rt-ON6.title" = "Přezdívka";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
-"N5h-tI-ZLz.title" = "Upnp enabled";
+"N5h-tI-ZLz.title" = "UPnP povoleno";
 
 /* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
 "Rg8-qR-h1X.title" = "Druh tónové volby";
diff --git a/ui/cs_CZ.lproj/AccMedia.strings b/ui/cs_CZ.lproj/AccMedia.strings
index e2db009..402cf40 100644
--- a/ui/cs_CZ.lproj/AccMedia.strings
+++ b/ui/cs_CZ.lproj/AccMedia.strings
@@ -6,13 +6,13 @@
 "CO7-VF-04Q.title" = "Nahoru";
 
 /* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Enable ringtones";
+"KkI-i1-mfY.title" = "Povolit vyzváněcí tóny";
 
 /* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
 "MbZ-7X-K5I.title" = "Nahoru";
 
 /* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
-"OSC-eG-2kt.title" = "Obraz";
+"OSC-eG-2kt.title" = "Video";
 
 /* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
 "aMg-uJ-Krx.title" = "Vyzvánění";
@@ -21,10 +21,10 @@
 "biN-bX-qM1.title" = "Kodeky";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
-"dwG-Ro-bIS.placeholderString" = "Frequency";
+"dwG-Ro-bIS.placeholderString" = "Frekvence";
 
 /* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
-"dwG-Ro-bIS.title" = "details";
+"dwG-Ro-bIS.title" = "Podrobnosti";
 
 /* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
 "gzX-Wc-S6g.title" = "Zvuk";
@@ -39,7 +39,7 @@
 "pvl-9U-X4l.placeholderString" = "Jméno";
 
 /* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
-"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
+"rRr-la-G9L.title" = "Kodeky se používají, když se s někým zahajuje komunikace. Můžete je zapínat a měnit pořadí (nejdříve povolit v možnostech seznamu)";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
 "rU5-XQ-Ixc.placeholderString" = "Jméno";
diff --git a/ui/cs_CZ.lproj/AccRing.strings b/ui/cs_CZ.lproj/AccRing.strings
index 94fad6f..76228e7 100644
--- a/ui/cs_CZ.lproj/AccRing.strings
+++ b/ui/cs_CZ.lproj/AccRing.strings
@@ -6,16 +6,16 @@
 "8WI-fC-Due.title" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
-"B6b-iB-REZ.title" = "Bootstrap server";
+"B6b-iB-REZ.title" = "Server bootstrap";
 
 /* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
-"EDd-FX-wcz.title" = "Permissions";
+"EDd-FX-wcz.title" = "Oprávnění";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Zaregistrovat jméno";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
-"HN3-i9-zmw.placeholderString" = "Name or nickname...";
+"HN3-i9-zmw.placeholderString" = "Jméno nebo přezdívka...";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "OeY-na-0YT"; */
 "OeY-na-0YT.title" = "Automaticky přijímat hovory";
@@ -27,19 +27,19 @@
 "Wzq-V2-YLU.title" = "Přezdívka";
 
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
-"ddk-1G-0jU.title" = "Use custom user-agent";
+"ddk-1G-0jU.title" = "Použít vlastního uživatelského agenta";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
 "fSU-Pc-Y5a.title" = "Blockchain server";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
-"fX7-9W-XFl.title" = "Allow calls from peers in your contact list";
+"fX7-9W-XFl.title" = "Povolit hovory od uživatelů v seznamu kontaktů";
 
 /* Class = "NSButtonCell"; title = "Allow calls from unknown peers"; ObjectID = "kmI-jb-aal"; */
 "kmI-jb-aal.title" = "Povolit hovory od neznámých uživatelů";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
-"lHI-bz-ddQ.title" = "Upnp enabled";
+"lHI-bz-ddQ.title" = "UPnP povoleno";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Registrované jméno";
diff --git a/ui/cs_CZ.lproj/AccSecurity.strings b/ui/cs_CZ.lproj/AccSecurity.strings
index 16bffcb..0b03bd8 100644
--- a/ui/cs_CZ.lproj/AccSecurity.strings
+++ b/ui/cs_CZ.lproj/AccSecurity.strings
@@ -1,45 +1,45 @@
 
 /* Class = "NSButtonCell"; title = "Require certificates for incoming TLS connections"; ObjectID = "1f9-X5-ykb"; */
-"1f9-X5-ykb.title" = "Require certificates for incoming TLS connections";
+"1f9-X5-ykb.title" = "Vyžadovat certifikáty pro příchozí TLS spojení";
 
 /* Class = "NSButtonCell"; title = "Verify certificates, as a client"; ObjectID = "1xi-9G-zOX"; */
-"1xi-9G-zOX.title" = "Verify certificates, as a client";
+"1xi-9G-zOX.title" = "Ověřit certifikáty, jako klient";
 
 /* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
 "2e5-zS-ghg.title" = "Použít vlastní seznam šifer";
 
 /* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
-"5LC-T6-hpk.placeholderString" = "cipher cell";
+"5LC-T6-hpk.placeholderString" = "šifrovat buňky";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
-"7c2-kF-dcs.placeholderString" = "Password...";
+"7c2-kF-dcs.placeholderString" = "Heslo…";
 
 /* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
-"9Q3-1W-Lh3.title" = "Negotiation timeout";
+"9Q3-1W-Lh3.title" = "Limit vyjednávání";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
-"Ig9-B1-7N3.title" = "Fallback on RTP";
+"Ig9-B1-7N3.title" = "Nouzově na RTP";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "JHb-iu-ZwI"; */
 "JHb-iu-ZwI.title" = "Soukromý klíč";
 
 /* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
-"Jqz-P0-zAz.title" = "User Certificate";
+"Jqz-P0-zAz.title" = "Uživatelský certifikát";
 
 /* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
-"UxS-et-whJ.title" = "Server name instance for outgoing TLS connection";
+"UxS-et-whJ.title" = "Instance názvu serveru pro odchozí TLS spojení";
 
 /* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
-"YtQ-hx-hih.title" = "Use SRTP";
+"YtQ-hx-hih.title" = "Použít SRTP";
 
 /* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
-"oTT-gO-fqM.title" = "Use TLS transport";
+"oTT-gO-fqM.title" = "Použít transport TLS";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "uOE-XA-5gW"; */
 "uOE-XA-5gW.title" = "Metoda protokolu TLS";
 
 /* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
-"vPF-Rp-aR6.title" = "Certificate Authority list";
+"vPF-Rp-aR6.title" = "Seznam autorit certifikátů";
 
 /* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
-"x2s-ov-cVQ.title" = "Verify incoming certificates, as a server";
+"x2s-ov-cVQ.title" = "Ověřit příchozí certifikáty, jako server";
diff --git a/ui/cs_CZ.lproj/AudioPrefs.strings b/ui/cs_CZ.lproj/AudioPrefs.strings
index 1bb7076..380afbf 100644
--- a/ui/cs_CZ.lproj/AudioPrefs.strings
+++ b/ui/cs_CZ.lproj/AudioPrefs.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
-"2gZ-Ab-XHf.title" = "Output";
+"2gZ-Ab-XHf.title" = "Výstup";
 
 /* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
 "9HH-Pa-4Aq.title" = "Nahrávky";
 
 /* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
-"B0r-wh-wc3.title" = "Audio devices";
+"B0r-wh-wc3.title" = "Zvuková zařízení";
 
 /* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
-"jeD-Nk-KHA.title" = "Always recording";
+"jeD-Nk-KHA.title" = "Vždy nahrávat";
 
 /* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
-"ksV-r2-EVJ.title" = "Save in";
+"ksV-r2-EVJ.title" = "Uložit do";
 
 /* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
-"pAA-Iv-EmI.title" = "Mute DTMF";
+"pAA-Iv-EmI.title" = "Ztlumit DTMF";
 
 /* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
-"x1o-rT-jy6.title" = "Input";
+"x1o-rT-jy6.title" = "Vstup";
diff --git a/ui/cs_CZ.lproj/BackupAccountWindow.strings b/ui/cs_CZ.lproj/BackupAccountWindow.strings
index c9cb677..b4e197d 100644
--- a/ui/cs_CZ.lproj/BackupAccountWindow.strings
+++ b/ui/cs_CZ.lproj/BackupAccountWindow.strings
@@ -1,54 +1,54 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Potvrdit…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Heslo…";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Kam";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+"KYZ-TW-44Y.title" = "Zvolte, kam zálohovat váš účet. Musí být chráněn heslem.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Okno";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
-"VN1-A3-RIh.title" = "Budiž";
+"VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
 "cSU-aD-OwX.title" = "Zrušit";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Heslo…";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Při zálohování došlo k chybě";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Budiž";
+"rW5-Il-5YD.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Heslo";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Heslo…";
diff --git a/ui/cs_CZ.lproj/CertificateWindow.strings b/ui/cs_CZ.lproj/CertificateWindow.strings
index 54d89e0..56e473e 100644
--- a/ui/cs_CZ.lproj/CertificateWindow.strings
+++ b/ui/cs_CZ.lproj/CertificateWindow.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSTextFieldCell"; title = "Certificate information"; ObjectID = "BrE-Hz-sVE"; */
-"BrE-Hz-sVE.title" = "Certificate information";
+"BrE-Hz-sVE.title" = "Informace o certifikátu";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "G7a-wY-fOS"; */
-"G7a-wY-fOS.title" = "Text Cell";
+"G7a-wY-fOS.title" = "Textová buňka";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "Od1-pH-TGO"; */
-"Od1-pH-TGO.title" = "Table View Cell";
+"Od1-pH-TGO.title" = "Tabulkový náhled buňky";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Okno";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RMj-fd-OsX"; */
-"RMj-fd-OsX.title" = "Text Cell";
+"RMj-fd-OsX.title" = "Textová buňka";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "khh-uZ-Keh"; */
-"khh-uZ-Keh.title" = "Table View Cell";
+"khh-uZ-Keh.title" = "Tabulkový náhled buňky";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "x6p-u4-4Ot"; */
 "x6p-u4-4Ot.title" = "Budiž";
diff --git a/ui/cs_CZ.lproj/Conversation.strings b/ui/cs_CZ.lproj/Conversation.strings
index bc5cbfb..252c980 100644
--- a/ui/cs_CZ.lproj/Conversation.strings
+++ b/ui/cs_CZ.lproj/Conversation.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
-"FgV-iF-gGQ.title" = "Text Cell";
+"FgV-iF-gGQ.title" = "Textová buňka";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.placeholderString" = "Title";
+"HnC-1N-RmR.placeholderString" = "Název";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
-"Ilz-7v-2fr.placeholderString" = "Send a message";
+"Ilz-7v-2fr.placeholderString" = "Poslat zprávu";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Poslat zprávu";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Poslat zprávu";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Poslat zprávu";
 
 /* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "Start the conversation!";
+"bsl-nv-Wqq.title" = "Pusťte se do konverzace!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
 "ooq-vs-Xt1.ibShadowedToolTip" = "Nahrávat";
diff --git a/ui/cs_CZ.lproj/CurrentCall.strings b/ui/cs_CZ.lproj/CurrentCall.strings
index d1983fa..b984957 100644
--- a/ui/cs_CZ.lproj/CurrentCall.strings
+++ b/ui/cs_CZ.lproj/CurrentCall.strings
@@ -3,7 +3,7 @@
 "2cB-dz-KYg.ibShadowedToolTip" = "Zavěsit";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
-"9e8-ji-QId.ibShadowedToolTip" = "Join call";
+"9e8-ji-QId.ibShadowedToolTip" = "Připojit se k hovoru";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
 "ChW-kg-Sja.ibShadowedToolTip" = "Převod";
@@ -15,7 +15,7 @@
 "Dqv-um-UUk.title" = "URI";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
-"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
+"EA3-Q5-Dyj.placeholderString" = "Zobrazit jméno příchozího";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
 "G0w-c3-9pJ.ibShadowedToolTip" = "Nahrávat";
@@ -36,19 +36,19 @@
 "VVL-A4-r7n.ibShadowedToolTip" = "Nahrávat";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "wants to talk to you!";
+"X0W-vv-xua.title" = "chce s vámi mluvit!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
 "anb-Y8-JQi.ibShadowedToolTip" = "Pozastavit";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
-"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+"fmp-x4-Pef.ibShadowedToolTip" = "Přepnout zprávy";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "Add participant";
+"kIZ-mf-moM.ibShadowedToolTip" = "Přidat účastníka";
 
 /* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
-"kxH-yM-TLd.title" = "Button";
+"kxH-yM-TLd.title" = "Tlačítko";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
 "mc3-HV-hek.ibShadowedToolTip" = "Zavěsit";
@@ -57,10 +57,10 @@
 "oRa-pS-HN2.ibShadowedToolTip" = "Nahrávat";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
-"osk-LS-0Qg.placeholderString" = "Person name";
+"osk-LS-0Qg.placeholderString" = "Jméno osoby";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
-"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+"qgD-3D-nD5.ibShadowedToolTip" = "Zvednout";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
 "tQl-cT-0Lb.ibShadowedToolTip" = "Vypnout zvuk";
@@ -75,7 +75,7 @@
 "wRO-X4-7IU.title" = "Přijmout";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "wants to talk with you!";
+"yZ6-1A-ZLT.title" = "chce s vámi mluvit!";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
 "zsO-T7-9yi.placeholderString" = "Čas";
diff --git a/ui/cs_CZ.lproj/ExportPasswordWindow.strings b/ui/cs_CZ.lproj/ExportPasswordWindow.strings
index 9b4eb4e..2cc7f06 100644
--- a/ui/cs_CZ.lproj/ExportPasswordWindow.strings
+++ b/ui/cs_CZ.lproj/ExportPasswordWindow.strings
@@ -1,42 +1,42 @@
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Heslo…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Heslo…";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Pro začátek prosím poskytněte heslo ke svému účtu Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Okno";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
-"VN1-A3-RIh.title" = "Budiž";
+"VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
 "cSU-aD-OwX.title" = "Zrušit";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
-"dfD-AK-f3R.title" = "Budiž";
+"dfD-AK-f3R.title" = "OK";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "chybový štítek";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Budiž";
+"rW5-Il-5YD.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Heslo";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Připojit k tomuto účtu další zařízení";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Heslo…";
diff --git a/ui/cs_CZ.lproj/GeneralPrefs.strings b/ui/cs_CZ.lproj/GeneralPrefs.strings
index 65cd377..a36c44b 100644
--- a/ui/cs_CZ.lproj/GeneralPrefs.strings
+++ b/ui/cs_CZ.lproj/GeneralPrefs.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Keep my history for";
+"3Pb-Ec-zl5.title" = "Uchovat historii po";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
-"42E-UY-qlP.title" = "Monthly";
+"42E-UY-qlP.title" = "Měsíčně";
 
 /* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
-"AId-am-73Q.title" = "Weekly";
+"AId-am-73Q.title" = "Týdně";
 
 /* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
 "JvS-c4-OeT.title" = "30";
@@ -15,22 +15,22 @@
 "MV1-AC-qE7.ibShadowedToolTip" = "Profil";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
-"O2C-xR-mHF.title" = "Launch on Startup";
+"O2C-xR-mHF.title" = "Spouštět při spuštění systému";
 
 /* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
-"OTl-vx-S43.title" = "(Applied on application restart)";
+"OTl-vx-S43.title" = "(Použito při znovuspuštění programu)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Chování";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
-"T3a-yx-ZaW.title" = "Automatically check for updates";
+"T3a-yx-ZaW.title" = "Automaticky zkontrolovat aktualizace";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
 "Thg-oC-5Qw.title" = "Profil";
 
 /* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
-"cB6-4m-9MU.title" = "Daily";
+"cB6-4m-9MU.title" = "Denně";
 
 /* Class = "NSButtonCell"; title = "Clear History"; ObjectID = "cd5-9L-Bbb"; */
 "cd5-9L-Bbb.title" = "Vymazat historii";
@@ -39,16 +39,16 @@
 "e5K-l0-Nfw.title" = "dní";
 
 /* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
-"mbu-TH-bs8.title" = "Hourly";
+"mbu-TH-bs8.title" = "Každou hodinu";
 
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
-"r4u-t3-gBc.title" = "Update";
+"r4u-t3-gBc.title" = "Aktualizovat";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Povolit oznámení na ploše";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "Bring Ring to foreground on incoming calls";
+"uYI-hA-JHk.title" = "Při příchozích hovorech přenést okno Ringu do popředí.";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "Toto je sdíleno s vašimi kontakty";
diff --git a/ui/cs_CZ.lproj/Localizable.strings b/ui/cs_CZ.lproj/Localizable.strings
index 4577529..28a0fd1 100644
--- a/ui/cs_CZ.lproj/Localizable.strings
+++ b/ui/cs_CZ.lproj/Localizable.strings
@@ -1,89 +1,86 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Při vyvádění došlo k chybě sítě";
 
 /* Contextual menu action */
 "Add to contacts" = "Přidat do kontaktů";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Přezdívka:";
 
 /* Error shown to the user */
-"An error occured during the export" = "An error occured during the export";
+"An error occured during the export" = "Při vyvádění došlo k chybě";
 
 /* Contextual menu entry */
-"Backup account" = "Backup account";
+"Backup account" = "Zálohovat účet";
 
 /* Contextual menu action */
-"Call number" = "Call number";
+"Call number" = "Volat číslo";
 
 /* Open panel title */
-"Choose a CA list" = "Choose a CA list";
+"Choose a CA list" = "Vyberte seznam CA";
 
 /* Open panel title */
-"Choose a certificate" = "Choose a certificate";
+"Choose a certificate" = "Vyberte certifikát";
 
 /* Open panel title */
-"Choose a directory" = "Choose a directory";
+"Choose a directory" = "Vyberte adresář";
 
 /* Open panel title */
-"Choose a private key file" = "Choose a private key file";
+"Choose a private key file" = "Vyberte soubor se soukromým klíčem";
 
 /* Open panel prompt for 'Choose a file' */
-"Choose CA" = "Choose CA";
+"Choose CA" = "Vybrat CA";
 
 /* Open panel prompt for 'Choose a directory' */
-"Choose directory" = "Choose directory";
+"Choose directory" = "Vybrat adresář";
 
 /* Contextual menu entry */
-"Choose file" = "Choose file";
+"Choose file" = "Vybrat soubor";
 
 /* No comment provided by engineer. */
 "Copy" = "Zkopírovat";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Kopírovat název";
 
 /* Contextual menu action */
 "Copy number" = "Zkopírovat číslo";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Vytvořit účet RING";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "Vytvořit účet SIP";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "Zadaný název nenalezen";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Nepodařilo se přestěhovat váš účet. Můžete to zkusit ještě jednou stisknutím OK nebo svůj účet smazat.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Vyhledávání selhalo";
 
 /* Incoming call from {Name} */
-"Incoming call from %@" = "Incoming call from %@";
+"Incoming call from %@" = "Příchozí hovor od %@";
 
 /* Alert dialo message */
-"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+"Make sure you have at least one valid account" = "Ujistěte se, že máte alespoň jeden platný účet";
 
 /* Message from {Name} */
-"Message from %@" = "Message from %@";
+"Message from %@" = "Zpráva od  %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Nový účet SIP";
 
 /* Alert dialog title */
-"No valid account available" = "No valid account available";
+"No valid account available" = "Není dostupný žádný platný účet";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Heslo a jeho potvrzení se neshodují";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Heslo je příliš krátké";
 
 /* Indication for user */
 "Passwords don't match" = "Hesla se neshodují";
@@ -98,43 +95,46 @@
 "Refuse" = "Odmítnout";
 
 /* Contextual menu entry */
-"Remove value" = "Remove value";
+"Remove value" = "Odstranit hodnotu";
 
 /* Show advice to user */
-"Reopen account to see your hash" = "Reopen account to see your hash";
+"Reopen account to see your hash" = "Znovuotevřít účet a podívat se na váš hash";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Obnovit účet";
 
 /* Button title */
-"Revise Input" = "Revise Input";
+"Revise Input" = "Pozměnit vstup";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
 
 /* No comment provided by engineer. */
-"Share" = "Share";
+"Share" = "Sdílet";
 
 /* No comment provided by engineer. */
-"Text Actions" = "Text Actions";
+"Text Actions" = "Textové činnosti";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Zadané uživatelské jméno je dostupné";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Zadané uživatelské jméno není dostupné";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "Následující účet musí emigrovat do nového formátu Ring účtů:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "Vámi zadané heslo neodemkne tento účet";
 
 /* Alert dialog title */
-"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+"The username you entered do not match a RingID on the network" = "Uživatelské jméno, jež jste zadal, neodpovídá RingID na síti";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Pro dokončení tohoto postupu otevřete Ring na novém zařízení a vyberte volbu „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.";
 
 /* Text shown to the user */
 "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Pro pokračování v migraci musíte zvolit heslo pro váš účet. Toto heslo bude použito k zašifrování vašeho hlavního klíče. Bude požadováno pro přidávání nových zařízení k vašemu Ring účtu. Pokud nejste připraveni zvolit si heslo, můžete Ring zavřít a pokračovat v migraci později.";
@@ -143,5 +143,5 @@
 "Unknown" = "Neznámý";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Musíte převést svůj účet před vyvedením";
 
diff --git a/ui/cs_CZ.lproj/MainMenu.strings b/ui/cs_CZ.lproj/MainMenu.strings
index bfe5665..30d7086 100644
--- a/ui/cs_CZ.lproj/MainMenu.strings
+++ b/ui/cs_CZ.lproj/MainMenu.strings
@@ -1,18 +1,18 @@
 
 /* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
-"5.title" = "Bring All to Front";
+"5.title" = "Přenést vše do popředí";
 
 /* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
-"19.title" = "Window";
+"19.title" = "Okno";
 
 /* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
-"23.title" = "Minimize";
+"23.title" = "Zmenšit";
 
 /* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
-"24.title" = "Window";
+"24.title" = "Okno";
 
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
-"29.title" = "AMainMenu";
+"29.title" = "Hlavní nabídka";
 
 /* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
 "56.title" = "Kruh";
@@ -24,178 +24,178 @@
 "58.title" = "O Ring";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
-"129.title" = "Preferences…";
+"129.title" = "Nastavení...";
 
 /* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
-"130.title" = "Services";
+"130.title" = "Služby";
 
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
-"131.title" = "Services";
+"131.title" = "Služby";
 
 /* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Hide Ring";
+"134.title" = "Skrýt Ring";
 
 /* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Quit Ring";
+"136.title" = "Ukončit Ring";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
-"145.title" = "Hide Others";
+"145.title" = "Skrýt ostatní";
 
 /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
-"150.title" = "Show All";
+"150.title" = "Ukázat vše";
 
 /* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
-"195.title" = "Stop Speaking";
+"195.title" = "Přestat mluvit";
 
 /* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
-"196.title" = "Start Speaking";
+"196.title" = "Začít mluvit";
 
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
 "197.title" = "Zkopírovat";
 
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
-"198.title" = "Select All";
+"198.title" = "Vybrat vše";
 
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
-"199.title" = "Cut";
+"199.title" = "Vyjmout";
 
 /* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
-"200.title" = "Spelling and Grammar";
+"200.title" = "Pravopis a mluvnice";
 
 /* Class = "NSMenuItem"; title = "Check Document Now"; ObjectID = "201"; */
-"201.title" = "Check Document Now";
+"201.title" = "Zkontrolovat dokument nyní";
 
 /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
 "202.title" = "Zmazat";
 
 /* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
-"203.title" = "Paste";
+"203.title" = "Vložit";
 
 /* Class = "NSMenuItem"; title = "Show Spelling and Grammar"; ObjectID = "204"; */
-"204.title" = "Show Spelling and Grammar";
+"204.title" = "Ukázat pravopis a mluvnici";
 
 /* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
-"205.title" = "Edit";
+"205.title" = "Upravit";
 
 /* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */
-"207.title" = "Undo";
+"207.title" = "Zpět";
 
 /* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "208"; */
-"208.title" = "Find Next";
+"208.title" = "Najít další";
 
 /* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
-"209.title" = "Find…";
+"209.title" = "Najít...";
 
 /* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "210"; */
-"210.title" = "Jump to Selection";
+"210.title" = "Skočit na výběr";
 
 /* Class = "NSMenuItem"; title = "Speech"; ObjectID = "211"; */
-"211.title" = "Speech";
+"211.title" = "Řeč";
 
 /* Class = "NSMenu"; title = "Speech"; ObjectID = "212"; */
-"212.title" = "Speech";
+"212.title" = "Řeč";
 
 /* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "213"; */
-"213.title" = "Find Previous";
+"213.title" = "Najít předchozí";
 
 /* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
-"215.title" = "Redo";
+"215.title" = "Znovu";
 
 /* Class = "NSMenuItem"; title = "Spelling and Grammar"; ObjectID = "216"; */
-"216.title" = "Spelling and Grammar";
+"216.title" = "Pravopis a mluvnice";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
-"217.title" = "Edit";
+"217.title" = "Upravit";
 
 /* Class = "NSMenuItem"; title = "Find"; ObjectID = "218"; */
-"218.title" = "Find";
+"218.title" = "Najít";
 
 /* Class = "NSMenuItem"; title = "Check Spelling While Typing"; ObjectID = "219"; */
-"219.title" = "Check Spelling While Typing";
+"219.title" = "Ověřovat pravopis při psaní";
 
 /* Class = "NSMenu"; title = "Find"; ObjectID = "220"; */
-"220.title" = "Find";
+"220.title" = "Najít";
 
 /* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "221"; */
-"221.title" = "Use Selection for Find";
+"221.title" = "Použít výběr pro hledání";
 
 /* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
-"239.title" = "Zoom";
+"239.title" = "Zvětšení";
 
 /* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
-"295.title" = "View";
+"295.title" = "Pohled";
 
 /* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
-"296.title" = "View";
+"296.title" = "Pohled";
 
 /* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
-"297.title" = "Show Toolbar";
+"297.title" = "Ukázat pruh s nástroji";
 
 /* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
-"298.title" = "Customize Toolbar…";
+"298.title" = "Přizpůsobit pruh s nástroji...";
 
 /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "346"; */
-"346.title" = "Check Grammar With Spelling";
+"346.title" = "Ověřit mluvnici s pravopisem";
 
 /* Class = "NSMenuItem"; title = "Substitutions"; ObjectID = "348"; */
-"348.title" = "Substitutions";
+"348.title" = "Nahrazení";
 
 /* Class = "NSMenu"; title = "Substitutions"; ObjectID = "349"; */
-"349.title" = "Substitutions";
+"349.title" = "Nahrazení";
 
 /* Class = "NSMenuItem"; title = "Smart Copy/Paste"; ObjectID = "350"; */
-"350.title" = "Smart Copy/Paste";
+"350.title" = "Chytré kopírování/vkládání";
 
 /* Class = "NSMenuItem"; title = "Smart Quotes"; ObjectID = "351"; */
-"351.title" = "Smart Quotes";
+"351.title" = "Chytré uvozovky";
 
 /* Class = "NSMenuItem"; title = "Smart Links"; ObjectID = "354"; */
-"354.title" = "Smart Links";
+"354.title" = "Chytré odkazy";
 
 /* Class = "NSMenuItem"; title = "Transformations"; ObjectID = "450"; */
-"450.title" = "Transformations";
+"450.title" = "Proměny";
 
 /* Class = "NSMenu"; title = "Transformations"; ObjectID = "451"; */
-"451.title" = "Transformations";
+"451.title" = "Proměny";
 
 /* Class = "NSMenuItem"; title = "Make Upper Case"; ObjectID = "452"; */
-"452.title" = "Make Upper Case";
+"452.title" = "Udělat velká písmena";
 
 /* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
-"454.title" = "Correct Spelling Automatically";
+"454.title" = "Opravit pravopis automaticky";
 
 /* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
-"457.title" = "Show Substitutions";
+"457.title" = "Ukázat nahrazení";
 
 /* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
-"460.title" = "Smart Dashes";
+"460.title" = "Chytré pomlčky";
 
 /* Class = "NSMenuItem"; title = "Text Replacement"; ObjectID = "462"; */
-"462.title" = "Text Replacement";
+"462.title" = "Nahrazení textu";
 
 /* Class = "NSMenuItem"; title = "Make Lower Case"; ObjectID = "465"; */
-"465.title" = "Make Lower Case";
+"465.title" = "Udělat malá písmena";
 
 /* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
-"466.title" = "Capitalize";
+"466.title" = "Psát s velkým začátečním písmenem";
 
 /* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
-"485.title" = "Paste and Match Style";
+"485.title" = "Styl vkládání a shody";
 
 /* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
-"490.title" = "Help";
+"490.title" = "Nápověda";
 
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
-"491.title" = "Help";
+"491.title" = "Nápověda";
 
 /* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Help";
+"492.title" = "Nápověda k Ringu";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
-"534.title" = "Find and Replace…";
+"534.title" = "Najít a nahradit...";
 
 /* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
-"593.title" = "Check for Update...";
+"593.title" = "Zkontrolovat aktualizace...";
 
 /* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
 "12w-Fz-Scs.title" = "Ukázat";
@@ -204,10 +204,10 @@
 "1fJ-em-1ww.title" = "Ukázat";
 
 /* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
-"GTY-d8-NBf.title" = "Show recent";
+"GTY-d8-NBf.title" = "Ukázat nedávné";
 
 /* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
-"GU3-tt-2de.title" = "Show contacts";
+"GU3-tt-2de.title" = "Ukázat kontakty";
 
 /* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
-"Oco-m7-LtS.title" = "Show call history";
+"Oco-m7-LtS.title" = "Ukázat historii volání";
diff --git a/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings b/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
index 6a07aa2..b783fb7 100644
--- a/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
@@ -1,48 +1,48 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Převod účtu dokončen";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "Následující účet musí být převeden do nového formátu účtu Ring:\\nPřezdívka: \\nID:\\nAbyste převedení provedli, musíte si k účtu zvolit heslo. Toto heslo bude použito k zašifrování vašeho hlavního klíče. Budete na něj dotázáni při přidávání dalších zařízení k účtu Ring. Pokud ještě nejste na vybírání hesla připraveni, můžete Ring zavřít a pokračovat v převedení později.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Chyba při převodu účtu";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Blahopřejeme, váš účet byl úspěšně převeden.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Smazat tento účet";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Potvrďte své nové heslo…";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
-"PT7-XI-WDR.title" = "Budiž";
+"PT7-XI-WDR.title" = "OK";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Okno";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
-"VN1-A3-RIh.title" = "Budiž";
+"VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Potvrzení";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "chybový štítek";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Převést";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Heslo";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Je potřeba migrace účtu";
+"wmv-sA-Mlh.title" = "Je potřeba převedení účtu";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Heslo…";
diff --git a/ui/cs_CZ.lproj/PersonLinker.strings b/ui/cs_CZ.lproj/PersonLinker.strings
index 66bc064..69e83ed 100644
--- a/ui/cs_CZ.lproj/PersonLinker.strings
+++ b/ui/cs_CZ.lproj/PersonLinker.strings
@@ -1,18 +1,18 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
-"Jcn-cg-rbR.placeholderString" = "Display Role";
+"Jcn-cg-rbR.placeholderString" = "Zobrazit úlohu";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
-"M4f-N4-msh.title" = "Text Cell";
+"M4f-N4-msh.title" = "Textová buňka";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
-"a9R-r5-K3w.placeholderString" = "Contact Method";
+"a9R-r5-K3w.placeholderString" = "Způsob kontaktu";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Last name..."; ObjectID = "cGT-nu-sPa"; */
-"cGT-nu-sPa.placeholderString" = "Last name...";
+"cGT-nu-sPa.placeholderString" = "Příjmení...";
 
 /* Class = "NSButtonCell"; title = "Add new contact"; ObjectID = "had-9Y-eza"; */
-"had-9Y-eza.title" = "Add new contact";
+"had-9Y-eza.title" = "Přidat nový kontakt";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "qZc-Z2-TpP"; */
 "qZc-Z2-TpP.title" = "Vytvořit";
@@ -21,4 +21,4 @@
 "v7b-de-MVd.title" = "Nový kontakt";
 
 /* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
-"vyb-95-XaF.placeholderString" = "First name...";
+"vyb-95-XaF.placeholderString" = "Jméno...";
diff --git a/ui/cs_CZ.lproj/PreferencesWindow.strings b/ui/cs_CZ.lproj/PreferencesWindow.strings
index 6ce3bcf..c14fa84 100644
--- a/ui/cs_CZ.lproj/PreferencesWindow.strings
+++ b/ui/cs_CZ.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Preferences";
+"C1T-wE-wxb.title" = "Ring nastavení";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Obecné";
diff --git a/ui/cs_CZ.lproj/RegisterNameWindow.strings b/ui/cs_CZ.lproj/RegisterNameWindow.strings
index da3b9a2..5606bcf 100644
--- a/ui/cs_CZ.lproj/RegisterNameWindow.strings
+++ b/ui/cs_CZ.lproj/RegisterNameWindow.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Povinné*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Ostatní uživatelé to mohou použít namísto vašeho RingID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Při registraci uživatelského jména nastala chyba";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Zadejte své heslo k účtu Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
-"JWw-7m-ywL.title" = "Window";
+"JWw-7m-ywL.title" = "Okno";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
-"YIN-YL-JBs.title" = "Just a moment...";
+"YIN-YL-JBs.title" = "Jen chviličku…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Uživatelské jméno…";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Zrušit";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Zaregistrovat";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register username on the blockchain";
+"tje-EZ-ZPI.title" = "Zaregistrovat uživatelské jméno na blockchainu";
diff --git a/ui/cs_CZ.lproj/RingWindow.strings b/ui/cs_CZ.lproj/RingWindow.strings
index 1d18648..49d6e1d 100644
--- a/ui/cs_CZ.lproj/RingWindow.strings
+++ b/ui/cs_CZ.lproj/RingWindow.strings
@@ -1,39 +1,39 @@
 
 /* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
-"0MO-4e-8mo.label" = "SmartView";
+"0MO-4e-8mo.label" = "Chytrý pohled";
 
 /* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
 "3Bh-xR-4Vn.title" = "Text";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
-"Ap7-26-S6b.title" = "Text Cell";
+"Ap7-26-S6b.title" = "Textová buňka";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
-"BfK-c5-B1l.placeholderString" = "details";
+"BfK-c5-B1l.placeholderString" = "podrobnosti";
 
 /* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Kruh";
+"F0z-JX-Cv5.title" = "Ring";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.placeholderString" = "Contact Method";
+"FlQ-Th-nfO.placeholderString" = "Způsob kontaktu";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
-"GAa-pQ-t4g.title" = "Text Cell";
+"GAa-pQ-t4g.title" = "Textová buňka";
 
 /* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Title";
+"Pav-Bw-GgK.title" = "Název";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "Display Role";
+"Q1F-xo-N3e.placeholderString" = "Zobrazit úlohu";
 
 /* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "date";
+"UKP-Et-CT0.placeholderString" = "datum";
 
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historie";
 
 /* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Toto je vaše RingID. Kopírujte jej a sdílejte s přáteli!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakty";
@@ -42,28 +42,28 @@
 "bgk-oz-u7n.placeholderString" = "Jméno";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
-"d5o-nL-fRP.placeholderString" = "Category";
+"d5o-nL-fRP.placeholderString" = "Kategorie";
 
 /* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
+"eln-Vm-t0d.title" = "Ring je bezpečná a distribuovaná platforma pro zvukovou, obrazovou a textovou komunikaci, která nevyžaduje žádný centrální server a ponechává moc nad soukromím v rukou uživatele.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
-"gaf-Za-tuc.placeholderString" = "Category";
+"gaf-Za-tuc.placeholderString" = "Kategorie";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.placeholderString" = "details";
+"isD-c6-X5Q.placeholderString" = "podrobnosti";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
-"j0J-Xd-uth.placeholderString" = "Call name";
+"j0J-Xd-uth.placeholderString" = "Název hovoru";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
-"mK5-kV-YOO.placeholderString" = "details";
+"mK5-kV-YOO.placeholderString" = "podrobnosti";
 
 /* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
 "sGB-x7-gig.placeholderString" = "n";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.placeholderString" = "Display Role";
+"uSw-g5-kte.placeholderString" = "Zobrazit úlohu";
 
 /* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
-"vvE-nM-kSl.placeholderString" = "Name, ringID";
+"vvE-nM-kSl.placeholderString" = "Jméno, ringID";
diff --git a/ui/cs_CZ.lproj/RingWizard.strings b/ui/cs_CZ.lproj/RingWizard.strings
index 0fc2058..b91b645 100644
--- a/ui/cs_CZ.lproj/RingWizard.strings
+++ b/ui/cs_CZ.lproj/RingWizard.strings
@@ -1,36 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Choose your own certificates"; ObjectID = "4ls-Yq-mDp"; */
-"4ls-Yq-mDp.title" = "Choose your own certificates";
-
-/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "5Z7-Wi-530"; */
-"5Z7-Wi-530.placeholderString" = "'Unknown' if empty...";
-
-/* Class = "NSTextFieldCell"; title = "Advanced security (optional)"; ObjectID = "Gnn-K9-PTH"; */
-"Gnn-K9-PTH.title" = "Advanced security (optional)";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "Hsc-U9-2RV"; */
-"Hsc-U9-2RV.placeholderString" = "Password...";
-
-/* Class = "NSButtonCell"; title = "Share"; ObjectID = "Kwr-LJ-K8C"; */
-"Kwr-LJ-K8C.title" = "Share";
-
-/* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "SpA-zX-ytE"; */
-"SpA-zX-ytE.title" = "Certificate Authority list";
-
-/* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "V1U-ew-Ge2"; */
-"V1U-ew-Ge2.title" = "User Certificate";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Choose custom certificates"; ObjectID = "aZl-bU-psB"; */
-"aZl-bU-psB.ibShadowedToolTip" = "Choose custom certificates";
-
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "meL-TZ-VQO"; */
-"meL-TZ-VQO.title" = "Choose your username";
-
-/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "poP-JD-MDa"; */
-"poP-JD-MDa.title" = "Soukromý klíč";
-
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "uqu-uh-Wao"; */
-"uqu-uh-Wao.title" = "Welcome to Ring";
-
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "wDw-Ut-RUm"; */
-"wDw-Ut-RUm.title" = "Next";
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Vítejte v Ringu";
diff --git a/ui/cs_CZ.lproj/RingWizardChoose.strings b/ui/cs_CZ.lproj/RingWizardChoose.strings
index 982d0de..f95b200 100644
--- a/ui/cs_CZ.lproj/RingWizardChoose.strings
+++ b/ui/cs_CZ.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Zrušit";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Připojit toto zařízení k účtu";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Vytvořit účet Ring";
diff --git a/ui/cs_CZ.lproj/RingWizardLinkAccount.strings b/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
index d000604..ff29652 100644
--- a/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
+++ b/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Zrušit";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Další";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Vyskytla se chyba, zkontrolujte prosím heslo a PIN.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
-"M4C-GY-B6t.title" = "Just a moment...";
+"M4C-GY-B6t.title" = "Jen chviličku…";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Zrušit";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+"U2K-fu-INc.title" = "Zadejte své heslo k účtu Ring";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Zrušit";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Zrušit";
diff --git a/ui/cs_CZ.lproj/RingWizardNewAccount.strings b/ui/cs_CZ.lproj/RingWizardNewAccount.strings
index c497576..c6c8569 100644
--- a/ui/cs_CZ.lproj/RingWizardNewAccount.strings
+++ b/ui/cs_CZ.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Povinné*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Zvolte si heslo";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Povinné*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
-"YIN-YL-JBs.title" = "Just a moment...";
+"YIN-YL-JBs.title" = "Jen chviličku…";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Zopakujte své heslo";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
+"gEy-ak-Cgq.placeholderString" = "„Neznámé“ pokud prázdné…";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Zrušit";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Heslo musí mít alespoň 6 znaků. Bude použito k zašifrování dat vašeho účtu a pro připojování nových zařízení k účtu.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Vytvořit";
diff --git a/ui/cs_CZ.lproj/VideoPrefs.strings b/ui/cs_CZ.lproj/VideoPrefs.strings
index 98cd462..05b0ca5 100644
--- a/ui/cs_CZ.lproj/VideoPrefs.strings
+++ b/ui/cs_CZ.lproj/VideoPrefs.strings
@@ -3,13 +3,13 @@
 "170-NP-CSP.title" = "Zařízení";
 
 /* Class = "NSTextFieldCell"; title = "Size"; ObjectID = "4bq-ls-mCp"; */
-"4bq-ls-mCp.title" = "Size";
+"4bq-ls-mCp.title" = "Velikost";
 
 /* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
-"5Im-df-jdd.title" = "Rate";
+"5Im-df-jdd.title" = "Rychlost";
 
 /* Class = "NSTextFieldCell"; title = "Selection"; ObjectID = "VqO-Gm-CbB"; */
-"VqO-Gm-CbB.title" = "Selection";
+"VqO-Gm-CbB.title" = "Výběr";
 
 /* Class = "NSTextFieldCell"; title = "Camera"; ObjectID = "YCM-JC-jin"; */
-"YCM-JC-jin.title" = "Camera";
+"YCM-JC-jin.title" = "Kamera";
diff --git a/ui/da_DK.lproj/AccRing.strings b/ui/da_DK.lproj/AccRing.strings
index 5fbc3d1..fbe630f 100644
--- a/ui/da_DK.lproj/AccRing.strings
+++ b/ui/da_DK.lproj/AccRing.strings
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "Tilladelser";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Registrer navn";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Navn eller øgenavn...";
diff --git a/ui/da_DK.lproj/Accounts.strings b/ui/da_DK.lproj/Accounts.strings
index 6a67f88..f4e3b46 100644
--- a/ui/da_DK.lproj/Accounts.strings
+++ b/ui/da_DK.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Navn";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Enheder";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Status";
diff --git a/ui/da_DK.lproj/ExportPasswordWindow.strings b/ui/da_DK.lproj/ExportPasswordWindow.strings
index 76581f5..e7e70cb 100644
--- a/ui/da_DK.lproj/ExportPasswordWindow.strings
+++ b/ui/da_DK.lproj/ExportPasswordWindow.strings
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Kodeord";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Tilknyt en anden enhed til denne konto";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Kodeord...";
diff --git a/ui/da_DK.lproj/Localizable.strings b/ui/da_DK.lproj/Localizable.strings
index a180649..e92a91d 100644
--- a/ui/da_DK.lproj/Localizable.strings
+++ b/ui/da_DK.lproj/Localizable.strings
@@ -59,10 +59,7 @@
 "Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Søgning mislykkedes";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
@@ -86,7 +83,7 @@
 "Password is too short" = "Password is too short";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Kodeord stemmer ikke overens";
 
 /* Button label */
 "Pause" = "Pause";
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Del";
 
@@ -116,16 +116,16 @@
 "Text Actions" = "Text Actions";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Det indtastede brugernavn er tilgængeligt";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Det indtastede brugernavn er ikke tilgængeligt";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Ring account format:" = "De følgende konti skal migreres til det nye Ring-konto-format:";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "The password you entered does not unlock this account";
@@ -137,7 +137,7 @@
 "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "For at fortsætte med migreringen, skal du vælge et kodeord til kontoen. Dette kodeord bruges til at kryptere din hovednøgle. Den skal bruges ved tilnytning af nye enheder til din Ring-konto. Hvis du ikke er klar til at vælge et kodeord, kan du lukke Ring og fortsætte med migreringen senere.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Ukendt";
diff --git a/ui/da_DK.lproj/MigrateRingAccountsWindow.strings b/ui/da_DK.lproj/MigrateRingAccountsWindow.strings
index 0691f87..12c51e4 100644
--- a/ui/da_DK.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/da_DK.lproj/MigrateRingAccountsWindow.strings
@@ -42,7 +42,7 @@
 "vwh-K9-3O9.title" = "Kodeord";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Account migration required";
+"wmv-sA-Mlh.title" = "Konto-migrering påkrævet";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Kodeord...";
diff --git a/ui/da_DK.lproj/RingWizardChoose.strings b/ui/da_DK.lproj/RingWizardChoose.strings
index 5c99e5c..8eb5b4a 100644
--- a/ui/da_DK.lproj/RingWizardChoose.strings
+++ b/ui/da_DK.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Annuller";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Tilknyt denne enhed til en konto";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Opret en Ring-konto";
diff --git a/ui/da_DK.lproj/RingWizardLinkAccount.strings b/ui/da_DK.lproj/RingWizardLinkAccount.strings
index 87d4ae2..7f9930d 100644
--- a/ui/da_DK.lproj/RingWizardLinkAccount.strings
+++ b/ui/da_DK.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuller";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Næste";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Annuller";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Annuller";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Annuller";
diff --git a/ui/da_DK.lproj/RingWizardNewAccount.strings b/ui/da_DK.lproj/RingWizardNewAccount.strings
index 5a94c95..8c65410 100644
--- a/ui/da_DK.lproj/RingWizardNewAccount.strings
+++ b/ui/da_DK.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Ukendt' hvis tom...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Vælg dit brugernavn";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Annuller";
diff --git a/ui/de.lproj/AccRing.strings b/ui/de.lproj/AccRing.strings
index 16234b0..e5525cb 100644
--- a/ui/de.lproj/AccRing.strings
+++ b/ui/de.lproj/AccRing.strings
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "Berechtigungen";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Name registrieren";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Name oder Spitznamen";
@@ -42,4 +42,4 @@
 "lHI-bz-ddQ.title" = "UPnP aktiviert";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Registrierter Name";
diff --git a/ui/de.lproj/BackupAccountWindow.strings b/ui/de.lproj/BackupAccountWindow.strings
index 7ceec29..7faf358 100644
--- a/ui/de.lproj/BackupAccountWindow.strings
+++ b/ui/de.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Bestätigen...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Passwort...";
@@ -15,7 +15,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Passwort...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Wo";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
 "KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
diff --git a/ui/de.lproj/ExportPasswordWindow.strings b/ui/de.lproj/ExportPasswordWindow.strings
index 8a2936a..ca820a1 100644
--- a/ui/de.lproj/ExportPasswordWindow.strings
+++ b/ui/de.lproj/ExportPasswordWindow.strings
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Passwort";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Weiteres Gerät mit diesem Konto verknüpfen";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Passwort...";
diff --git a/ui/de.lproj/GeneralPrefs.strings b/ui/de.lproj/GeneralPrefs.strings
index 4f5cf62..ba56248 100644
--- a/ui/de.lproj/GeneralPrefs.strings
+++ b/ui/de.lproj/GeneralPrefs.strings
@@ -21,7 +21,7 @@
 "OTl-vx-S43.title" = "(Beim Anwendungsneustart angewendet)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Verhalten";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Automatisch auf Aktualisierungen prüfen";
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Aktualisierungen";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Desktop-Benachrichtigungen aktivieren";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Ring in den Vordergrund bringen bei eingehenden Anrufen";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "Dies wird mit ihren Kontakten geteilt";
diff --git a/ui/de.lproj/Localizable.strings b/ui/de.lproj/Localizable.strings
index 4432be0..46ad154 100644
--- a/ui/de.lproj/Localizable.strings
+++ b/ui/de.lproj/Localizable.strings
@@ -1,17 +1,17 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ein Netzwerkfehler ist während des Exports aufgetreten";
 
 /* Contextual menu action */
 "Add to contacts" = "Kontakte hinzufügen";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Aliasname : ";
 
 /* Error shown to the user */
 "An error occured during the export" = "Ein Fehler ist während des Exports aufgetreten";
 
 /* Contextual menu entry */
-"Backup account" = "Backup account";
+"Backup account" = "Konto sichern";
 
 /* Contextual menu action */
 "Call number" = "Nummer wählen";
@@ -41,19 +41,19 @@
 "Copy" = "Kopieren";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Name kopieren";
 
 /* Contextual menu action */
 "Copy number" = "Nummer kopieren";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "RING-Konto erstellen";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "SIP-Konto erstellen";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "Eingegebener Name wurde nicht gefunden";
 
 /* Error message shown to user when it is impossible to migrate account */
 "Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Eingehender Anruf von %@";
 
@@ -74,19 +71,19 @@
 "Message from %@" = "Nachricht von %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Neues SIP-Konto";
 
 /* Alert dialog title */
-"No valid account available" = "No valid account available";
+"No valid account available" = "Kein gültiges Konto verfügbar";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Passwort und Bestätigung stimmen nicht überein.";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Passwort ist zu kurz";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Passwörter stimmen nicht überein";
 
 /* Button label */
 "Pause" = "Pause";
@@ -104,11 +101,14 @@
 "Reopen account to see your hash" = "Konto erneut öffnen, um den Hashwert zu sehen";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Konto wiederherstellen";
 
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Teilen";
 
@@ -116,13 +116,13 @@
 "Text Actions" = "Textuelles Vorgehen";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Der angegebene Benutzername ist verfügbar";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Der angegebene Benutzername ist nicht verfügbar";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
diff --git a/ui/de.lproj/MigrateRingAccountsWindow.strings b/ui/de.lproj/MigrateRingAccountsWindow.strings
index 36f0b34..7386cda 100644
--- a/ui/de.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/de.lproj/MigrateRingAccountsWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Kontomigration abgeschlossen";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
@@ -9,16 +9,16 @@
 "859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Kontomigrationsfehler";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
 "C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Dieses Konto löschen";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Bestätigen Sie Ihr neues Passwort...";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "OK";
@@ -30,19 +30,19 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Bestätigung";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
 "e7n-Ev-bK7.placeholderString" = "error label";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Migrieren";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Passwort";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Account migration required";
+"wmv-sA-Mlh.title" = "Kontomigration erforderlich";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Passwort...";
diff --git a/ui/de.lproj/RegisterNameWindow.strings b/ui/de.lproj/RegisterNameWindow.strings
index 65454ea..131e43a 100644
--- a/ui/de.lproj/RegisterNameWindow.strings
+++ b/ui/de.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obligatorisch*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
 "9gi-0u-67t.title" = "Other users can use it instead of your RingID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Ein Fehler ist während der Registrierung Ihres Benutzernamens aufgetreten";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Geben Sie Ihr Ring-Kontopasswort ein";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Fenster";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Nur einen Moment...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Benutzername...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Abbrechen";
diff --git a/ui/de.lproj/RingWizardChoose.strings b/ui/de.lproj/RingWizardChoose.strings
index 1bc1f48..dc53c58 100644
--- a/ui/de.lproj/RingWizardChoose.strings
+++ b/ui/de.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Abbrechen";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Dieses Gerät mit einem Konto verknüpfen";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Ein Ring-Konto erstellen";
diff --git a/ui/de.lproj/RingWizardLinkAccount.strings b/ui/de.lproj/RingWizardLinkAccount.strings
index 6d33e32..31d7966 100644
--- a/ui/de.lproj/RingWizardLinkAccount.strings
+++ b/ui/de.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Abbrechen";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Weiter";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Nur einen Moment...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Abbrechen";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Geben Sie Ihr Ring-Kontopasswort ein";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Abbrechen";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Abbrechen";
diff --git a/ui/de.lproj/RingWizardNewAccount.strings b/ui/de.lproj/RingWizardNewAccount.strings
index 03dbcc8..bba3fce 100644
--- a/ui/de.lproj/RingWizardNewAccount.strings
+++ b/ui/de.lproj/RingWizardNewAccount.strings
@@ -1,30 +1,36 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obligatorisch*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Wählen Sie Ihr Passwort aus";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Obligatorisch*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Nur einen Moment...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Wiederholen Sie Ihr Passwort";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unbekannt' falls leer...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Nutzername wählen";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Abbrechen";
diff --git a/ui/de_DE.lproj/AccMedia.strings b/ui/de_DE.lproj/AccMedia.strings
index 0df1a3b..762e144 100644
--- a/ui/de_DE.lproj/AccMedia.strings
+++ b/ui/de_DE.lproj/AccMedia.strings
@@ -6,7 +6,7 @@
 "CO7-VF-04Q.title" = "Nach oben";
 
 /* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Enable ringtones";
+"KkI-i1-mfY.title" = "Klingeltöne aktivieren";
 
 /* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
 "MbZ-7X-K5I.title" = "Nach oben";
diff --git a/ui/de_DE.lproj/BackupAccountWindow.strings b/ui/de_DE.lproj/BackupAccountWindow.strings
index e646b1a..0eb00dd 100644
--- a/ui/de_DE.lproj/BackupAccountWindow.strings
+++ b/ui/de_DE.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Bestätigen...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Kennwort...";
diff --git a/ui/de_DE.lproj/GeneralPrefs.strings b/ui/de_DE.lproj/GeneralPrefs.strings
index 7016f91..a1084a4 100644
--- a/ui/de_DE.lproj/GeneralPrefs.strings
+++ b/ui/de_DE.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Keep my history for";
+"3Pb-Ec-zl5.title" = "Aus Verlauf entfernen";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Monatlich";
diff --git a/ui/de_DE.lproj/Localizable.strings b/ui/de_DE.lproj/Localizable.strings
index 4c02e04..0d3694d 100644
--- a/ui/de_DE.lproj/Localizable.strings
+++ b/ui/de_DE.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ein Fehler trat während des Exports";
 
 /* Contextual menu action */
 "Add to contacts" = "Kontakte hinzufügen";
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Freigeben";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/de_DE.lproj/RingWizard.strings b/ui/de_DE.lproj/RingWizard.strings
new file mode 100644
index 0000000..6b4e56f
--- /dev/null
+++ b/ui/de_DE.lproj/RingWizard.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Willkommen bei Ring";
diff --git a/ui/de_DE.lproj/RingWizardLinkAccount.strings b/ui/de_DE.lproj/RingWizardLinkAccount.strings
index a730c20..59b7760 100644
--- a/ui/de_DE.lproj/RingWizardLinkAccount.strings
+++ b/ui/de_DE.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Abbrechen";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Weiter";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Abbrechen";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Abbrechen";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Abbrechen";
diff --git a/ui/de_DE.lproj/RingWizardNewAccount.strings b/ui/de_DE.lproj/RingWizardNewAccount.strings
index 158a051..8d0a977 100644
--- a/ui/de_DE.lproj/RingWizardNewAccount.strings
+++ b/ui/de_DE.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Abbrechen";
diff --git a/ui/el.lproj/AccGeneral.strings b/ui/el.lproj/AccGeneral.strings
index 0127f71..dd179a2 100644
--- a/ui/el.lproj/AccGeneral.strings
+++ b/ui/el.lproj/AccGeneral.strings
@@ -27,7 +27,7 @@
 "UXm-73-BNy.title" = "Εμφανιση συνθήματος";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "WCR-30-BX0"; */
-"WCR-30-BX0.title" = "Password:";
+"WCR-30-BX0.title" = "Συνθηματικό:";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
 "YMy-QE-7A3.title" = "Αυτόματη απάντηση κλήσεων";
diff --git a/ui/el.lproj/AccRing.strings b/ui/el.lproj/AccRing.strings
index 2615322..9acb767 100644
--- a/ui/el.lproj/AccRing.strings
+++ b/ui/el.lproj/AccRing.strings
@@ -9,7 +9,7 @@
 "B6b-iB-REZ.title" = "Bootstrap server";
 
 /* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
-"EDd-FX-wcz.title" = "Permissions";
+"EDd-FX-wcz.title" = "Δικαιώματα";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
 "G8M-go-xvD.title" = "Register name";
diff --git a/ui/el.lproj/AccSecurity.strings b/ui/el.lproj/AccSecurity.strings
index 971aaf0..72b3e9d 100644
--- a/ui/el.lproj/AccSecurity.strings
+++ b/ui/el.lproj/AccSecurity.strings
@@ -12,7 +12,7 @@
 "5LC-T6-hpk.placeholderString" = "cipher cell";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
-"7c2-kF-dcs.placeholderString" = "Password...";
+"7c2-kF-dcs.placeholderString" = "Συνθηματικό...";
 
 /* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
 "9Q3-1W-Lh3.title" = "Negotiation timeout";
diff --git a/ui/el.lproj/Accounts.strings b/ui/el.lproj/Accounts.strings
index 733966e..a3378e6 100644
--- a/ui/el.lproj/Accounts.strings
+++ b/ui/el.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Όνομα";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Συσκευές";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Κατάσταση";
diff --git a/ui/el.lproj/BackupAccountWindow.strings b/ui/el.lproj/BackupAccountWindow.strings
index 9ebcff8..2a49ffd 100644
--- a/ui/el.lproj/BackupAccountWindow.strings
+++ b/ui/el.lproj/BackupAccountWindow.strings
@@ -3,16 +3,16 @@
 "5Qf-em-tN4.placeholderString" = "Confirm...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Συνθηματικό...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
 "9h8-GU-av4.title" = "Where";
@@ -21,7 +21,7 @@
 "KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Παράθυρο";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
@@ -30,16 +30,16 @@
 "cSU-aD-OwX.title" = "Ακύρωση";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Συνθηματικό...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
 "e7n-Ev-bK7.title" = "An error occured during the backup";
@@ -51,4 +51,4 @@
 "vwh-K9-3O9.title" = "Σύνθημα";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Συνθηματικό...";
diff --git a/ui/el.lproj/CertificateWindow.strings b/ui/el.lproj/CertificateWindow.strings
new file mode 100644
index 0000000..29e748b
--- /dev/null
+++ b/ui/el.lproj/CertificateWindow.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Certificate information"; ObjectID = "BrE-Hz-sVE"; */
+"BrE-Hz-sVE.title" = "Certificate information";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "G7a-wY-fOS"; */
+"G7a-wY-fOS.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "Od1-pH-TGO"; */
+"Od1-pH-TGO.title" = "Table View Cell";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Παράθυρο";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RMj-fd-OsX"; */
+"RMj-fd-OsX.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "khh-uZ-Keh"; */
+"khh-uZ-Keh.title" = "Table View Cell";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "x6p-u4-4Ot"; */
+"x6p-u4-4Ot.title" = "OK";
diff --git a/ui/el.lproj/Conversation.strings b/ui/el.lproj/Conversation.strings
index 1af2acc..fa557df 100644
--- a/ui/el.lproj/Conversation.strings
+++ b/ui/el.lproj/Conversation.strings
@@ -3,19 +3,19 @@
 "FgV-iF-gGQ.title" = "Text Cell";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.placeholderString" = "Title";
+"HnC-1N-RmR.placeholderString" = "Τίτλος";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
-"Ilz-7v-2fr.placeholderString" = "Send a message";
+"Ilz-7v-2fr.placeholderString" = "Αποστολή μηνύματος";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Αποστολή μηνήματος";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Αποστολή μηνύματος";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Αποστολή μηνήματος";
 
 /* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
 "bsl-nv-Wqq.title" = "Start the conversation!";
diff --git a/ui/el.lproj/ExportPasswordWindow.strings b/ui/el.lproj/ExportPasswordWindow.strings
index a4aebbc..2cdfb93 100644
--- a/ui/el.lproj/ExportPasswordWindow.strings
+++ b/ui/el.lproj/ExportPasswordWindow.strings
@@ -1,21 +1,21 @@
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Συνθηματικό...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Συνθηματικό...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.title" = "Please provide your Ring account password to start";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Παράθυρο";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
@@ -39,4 +39,4 @@
 "wmv-sA-Mlh.title" = "Link another device to this account";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Συνθηματικό...";
diff --git a/ui/el.lproj/GeneralPrefs.strings b/ui/el.lproj/GeneralPrefs.strings
index cf3b2eb..86bd08e 100644
--- a/ui/el.lproj/GeneralPrefs.strings
+++ b/ui/el.lproj/GeneralPrefs.strings
@@ -3,10 +3,10 @@
 "3Pb-Ec-zl5.title" = "Keep my history for";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
-"42E-UY-qlP.title" = "Monthly";
+"42E-UY-qlP.title" = "Μηνιαία";
 
 /* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
-"AId-am-73Q.title" = "Weekly";
+"AId-am-73Q.title" = "Εβδομαδιαία";
 
 /* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
 "JvS-c4-OeT.title" = "30";
diff --git a/ui/el.lproj/Localizable.strings b/ui/el.lproj/Localizable.strings
index 9059be4..b9042cc 100644
--- a/ui/el.lproj/Localizable.strings
+++ b/ui/el.lproj/Localizable.strings
@@ -38,7 +38,7 @@
 "Choose file" = "Choose file";
 
 /* No comment provided by engineer. */
-"Copy" = "Copy";
+"Copy" = "Αντιγραφή";
 
 /* Contextual menu action */
 "Copy name" = "Copy name";
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/el.lproj/MainMenu.strings b/ui/el.lproj/MainMenu.strings
index 3fdafe1..9275c90 100644
--- a/ui/el.lproj/MainMenu.strings
+++ b/ui/el.lproj/MainMenu.strings
@@ -3,13 +3,13 @@
 "5.title" = "Bring All to Front";
 
 /* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
-"19.title" = "Window";
+"19.title" = "Παράθυρο";
 
 /* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
-"23.title" = "Minimize";
+"23.title" = "Ελαχιστοποίηση";
 
 /* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
-"24.title" = "Window";
+"24.title" = "Παράθυρο";
 
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
@@ -51,7 +51,7 @@
 "196.title" = "Start Speaking";
 
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
-"197.title" = "Copy";
+"197.title" = "Αντιγραφή";
 
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
 "198.title" = "Select All";
diff --git a/ui/el.lproj/MigrateRingAccountsWindow.strings b/ui/el.lproj/MigrateRingAccountsWindow.strings
index a820665..a897e50 100644
--- a/ui/el.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/el.lproj/MigrateRingAccountsWindow.strings
@@ -24,7 +24,7 @@
 "PT7-XI-WDR.title" = "OK";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Παράθυρο";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
@@ -45,4 +45,4 @@
 "wmv-sA-Mlh.title" = "Account migration required";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Συνθηματικό...";
diff --git a/ui/el.lproj/PersonLinker.strings b/ui/el.lproj/PersonLinker.strings
new file mode 100644
index 0000000..e4a044c
--- /dev/null
+++ b/ui/el.lproj/PersonLinker.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
+"Jcn-cg-rbR.placeholderString" = "Display Role";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
+"M4f-N4-msh.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
+"a9R-r5-K3w.placeholderString" = "Contact Method";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Last name..."; ObjectID = "cGT-nu-sPa"; */
+"cGT-nu-sPa.placeholderString" = "Επίθετο...";
+
+/* Class = "NSButtonCell"; title = "Add new contact"; ObjectID = "had-9Y-eza"; */
+"had-9Y-eza.title" = "Add new contact";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "qZc-Z2-TpP"; */
+"qZc-Z2-TpP.title" = "Δημιουργία";
+
+/* Class = "NSTextFieldCell"; title = "New Contact"; ObjectID = "v7b-de-MVd"; */
+"v7b-de-MVd.title" = "Νέα επαφή";
+
+/* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
+"vyb-95-XaF.placeholderString" = "First name...";
diff --git a/ui/el.lproj/RegisterNameWindow.strings b/ui/el.lproj/RegisterNameWindow.strings
index d145ffd..117f39f 100644
--- a/ui/el.lproj/RegisterNameWindow.strings
+++ b/ui/el.lproj/RegisterNameWindow.strings
@@ -12,7 +12,7 @@
 "B6x-jj-48R.title" = "Enter your Ring account password";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
-"JWw-7m-ywL.title" = "Window";
+"JWw-7m-ywL.title" = "Παράθυρο";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Just a moment...";
diff --git a/ui/el.lproj/RingWindow.strings b/ui/el.lproj/RingWindow.strings
index b488561..929a327 100644
--- a/ui/el.lproj/RingWindow.strings
+++ b/ui/el.lproj/RingWindow.strings
@@ -3,7 +3,7 @@
 "0MO-4e-8mo.label" = "SmartView";
 
 /* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
-"3Bh-xR-4Vn.title" = "Text";
+"3Bh-xR-4Vn.title" = "Κείμενο";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
 "Ap7-26-S6b.title" = "Text Cell";
@@ -21,7 +21,7 @@
 "GAa-pQ-t4g.title" = "Text Cell";
 
 /* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Title";
+"Pav-Bw-GgK.title" = "Τίτλος";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
 "Q1F-xo-N3e.placeholderString" = "Display Role";
diff --git a/ui/el.lproj/RingWizard.strings b/ui/el.lproj/RingWizard.strings
new file mode 100644
index 0000000..7ff9e8f
--- /dev/null
+++ b/ui/el.lproj/RingWizard.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Καλώς ήλθατε στο Ring";
diff --git a/ui/el.lproj/RingWizardChoose.strings b/ui/el.lproj/RingWizardChoose.strings
index 076c016..4f4fec2 100644
--- a/ui/el.lproj/RingWizardChoose.strings
+++ b/ui/el.lproj/RingWizardChoose.strings
@@ -6,4 +6,4 @@
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+"k1T-a7-yZD.title" = "Δημιουργία λογαριασμού Ring";
diff --git a/ui/el.lproj/RingWizardLinkAccount.strings b/ui/el.lproj/RingWizardLinkAccount.strings
index 24bb2d2..55ab1e1 100644
--- a/ui/el.lproj/RingWizardLinkAccount.strings
+++ b/ui/el.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Ακύρωση";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Επόμενο";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Ακύρωση";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Ακύρωση";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Ακύρωση";
diff --git a/ui/el.lproj/RingWizardNewAccount.strings b/ui/el.lproj/RingWizardNewAccount.strings
index 5b89c52..ba69723 100644
--- a/ui/el.lproj/RingWizardNewAccount.strings
+++ b/ui/el.lproj/RingWizardNewAccount.strings
@@ -1,15 +1,15 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Επιλέξτε το συνθηματικό σας";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
 "BCg-5V-Ek4.placeholderString" = "Mandatory*";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Ακύρωση";
@@ -33,4 +39,4 @@
 "zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
-"zfA-n9-V4X.title" = "Create";
+"zfA-n9-V4X.title" = "Δημιουργία";
diff --git a/ui/el.lproj/VideoPrefs.strings b/ui/el.lproj/VideoPrefs.strings
new file mode 100644
index 0000000..83561b8
--- /dev/null
+++ b/ui/el.lproj/VideoPrefs.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Device"; ObjectID = "170-NP-CSP"; */
+"170-NP-CSP.title" = "Συσκευή";
+
+/* Class = "NSTextFieldCell"; title = "Size"; ObjectID = "4bq-ls-mCp"; */
+"4bq-ls-mCp.title" = "Size";
+
+/* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
+"5Im-df-jdd.title" = "Rate";
+
+/* Class = "NSTextFieldCell"; title = "Selection"; ObjectID = "VqO-Gm-CbB"; */
+"VqO-Gm-CbB.title" = "Επιλογή";
+
+/* Class = "NSTextFieldCell"; title = "Camera"; ObjectID = "YCM-JC-jin"; */
+"YCM-JC-jin.title" = "Κάμερα";
diff --git a/ui/en.lproj/ExportPasswordWindow.strings b/ui/en.lproj/ExportPasswordWindow.strings
deleted file mode 100644
index 4ee2362..0000000
--- a/ui/en.lproj/ExportPasswordWindow.strings
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* Class = "BindingConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
-
-/* Class = "BindingConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
-
-/* Class = "BindingConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
-
-/* Class = "BindingConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
-
-/* Class = "NSTextFieldCell"; title = "To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.";
-
-/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
-
-/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
-"VN1-A3-RIh.title" = "OK";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
-"cSU-aD-OwX.title" = "Cancel";
-
-/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
-
-/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "OK";
-
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
-"vwh-K9-3O9.title" = "Password";
-
-/* Class = "NSTextFieldCell"; title = "Adding new device"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Adding new device";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/en_GB.lproj/AccMedia.strings b/ui/en_GB.lproj/AccMedia.strings
new file mode 100644
index 0000000..dd747fd
--- /dev/null
+++ b/ui/en_GB.lproj/AccMedia.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
+"Bbz-hd-1CE.title" = "Down";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "CO7-VF-04Q"; */
+"CO7-VF-04Q.title" = "Up";
+
+/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
+"KkI-i1-mfY.title" = "Enable ringtones";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
+"MbZ-7X-K5I.title" = "Up";
+
+/* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
+"OSC-eG-2kt.title" = "Video";
+
+/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
+"aMg-uJ-Krx.title" = "Ringtones";
+
+/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
+"biN-bX-qM1.title" = "Codecs";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.placeholderString" = "Frequency";
+
+/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.title" = "details";
+
+/* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
+"gzX-Wc-S6g.title" = "Audio";
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "gza-RF-yKF"; */
+"gza-RF-yKF.title" = "Down";
+
+/* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
+"hHf-uc-NlW.title" = "Play";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
+"pvl-9U-X4l.placeholderString" = "Name";
+
+/* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
+"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activatable and reorderable (first enabled in list preferred)";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
+"rU5-XQ-Ixc.placeholderString" = "Name";
diff --git a/ui/en_GB.lproj/Accounts.strings b/ui/en_GB.lproj/Accounts.strings
new file mode 100644
index 0000000..80c929e
--- /dev/null
+++ b/ui/en_GB.lproj/Accounts.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSTabViewItem"; label = "Ring"; ObjectID = "1HC-kF-Jun"; */
+"1HC-kF-Jun.label" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
+"KoR-IH-uuI.placeholderString" = "Type";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
+"RT7-u6-bhe.label" = "Advanced";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "Vp5-yV-ScC"; */
+"Vp5-yV-ScC.label" = "Security";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
+"ZDh-Jh-hfW.placeholderString" = "Name";
+
+/* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
+"cT1-A5-rbj.label" = "Devices";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
+"eEz-Lm-SOj.placeholderString" = "Status";
+
+/* Class = "NSTabViewItem"; label = "Media"; ObjectID = "lxr-my-vH8"; */
+"lxr-my-vH8.label" = "Media";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
+"tPR-Ac-N5Y.label" = "General";
diff --git a/ui/en_GB.lproj/Localizable.strings b/ui/en_GB.lproj/Localizable.strings
new file mode 100644
index 0000000..cf90208
--- /dev/null
+++ b/ui/en_GB.lproj/Localizable.strings
@@ -0,0 +1,147 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Contextual menu action */
+"Add to contacts" = "Add to contacts";
+
+/* Text shown to the user */
+"Alias : " = "Alias : ";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Contextual menu entry */
+"Backup account" = "Backup account";
+
+/* Contextual menu action */
+"Call number" = "Call number";
+
+/* Open panel title */
+"Choose a CA list" = "Choose a CA list";
+
+/* Open panel title */
+"Choose a certificate" = "Choose a certificate";
+
+/* Open panel title */
+"Choose a directory" = "Choose a directory";
+
+/* Open panel title */
+"Choose a private key file" = "Choose a private key file";
+
+/* Open panel prompt for 'Choose a file' */
+"Choose CA" = "Choose CA";
+
+/* Open panel prompt for 'Choose a directory' */
+"Choose directory" = "Choose directory";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Contextual menu action */
+"Copy name" = "Copy name";
+
+/* Contextual menu action */
+"Copy number" = "Copy number";
+
+/* Contextual menu entry */
+"Create RING Account" = "Create RING Account";
+
+/* Contextual menu entry */
+"Create SIP Account" = "Create SIP Account";
+
+/* Alert dialog title */
+"Entered name not found" = "Entered name not found";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Alert dialo message */
+"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+
+/* Message from {Name} */
+"Message from %@" = "Message from %@";
+
+/* User label */
+"New SIP account" = "New SIP account";
+
+/* Alert dialog title */
+"No valid account available" = "No valid account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
+/* Button label */
+"Pause" = "Pause";
+
+/* Button label */
+"Play" = "Play";
+
+/* Button Action */
+"Refuse" = "Refuse";
+
+/* Contextual menu entry */
+"Remove value" = "Remove value";
+
+/* Show advice to user */
+"Reopen account to see your hash" = "Reopen account to see your hash";
+
+/* Contextual menu entry */
+"Restore account" = "Restore account";
+
+/* Button title */
+"Revise Input" = "Revise Input";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is invalid to be registered */
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Text shown to the user */
+"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Alert dialog title */
+"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+
+/* Title shown to user to concat with Pin */
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+
+/* Text shown to the user */
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Name used when user leave field empty */
+"Unknown" = "Unknown";
+
+/* Error shown to user */
+"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+
diff --git a/ui/en_GB.lproj/PreferencesWindow.strings b/ui/en_GB.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000..70cfcdd
--- /dev/null
+++ b/ui/en_GB.lproj/PreferencesWindow.strings
@@ -0,0 +1,33 @@
+
+/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Ring Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "General";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "General";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "Advanced";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "Advanced";
+
+/* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.label" = "Accounts";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.paletteLabel" = "Accounts";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = "Audio";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = "Audio";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "Video";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "Video";
diff --git a/ui/en_GB.lproj/RingWindow.strings b/ui/en_GB.lproj/RingWindow.strings
new file mode 100644
index 0000000..c50f874
--- /dev/null
+++ b/ui/en_GB.lproj/RingWindow.strings
@@ -0,0 +1,69 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "SmartView";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
+"3Bh-xR-4Vn.title" = "Text";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
+"BfK-c5-B1l.placeholderString" = "details";
+
+/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
+"FlQ-Th-nfO.placeholderString" = "Contact Method";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
+"GAa-pQ-t4g.title" = "Text Cell";
+
+/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
+"Pav-Bw-GgK.title" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
+"Q1F-xo-N3e.placeholderString" = "Display Role";
+
+/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
+"UKP-Et-CT0.placeholderString" = "date";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
+"Wi9-Zd-O1N.label" = "History";
+
+/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+
+/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
+"Zbi-X6-DLT.label" = "Contacts";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
+"bgk-oz-u7n.placeholderString" = "Name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
+"d5o-nL-fRP.placeholderString" = "Category";
+
+/* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
+"gaf-Za-tuc.placeholderString" = "Category";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
+"isD-c6-X5Q.placeholderString" = "details";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "details";
+
+/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
+"sGB-x7-gig.placeholderString" = "n";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
+"uSw-g5-kte.placeholderString" = "Display Role";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "Name, ringID";
diff --git a/ui/eo.lproj/Localizable.strings b/ui/eo.lproj/Localizable.strings
index 1ea9047..0fb883f 100644
--- a/ui/eo.lproj/Localizable.strings
+++ b/ui/eo.lproj/Localizable.strings
@@ -59,10 +59,7 @@
 "Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Ne eblas serĉi";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Envenanta voko de %@";
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Kunhavi";
 
@@ -116,13 +116,13 @@
 "Text Actions" = "Tekstaj Agoj";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "La enigita uzantnomo estas havebla";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "La enigita uzantnomo estas nehavebla";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "La sekvanta konto bezonas migrigon en la novan formaton de Ring kontoj:";
diff --git a/ui/eo.lproj/RingWizardLinkAccount.strings b/ui/eo.lproj/RingWizardLinkAccount.strings
index e892b87..1a2b9a5 100644
--- a/ui/eo.lproj/RingWizardLinkAccount.strings
+++ b/ui/eo.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Rezigni";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Sekva";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Momenton...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Rezigni";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Rezigni";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Rezigni";
diff --git a/ui/eo.lproj/RingWizardNewAccount.strings b/ui/eo.lproj/RingWizardNewAccount.strings
index 6de3599..bdfc585 100644
--- a/ui/eo.lproj/RingWizardNewAccount.strings
+++ b/ui/eo.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Nekonata' se malplena...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Elektu vian uzantnomon";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Rezigni";
diff --git a/ui/es.lproj/AccRing.strings b/ui/es.lproj/AccRing.strings
index 145bc5a..1eb8317 100644
--- a/ui/es.lproj/AccRing.strings
+++ b/ui/es.lproj/AccRing.strings
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "Permisos";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Registrar nombre";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Nombre o sobrenombre";
@@ -30,7 +30,7 @@
 "ddk-1G-0jU.title" = "Usar user-agent personalizado";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
-"fSU-Pc-Y5a.title" = "Blockchain server";
+"fSU-Pc-Y5a.title" = "Servidor de la cadena de bloques";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
 "fX7-9W-XFl.title" = "Permitir llamadas de la lista de contactos";
@@ -42,4 +42,4 @@
 "lHI-bz-ddQ.title" = "UPNP habilitado";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Nombre registrado";
diff --git a/ui/es.lproj/Accounts.strings b/ui/es.lproj/Accounts.strings
index c650337..16e3871 100644
--- a/ui/es.lproj/Accounts.strings
+++ b/ui/es.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Nombre";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Dispositivos";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Estado";
diff --git a/ui/es.lproj/BackupAccountWindow.strings b/ui/es.lproj/BackupAccountWindow.strings
index a5d24d6..968b22b 100644
--- a/ui/es.lproj/BackupAccountWindow.strings
+++ b/ui/es.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Confirmar…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Contraseña...";
@@ -15,10 +15,10 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Dónde";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+"KYZ-TW-44Y.title" = "Elige dónde respaldar tu cuenta. Necesita estar protegida por contraseña.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Ventana";
@@ -42,7 +42,7 @@
 "ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Se produjo un error durante la creación del respaldo";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
diff --git a/ui/es.lproj/ExportPasswordWindow.strings b/ui/es.lproj/ExportPasswordWindow.strings
index 489a5b4..74db925 100644
--- a/ui/es.lproj/ExportPasswordWindow.strings
+++ b/ui/es.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Por favor ingresa la contraseña de tu cuenta de Ring para comenzar";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Ventana";
@@ -27,7 +27,7 @@
 "dfD-AK-f3R.title" = "OK";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "etiqueta de error";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Contraseña";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Conectar otro dispositivo a esta cuenta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Contraseña...";
diff --git a/ui/es.lproj/GeneralPrefs.strings b/ui/es.lproj/GeneralPrefs.strings
index ec99628..acecae4 100644
--- a/ui/es.lproj/GeneralPrefs.strings
+++ b/ui/es.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Guardar mi historial para";
+"3Pb-Ec-zl5.title" = "Guardar mi historial por";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Mensual";
@@ -21,7 +21,7 @@
 "OTl-vx-S43.title" = "(Se aplicacará al reiniciar la aplicación)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Comportamiento";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Verificar actualizaciones automaticamente";
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Actualizar";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Habilitar notificaciones de escritorio";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Mostrar Ring en llamadas entrantes";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "Esto es compartido con tus contactos";
diff --git a/ui/es.lproj/Localizable.strings b/ui/es.lproj/Localizable.strings
index 5e5b2ba..a73a3de 100644
--- a/ui/es.lproj/Localizable.strings
+++ b/ui/es.lproj/Localizable.strings
@@ -1,17 +1,17 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ocurrió un error durante la exportación";
 
 /* Contextual menu action */
 "Add to contacts" = "Agregar a contactos";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Alias:";
 
 /* Error shown to the user */
-"An error occured during the export" = "Ocurrión un error durante la exportación";
+"An error occured during the export" = "Ocurrió un error durante la exportación";
 
 /* Contextual menu entry */
-"Backup account" = "Backup account";
+"Backup account" = "Cuenta de respaldo";
 
 /* Contextual menu action */
 "Call number" = "Llamar";
@@ -41,52 +41,49 @@
 "Copy" = "Copiar";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Copiar nombre";
 
 /* Contextual menu action */
 "Copy number" = "Copiar Número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Crear una cuenta Ring";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "Crear cuenta SIP";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "El nombre ingresado no ha sido encontrado";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Se produjo un error al migrar la cuenta. Presiona OK para reintentarlo o elimina tu cuenta.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "No se pudo llevar a cabo la búsqueda";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Llamada entrante de %@";
 
 /* Alert dialo message */
-"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+"Make sure you have at least one valid account" = "Asegúrate de tener al menos una cuenta válida";
 
 /* Message from {Name} */
 "Message from %@" = "Mensaje de %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Nueva cuenta SIP";
 
 /* Alert dialog title */
-"No valid account available" = "No valid account available";
+"No valid account available" = "No hay una cuenta válida disponible";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "La contraseña y la confirmación no coinciden";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "La contraseña es demasiado corta";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Las contraseñas no coinciden";
 
 /* Button label */
 "Pause" = "Pausar";
@@ -104,10 +101,13 @@
 "Reopen account to see your hash" = "Reabra su cuenta para ver si hash";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Restablecer cuenta";
 
 /* Button title */
-"Revise Input" = "Revise Input";
+"Revise Input" = "Revisar entrada";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Compartir";
@@ -116,32 +116,32 @@
 "Text Actions" = "Acciones del Texto";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "El nombre de usuario tecleado está disponible";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "El nombre de usuario tecleado no está disponible";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Ring account format:" = "La siguiente cuenta debe migrar al nuevo formato de cuenta Ring:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "La contraseña ingresada no puede desbloquear esta cuenta";
 
 /* Alert dialog title */
-"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+"The username you entered do not match a RingID on the network" = "El nombre de usuario ingresado no coincide con un RingID en la red";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Para completar el proceso, necesitas abrir Ring en el nuevo dispositivo y escoger la opción \"Conectar un dispositivo a esta cuenta\". El PIN es válido por 10 minutos.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Para comenzar la migración debes escoger una contraseña para tu cuenta. Esta contraseña cifrará tu clave principal y será necesaria para añadir dispositivos a tu cuenta Ring. Si no estás listo para escoger una contraseña puedes cerrar el programa y retomarlo más adelante.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Desconocido";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Debes migrar tu cuenta antes de exportar";
 
diff --git a/ui/es.lproj/MigrateRingAccountsWindow.strings b/ui/es.lproj/MigrateRingAccountsWindow.strings
index e08056c..387602f 100644
--- a/ui/es.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/es.lproj/MigrateRingAccountsWindow.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "La migración de la cuenta ha sido completada";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "La siguiente cuenta debe ser migrada al nuevo formato de cuentas de Ring:\nAlias:\nID:\nPara proseguir con la migración, debes escoger una contraseña para tu cuenta. Esta contraseña será usada para cifrar tu llave maestra. Será requerida para agregar nuevos dispositivos a tu cuenta de Ring. Si no estás listo para agregar una contraseña, puedes cerrar Ring y continuar la migración más tarde.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Error al migrar la cuenta";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Felicitaciones, tu cuenta ha sido migrada con éxito";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Eliminar esta cuenta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Confirma tu nueva contraseña...";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "OK";
@@ -30,19 +30,19 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Confirmación";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "etiqueta de error";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Migrar";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Contraseña";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Account migration required";
+"wmv-sA-Mlh.title" = "Es precisa la migración de la cuenta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Contraseña...";
diff --git a/ui/es.lproj/RegisterNameWindow.strings b/ui/es.lproj/RegisterNameWindow.strings
index 08eb61b..05cfda4 100644
--- a/ui/es.lproj/RegisterNameWindow.strings
+++ b/ui/es.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Requerido*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Otros usuarios pueden utilizarlo en lugar de tu RingID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Se ha producido un error al registrar tu nombre de usuario";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Ingresa la contraseña de tu cuenta de Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Ventana";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Aguarde por favor...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Nombre de usuario...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Cancelar";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Registrar";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register username on the blockchain";
+"tje-EZ-ZPI.title" = "Registrar el nombre de usuario en la cadena de bloques";
diff --git a/ui/es.lproj/RingWizardChoose.strings b/ui/es.lproj/RingWizardChoose.strings
index 8b3fcdc..5f33ebc 100644
--- a/ui/es.lproj/RingWizardChoose.strings
+++ b/ui/es.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Cancelar";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Conectar este dispositivo a una cuenta";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Crear una cuenta en Ring";
diff --git a/ui/es.lproj/RingWizardLinkAccount.strings b/ui/es.lproj/RingWizardLinkAccount.strings
index 3d54608..eb44aec 100644
--- a/ui/es.lproj/RingWizardLinkAccount.strings
+++ b/ui/es.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Siguiente";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Ha ocurrido un error, por favor revisa tu contraseña y PIN.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Aguarde por favor...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ingresa la contraseña de tu cuenta de Ring";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancelar";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancelar";
diff --git a/ui/es.lproj/RingWizardNewAccount.strings b/ui/es.lproj/RingWizardNewAccount.strings
index 9fdbcce..dad8d16 100644
--- a/ui/es.lproj/RingWizardNewAccount.strings
+++ b/ui/es.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Requerido*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Escoge tu contraseña";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Requerido*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Aguarde por favor...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Repite tu contraseña";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Desconocido' si se deja vacío...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Elije un nombre de usuario para ti";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Tu contraseña debe tener al menos 6 caracteres. Será utilizada para cifrar los datos de tu cuenta y para conectar nuevos dispositivos a tu cuenta.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Crear";
diff --git a/ui/fa_IR.lproj/Localizable.strings b/ui/fa_IR.lproj/Localizable.strings
index 2d47efb..49011c5 100644
--- a/ui/fa_IR.lproj/Localizable.strings
+++ b/ui/fa_IR.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/fa_IR.lproj/RingWizardNewAccount.strings b/ui/fa_IR.lproj/RingWizardNewAccount.strings
index 6d3c0aa..6d8d503 100644
--- a/ui/fa_IR.lproj/RingWizardNewAccount.strings
+++ b/ui/fa_IR.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancel";
diff --git a/ui/fi.lproj/Localizable.strings b/ui/fi.lproj/Localizable.strings
index 88c9c7d..19b8f87 100644
--- a/ui/fi.lproj/Localizable.strings
+++ b/ui/fi.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Saapuva puhelu %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Jako";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/fi.lproj/RingWizardLinkAccount.strings b/ui/fi.lproj/RingWizardLinkAccount.strings
index e4d5a73..b291fc6 100644
--- a/ui/fi.lproj/RingWizardLinkAccount.strings
+++ b/ui/fi.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Peru";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Seuraava";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Hetkinen...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Peru";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Peru";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Peru";
diff --git a/ui/fi.lproj/RingWizardNewAccount.strings b/ui/fi.lproj/RingWizardNewAccount.strings
index 954e76e..7c43065 100644
--- a/ui/fi.lproj/RingWizardNewAccount.strings
+++ b/ui/fi.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Valitse käyttäjänimesi";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Peru";
diff --git a/ui/fr.lproj/Localizable.strings b/ui/fr.lproj/Localizable.strings
index d8b8876..9c890ae 100644
--- a/ui/fr.lproj/Localizable.strings
+++ b/ui/fr.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Échec de la recherche blockchain";
 
-/* Text shown to the user */
-"ID : " = "Identifiant :";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Appel entrant de %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Modifier l'entrée";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Partager";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "Le nom choisi est disponible";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "Le nom entré est invalide. Il doit comprendre au moins 3 caractères et uniquemement des caractères alphanumériques en minuscules. ";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "Le nom choisi n'est pas disponible";
diff --git a/ui/fr.lproj/RingWizardLinkAccount.strings b/ui/fr.lproj/RingWizardLinkAccount.strings
index dcee481..1cf5782 100644
--- a/ui/fr.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Entrer votre code pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Entrer votre code PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuler";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Suivant";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Lier";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "Une erreur est survenue, vérifier votre mot de passe and code pin";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Générer un code PIN";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Saisir un appareil lié avec le compte que vous voulez utiliser ";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Veuillez patienter...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Annuler";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Entrer le mot de passe de votre compte Ring";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "Pour lier cet appareil à un compte, vous devez obtenir un code pin.\nPour générer ce code, allez dans les paramètres du compte Ring à utiliser sur un appareil déjà lié et sélectionner \"Lier un autre appareil avec ce compte\".\nVous obtiendrez le code pin nécessaire.\nThe code pin est valide pendant 10 minutes.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Annuler";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Annuler";
diff --git a/ui/fr.lproj/RingWizardNewAccount.strings b/ui/fr.lproj/RingWizardNewAccount.strings
index f651849..c2c34de 100644
--- a/ui/fr.lproj/RingWizardNewAccount.strings
+++ b/ui/fr.lproj/RingWizardNewAccount.strings
@@ -1,15 +1,15 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "En cochant cette case, enregistrer un nom d'utilisateur sur le réseau Ring. Les autres utilisateurs peuvent l'utiliser pour vous appeller.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoire*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Enregistrer un nom public (expérimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Enregistrer un nom d'utilisateur public (expérimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Coisir un mot de passe";
+"B6x-jj-48R.title" = "Choisir un mot de passe";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
 "BCg-5V-Ek4.placeholderString" = "Obligatoire*";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Inconnu' si non renseigné...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choisissez un nom d'utilisateur";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Créer votre profil";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Créer votre compte";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Entrer votre nom complet";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Annuler";
diff --git a/ui/fr_CA.lproj/Localizable.strings b/ui/fr_CA.lproj/Localizable.strings
index ef1bbad..e11c8bb 100644
--- a/ui/fr_CA.lproj/Localizable.strings
+++ b/ui/fr_CA.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/fr_CA.lproj/RingWizardLinkAccount.strings b/ui/fr_CA.lproj/RingWizardLinkAccount.strings
index b1ee701..e826b2b 100644
--- a/ui/fr_CA.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr_CA.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Next";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancel";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancel";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancel";
diff --git a/ui/fr_CA.lproj/RingWizardNewAccount.strings b/ui/fr_CA.lproj/RingWizardNewAccount.strings
index 68d7938..ae509d6 100644
--- a/ui/fr_CA.lproj/RingWizardNewAccount.strings
+++ b/ui/fr_CA.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancel";
diff --git a/ui/fr_FR.lproj/Localizable.strings b/ui/fr_FR.lproj/Localizable.strings
index ece21ef..f769f14 100644
--- a/ui/fr_FR.lproj/Localizable.strings
+++ b/ui/fr_FR.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/fr_FR.lproj/RingWizardLinkAccount.strings b/ui/fr_FR.lproj/RingWizardLinkAccount.strings
index a7493e3..8a45e6f 100644
--- a/ui/fr_FR.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr_FR.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuler";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Next";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Annuler";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Annuler";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Annuler";
diff --git a/ui/fr_FR.lproj/RingWizardNewAccount.strings b/ui/fr_FR.lproj/RingWizardNewAccount.strings
index cbfc5b2..1ed763e 100644
--- a/ui/fr_FR.lproj/RingWizardNewAccount.strings
+++ b/ui/fr_FR.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Annuler";
diff --git a/ui/he.lproj/Localizable.strings b/ui/he.lproj/Localizable.strings
index 62b0378..f270776 100644
--- a/ui/he.lproj/Localizable.strings
+++ b/ui/he.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/he.lproj/RingWizardLinkAccount.strings b/ui/he.lproj/RingWizardLinkAccount.strings
index 15334e2..01aa1c3 100644
--- a/ui/he.lproj/RingWizardLinkAccount.strings
+++ b/ui/he.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "ביטול";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "קדימה";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "ביטול";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "ביטול";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "ביטול";
diff --git a/ui/he.lproj/RingWizardNewAccount.strings b/ui/he.lproj/RingWizardNewAccount.strings
index f4722ed..1833c67 100644
--- a/ui/he.lproj/RingWizardNewAccount.strings
+++ b/ui/he.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "ביטול";
diff --git a/ui/hr.lproj/Localizable.strings b/ui/hr.lproj/Localizable.strings
index 019509d..724c612 100644
--- a/ui/hr.lproj/Localizable.strings
+++ b/ui/hr.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Dolazni poziv od %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Podijeli";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/hr.lproj/RingWizardLinkAccount.strings b/ui/hr.lproj/RingWizardLinkAccount.strings
index b852cff..554bf28 100644
--- a/ui/hr.lproj/RingWizardLinkAccount.strings
+++ b/ui/hr.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Poništi";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Slijedeće";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Samo trenutak...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Poništi";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Poništi";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Poništi";
diff --git a/ui/hr.lproj/RingWizardNewAccount.strings b/ui/hr.lproj/RingWizardNewAccount.strings
index 2fb250d..c61f452 100644
--- a/ui/hr.lproj/RingWizardNewAccount.strings
+++ b/ui/hr.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Nepoznato' ako je prazno...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Izaberite vaše korisničko ime";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Poništi";
diff --git a/ui/hu.lproj/Localizable.strings b/ui/hu.lproj/Localizable.strings
index 65e64a3..e8f29ec 100644
--- a/ui/hu.lproj/Localizable.strings
+++ b/ui/hu.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/hu.lproj/RingWizardLinkAccount.strings b/ui/hu.lproj/RingWizardLinkAccount.strings
index 50ac247..d9d421c 100644
--- a/ui/hu.lproj/RingWizardLinkAccount.strings
+++ b/ui/hu.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Mégse";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Következő";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Mégse";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Mégse";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Mégse";
diff --git a/ui/hu.lproj/RingWizardNewAccount.strings b/ui/hu.lproj/RingWizardNewAccount.strings
index 33b3d68..d46b001 100644
--- a/ui/hu.lproj/RingWizardNewAccount.strings
+++ b/ui/hu.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Mégse";
diff --git a/ui/id.lproj/Localizable.strings b/ui/id.lproj/Localizable.strings
index 3bf37a8..5e995b2 100644
--- a/ui/id.lproj/Localizable.strings
+++ b/ui/id.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/it.lproj/Localizable.strings b/ui/it.lproj/Localizable.strings
index 37c316a..febf4bb 100644
--- a/ui/it.lproj/Localizable.strings
+++ b/ui/it.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/it.lproj/RingWizardLinkAccount.strings b/ui/it.lproj/RingWizardLinkAccount.strings
index 51d6039..52ee8a3 100644
--- a/ui/it.lproj/RingWizardLinkAccount.strings
+++ b/ui/it.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancella";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Seguente";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancella";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancella";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancella";
diff --git a/ui/it.lproj/RingWizardNewAccount.strings b/ui/it.lproj/RingWizardNewAccount.strings
index cc5b913..6ae7c12 100644
--- a/ui/it.lproj/RingWizardNewAccount.strings
+++ b/ui/it.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancella";
diff --git a/ui/it_IT.lproj/AccAdvanced.strings b/ui/it_IT.lproj/AccAdvanced.strings
index b2ea56d..eb29132 100644
--- a/ui/it_IT.lproj/AccAdvanced.strings
+++ b/ui/it_IT.lproj/AccAdvanced.strings
@@ -30,7 +30,7 @@
 "QS0-TJ-NQh.title" = "Using TURN";
 
 /* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
-"Qf3-E3-5U6.title" = "Published Address";
+"Qf3-E3-5U6.title" = "Indirizzo Pubblico";
 
 /* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
 "XA8-Sy-CYG.title" = "Video RTP port Range";
diff --git a/ui/it_IT.lproj/AccMedia.strings b/ui/it_IT.lproj/AccMedia.strings
index 93fea21..945610b 100644
--- a/ui/it_IT.lproj/AccMedia.strings
+++ b/ui/it_IT.lproj/AccMedia.strings
@@ -39,7 +39,7 @@
 "pvl-9U-X4l.placeholderString" = "Nome";
 
 /* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
-"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
+"rRr-la-G9L.title" = "I codec sono utilizzati quando si stabilisce un collegamento con qualcuno. Sono attivabili e si possono riordinare (il primo selezionato in lista è quello preferito)";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
 "rU5-XQ-Ixc.placeholderString" = "Nome";
diff --git a/ui/it_IT.lproj/AccSecurity.strings b/ui/it_IT.lproj/AccSecurity.strings
new file mode 100644
index 0000000..de153e1
--- /dev/null
+++ b/ui/it_IT.lproj/AccSecurity.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Require certificates for incoming TLS connections"; ObjectID = "1f9-X5-ykb"; */
+"1f9-X5-ykb.title" = "Richiedi certificati per le connessioni TLS in ingresso";
+
+/* Class = "NSButtonCell"; title = "Verify certificates, as a client"; ObjectID = "1xi-9G-zOX"; */
+"1xi-9G-zOX.title" = "Verifica i certificati, come client";
+
+/* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
+"2e5-zS-ghg.title" = "Usa lista di cifratura personalizzata";
+
+/* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
+"5LC-T6-hpk.placeholderString" = "Cella di cifratura";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
+"7c2-kF-dcs.placeholderString" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
+"9Q3-1W-Lh3.title" = "Tempo negoziazione";
+
+/* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
+"Ig9-B1-7N3.title" = "Fallback con RTP";
+
+/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "JHb-iu-ZwI"; */
+"JHb-iu-ZwI.title" = "Chiave privata";
+
+/* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
+"Jqz-P0-zAz.title" = "Certificato Utente";
+
+/* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
+"UxS-et-whJ.title" = "Nome del server per le connessioni TLS in uscita";
+
+/* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
+"YtQ-hx-hih.title" = "Usa SRTP";
+
+/* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
+"oTT-gO-fqM.title" = "Usa trasporto TLS";
+
+/* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "uOE-XA-5gW"; */
+"uOE-XA-5gW.title" = "Metodo del protocollo TLS";
+
+/* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
+"vPF-Rp-aR6.title" = "Elenco Autorità Certificati";
+
+/* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
+"x2s-ov-cVQ.title" = "Verifica certificati in arrivo, come server";
diff --git a/ui/it_IT.lproj/Accounts.strings b/ui/it_IT.lproj/Accounts.strings
index eb1d31f..2ed8f25 100644
--- a/ui/it_IT.lproj/Accounts.strings
+++ b/ui/it_IT.lproj/Accounts.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTabViewItem"; label = "Ring"; ObjectID = "1HC-kF-Jun"; */
-"1HC-kF-Jun.label" = "Ring";
+"1HC-kF-Jun.label" = "Squilla";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
 "KoR-IH-uuI.placeholderString" = "Tipo";
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Nome";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Dispositivi";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Stato";
diff --git a/ui/it_IT.lproj/AudioPrefs.strings b/ui/it_IT.lproj/AudioPrefs.strings
new file mode 100644
index 0000000..10ad14b
--- /dev/null
+++ b/ui/it_IT.lproj/AudioPrefs.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
+"2gZ-Ab-XHf.title" = "Uscita";
+
+/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
+"9HH-Pa-4Aq.title" = "Registrazioni";
+
+/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
+"B0r-wh-wc3.title" = "Dispositivi audio";
+
+/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
+"jeD-Nk-KHA.title" = "Registra sempre";
+
+/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
+"ksV-r2-EVJ.title" = "Salva in";
+
+/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
+"pAA-Iv-EmI.title" = "Silenzia DTMF";
+
+/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
+"x1o-rT-jy6.title" = "Ingresso";
diff --git a/ui/it_IT.lproj/CurrentCall.strings b/ui/it_IT.lproj/CurrentCall.strings
index c92f755..280ec0a 100644
--- a/ui/it_IT.lproj/CurrentCall.strings
+++ b/ui/it_IT.lproj/CurrentCall.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
-"2cB-dz-KYg.ibShadowedToolTip" = "Hang up";
+"2cB-dz-KYg.ibShadowedToolTip" = "Chiudi";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
 "9e8-ji-QId.ibShadowedToolTip" = "Join call";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
-"ChW-kg-Sja.ibShadowedToolTip" = "Transfer";
+"ChW-kg-Sja.ibShadowedToolTip" = "Trasferisci";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
-"D0G-XT-lhI.ibShadowedToolTip" = "Hang up";
+"D0G-XT-lhI.ibShadowedToolTip" = "Chiudi";
 
 /* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "Dqv-um-UUk"; */
 "Dqv-um-UUk.title" = "URI";
@@ -21,10 +21,10 @@
 "G0w-c3-9pJ.ibShadowedToolTip" = "Record";
 
 /* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
-"KPG-pB-gPm.title" = "Answer";
+"KPG-pB-gPm.title" = "Rispondi";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
-"Kjq-iM-NBL.ibShadowedToolTip" = "Hang up";
+"Kjq-iM-NBL.ibShadowedToolTip" = "Chiudi";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
 "LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
@@ -39,7 +39,7 @@
 "X0W-vv-xua.title" = "wants to talk to you!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
-"anb-Y8-JQi.ibShadowedToolTip" = "Hold";
+"anb-Y8-JQi.ibShadowedToolTip" = "Pausa";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
 "fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
@@ -51,7 +51,7 @@
 "kxH-yM-TLd.title" = "Button";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
-"mc3-HV-hek.ibShadowedToolTip" = "Hang up";
+"mc3-HV-hek.ibShadowedToolTip" = "Chiudi";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
 "oRa-pS-HN2.ibShadowedToolTip" = "Record";
@@ -72,7 +72,7 @@
 "ugy-uK-901.placeholderString" = "State";
 
 /* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
-"wRO-X4-7IU.title" = "Answer";
+"wRO-X4-7IU.title" = "Rispondi";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
 "yZ6-1A-ZLT.title" = "wants to talk with you!";
diff --git a/ui/it_IT.lproj/ExportPasswordWindow.strings b/ui/it_IT.lproj/ExportPasswordWindow.strings
index 028416e..8e99f57 100644
--- a/ui/it_IT.lproj/ExportPasswordWindow.strings
+++ b/ui/it_IT.lproj/ExportPasswordWindow.strings
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Password";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Collega un altro dispositivo a questo account";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/it_IT.lproj/Localizable.strings b/ui/it_IT.lproj/Localizable.strings
index ed5fbcf..e520a9c 100644
--- a/ui/it_IT.lproj/Localizable.strings
+++ b/ui/it_IT.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
@@ -140,7 +140,7 @@
 "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
 
 /* Name used when user leave field empty */
-"Unknown" = "Unknown";
+"Unknown" = "Sconosciuto";
 
 /* Error shown to user */
 "You have to migrate your account before exporting" = "You have to migrate your account before exporting";
diff --git a/ui/it_IT.lproj/MainMenu.strings b/ui/it_IT.lproj/MainMenu.strings
index 5de32e4..8864d9e 100644
--- a/ui/it_IT.lproj/MainMenu.strings
+++ b/ui/it_IT.lproj/MainMenu.strings
@@ -15,13 +15,13 @@
 "29.title" = "AMainMenu";
 
 /* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Ring";
+"56.title" = "Squilla";
 
 /* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Ring";
+"57.title" = "Squilla";
 
 /* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "About Ring";
+"58.title" = "Informazioni su Ring";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferences…";
diff --git a/ui/it_IT.lproj/RegisterNameWindow.strings b/ui/it_IT.lproj/RegisterNameWindow.strings
index 26291e4..55e8506 100644
--- a/ui/it_IT.lproj/RegisterNameWindow.strings
+++ b/ui/it_IT.lproj/RegisterNameWindow.strings
@@ -30,7 +30,7 @@
 "fOn-FV-2x8.title" = "Ok";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
-"lT3-Bh-MnL.title" = "Register";
+"lT3-Bh-MnL.title" = "Salva";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
 "tje-EZ-ZPI.title" = "Register username on the blockchain";
diff --git a/ui/it_IT.lproj/RingWindow.strings b/ui/it_IT.lproj/RingWindow.strings
index 44dc871..e1c95bb 100644
--- a/ui/it_IT.lproj/RingWindow.strings
+++ b/ui/it_IT.lproj/RingWindow.strings
@@ -12,7 +12,7 @@
 "BfK-c5-B1l.placeholderString" = "dettagli";
 
 /* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+"F0z-JX-Cv5.title" = "Squilla";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -30,7 +30,7 @@
 "UKP-Et-CT0.placeholderString" = "date";
 
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
-"Wi9-Zd-O1N.label" = "History";
+"Wi9-Zd-O1N.label" = "Cronologia";
 
 /* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
 "Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
diff --git a/ui/it_IT.lproj/RingWizard.strings b/ui/it_IT.lproj/RingWizard.strings
new file mode 100644
index 0000000..c49d0dc
--- /dev/null
+++ b/ui/it_IT.lproj/RingWizard.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Benvenuto su Ring";
diff --git a/ui/it_IT.lproj/RingWizardChoose.strings b/ui/it_IT.lproj/RingWizardChoose.strings
index 26dedba..ddf9276 100644
--- a/ui/it_IT.lproj/RingWizardChoose.strings
+++ b/ui/it_IT.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Annulla";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Collega questo dispositivo ad un account";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+"k1T-a7-yZD.title" = "Crea un account Ring";
diff --git a/ui/it_IT.lproj/RingWizardLinkAccount.strings b/ui/it_IT.lproj/RingWizardLinkAccount.strings
index 436d457..0664e08 100644
--- a/ui/it_IT.lproj/RingWizardLinkAccount.strings
+++ b/ui/it_IT.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annulla";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Next";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Annulla";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Annulla";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Annulla";
diff --git a/ui/it_IT.lproj/RingWizardNewAccount.strings b/ui/it_IT.lproj/RingWizardNewAccount.strings
index c0766f5..64bbebb 100644
--- a/ui/it_IT.lproj/RingWizardNewAccount.strings
+++ b/ui/it_IT.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Annulla";
diff --git a/ui/ja.lproj/AccAdvanced.strings b/ui/ja.lproj/AccAdvanced.strings
new file mode 100644
index 0000000..c9af2bb
--- /dev/null
+++ b/ui/ja.lproj/AccAdvanced.strings
@@ -0,0 +1,72 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "0eY-9x-bAr"; */
+"0eY-9x-bAr.placeholderString" = "サーバーURL...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
+"6u9-cM-ep0.placeholderString" = "レルム...";
+
+/* Class = "NSButtonCell"; title = "Same as local parameters"; ObjectID = "Atv-t7-5YJ"; */
+"Atv-t7-5YJ.title" = "ローカルパラメーターと同じ";
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "FQ4-fp-Pxj"; */
+"FQ4-fp-Pxj.title" = "最小";
+
+/* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Jho-hi-Mvg"; */
+"Jho-hi-Mvg.title" = "Audio RTPポートの範囲";
+
+/* Class = "NSTextFieldCell"; title = "Network Interface"; ObjectID = "K9I-vh-jeu"; */
+"K9I-vh-jeu.title" = "ネットワークインターフェイス";
+
+/* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
+"OL5-DI-aCq.title" = "確立したアドレスとポート番号を設定";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
+"OR2-la-DUE.placeholderString" = "パスワード...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "username..."; ObjectID = "P7k-xH-2mr"; */
+"P7k-xH-2mr.placeholderString" = "ユーザー名...";
+
+/* Class = "NSButtonCell"; title = "Using TURN"; ObjectID = "QS0-TJ-NQh"; */
+"QS0-TJ-NQh.title" = "TURNを使用中";
+
+/* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
+"Qf3-E3-5U6.title" = "発行されたアドレス";
+
+/* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
+"XA8-Sy-CYG.title" = "Video RTPポートの範囲";
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "a6W-wm-OmC"; */
+"a6W-wm-OmC.title" = "最小";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "dbq-qU-93x"; */
+"dbq-qU-93x.title" = "最大";
+
+/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "fB0-X8-GXk"; */
+"fB0-X8-GXk.title" = "ラジオ";
+
+/* Class = "NSTextFieldCell"; title = "Registration expire"; ObjectID = "fCd-4d-sP0"; */
+"fCd-4d-sP0.title" = "Registration expire";
+
+/* Class = "NSButtonCell"; title = "Using STUN"; ObjectID = "gVd-Dw-1B4"; */
+"gVd-Dw-1B4.title" = "STUNを使用";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "oa2-Pe-6Uw"; */
+"oa2-Pe-6Uw.title" = "最大";
+
+/* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "sTk-1C-1KO"; */
+"sTk-1C-1KO.title" = "アドレス";
+
+/* Class = "NSTextFieldCell"; title = "Local port"; ObjectID = "shs-Xm-qnY"; */
+"shs-Xm-qnY.title" = "ローカルポート";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
+"uzg-09-8vi.placeholderString" = "サーバーURL...";
+
+/* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "wl8-YK-M76"; */
+"wl8-YK-M76.title" = "ポート番号";
+
+/* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "xGw-j0-4ID"; */
+"xGw-j0-4ID.title" = "秒";
+
+/* Class = "NSTextFieldCell"; title = "Registration"; ObjectID = "yB5-ET-gBL"; */
+"yB5-ET-gBL.title" = "登録";
diff --git a/ui/ja.lproj/AccGeneral.strings b/ui/ja.lproj/AccGeneral.strings
new file mode 100644
index 0000000..17bb0c9
--- /dev/null
+++ b/ui/ja.lproj/AccGeneral.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSButtonCell"; title = "RTP"; ObjectID = "0D8-im-2uM"; */
+"0D8-im-2uM.title" = "RTP";
+
+/* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
+"21g-eQ-0Sc.title" = "Try Registration";
+
+/* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
+"3uy-g0-eCm.title" = "Server hostname";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
+"4Nm-hw-379.title" = "ユーザー名";
+
+/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
+"KSm-ZB-4aj.title" = "カスタムユーザーエージェントを使用";
+
+/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
+"Mxv-Rt-ON6.title" = "別名";
+
+/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
+"N5h-tI-ZLz.title" = "UPnP有効";
+
+/* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
+"Rg8-qR-h1X.title" = "DTMF tone type";
+
+/* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
+"UXm-73-BNy.title" = "パスワードを表示";
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "WCR-30-BX0"; */
+"WCR-30-BX0.title" = "Password:";
+
+/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
+"YMy-QE-7A3.title" = "自動応答呼び出し";
+
+/* Class = "NSButtonCell"; title = "SIP"; ObjectID = "jch-Qt-hTO"; */
+"jch-Qt-hTO.title" = "SIP";
+
+/* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
+"mlN-YG-fLS.title" = "Parameters";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
+"upU-sL-9i3.title" = "アカウント";
diff --git a/ui/ja.lproj/AccMedia.strings b/ui/ja.lproj/AccMedia.strings
new file mode 100644
index 0000000..fe27409
--- /dev/null
+++ b/ui/ja.lproj/AccMedia.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
+"Bbz-hd-1CE.title" = "下へ移動";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "CO7-VF-04Q"; */
+"CO7-VF-04Q.title" = "上へ移動";
+
+/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
+"KkI-i1-mfY.title" = "着信音を有効化";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
+"MbZ-7X-K5I.title" = "上へ移動";
+
+/* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
+"OSC-eG-2kt.title" = "動画";
+
+/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
+"aMg-uJ-Krx.title" = "着信音";
+
+/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
+"biN-bX-qM1.title" = "コーデック";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.placeholderString" = "周波数";
+
+/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.title" = "詳細";
+
+/* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
+"gzX-Wc-S6g.title" = "音声";
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "gza-RF-yKF"; */
+"gza-RF-yKF.title" = "下へ移動";
+
+/* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
+"hHf-uc-NlW.title" = "再生";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
+"pvl-9U-X4l.placeholderString" = "名前";
+
+/* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
+"rRr-la-G9L.title" = "コーデックは誰かと通信を確立した時に使用されます。これらは有効にしたり並べ替えたりできます (リストで有効にされたものが優先されます)";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
+"rU5-XQ-Ixc.placeholderString" = "名前";
diff --git a/ui/ja.lproj/AccRing.strings b/ui/ja.lproj/AccRing.strings
new file mode 100644
index 0000000..52a141d
--- /dev/null
+++ b/ui/ja.lproj/AccRing.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
+"1Sx-Et-CDM.title" = "アカウント";
+
+/* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
+"8WI-fC-Due.title" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
+"B6b-iB-REZ.title" = "ブートストラップサーバー";
+
+/* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
+"EDd-FX-wcz.title" = "許可設定";
+
+/* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
+"G8M-go-xvD.title" = "登録名";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
+"HN3-i9-zmw.placeholderString" = "名前またはニックネーム...";
+
+/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "OeY-na-0YT"; */
+"OeY-na-0YT.title" = "自動応答発信";
+
+/* Class = "NSButtonCell"; title = "Allow calls from peers in your call history"; ObjectID = "PaC-xE-SHA"; */
+"PaC-xE-SHA.title" = "発信履歴内のピアからの着信を許可";
+
+/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Wzq-V2-YLU"; */
+"Wzq-V2-YLU.title" = "別名";
+
+/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
+"ddk-1G-0jU.title" = "カスタムユーザーエージェントを使用";
+
+/* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
+"fSU-Pc-Y5a.title" = "ブロックチェーンサーバー";
+
+/* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
+"fX7-9W-XFl.title" = "連絡先リスト内の相手からの着信を許可";
+
+/* Class = "NSButtonCell"; title = "Allow calls from unknown peers"; ObjectID = "kmI-jb-aal"; */
+"kmI-jb-aal.title" = "未知の相手からの着信を許可";
+
+/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
+"lHI-bz-ddQ.title" = "UPnP有効";
+
+/* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
+"sBB-y7-xhL.title" = "登録された名前";
diff --git a/ui/ja.lproj/AccSecurity.strings b/ui/ja.lproj/AccSecurity.strings
new file mode 100644
index 0000000..763d372
--- /dev/null
+++ b/ui/ja.lproj/AccSecurity.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Require certificates for incoming TLS connections"; ObjectID = "1f9-X5-ykb"; */
+"1f9-X5-ykb.title" = "Require certificates for incoming TLS connections";
+
+/* Class = "NSButtonCell"; title = "Verify certificates, as a client"; ObjectID = "1xi-9G-zOX"; */
+"1xi-9G-zOX.title" = "Verify certificates, as a client";
+
+/* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
+"2e5-zS-ghg.title" = "Use custom cipher list";
+
+/* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
+"5LC-T6-hpk.placeholderString" = "cipher cell";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
+"7c2-kF-dcs.placeholderString" = "パスワード...";
+
+/* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
+"9Q3-1W-Lh3.title" = "Negotiation timeout";
+
+/* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
+"Ig9-B1-7N3.title" = "Fallback on RTP";
+
+/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "JHb-iu-ZwI"; */
+"JHb-iu-ZwI.title" = "Private key";
+
+/* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
+"Jqz-P0-zAz.title" = "User Certificate";
+
+/* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
+"UxS-et-whJ.title" = "Server name instance for outgoing TLS connection";
+
+/* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
+"YtQ-hx-hih.title" = "Use SRTP";
+
+/* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
+"oTT-gO-fqM.title" = "Use TLS transport";
+
+/* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "uOE-XA-5gW"; */
+"uOE-XA-5gW.title" = "TLS protocol method";
+
+/* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
+"vPF-Rp-aR6.title" = "Certificate Authority list";
+
+/* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
+"x2s-ov-cVQ.title" = "Verify incoming certificates, as a server";
diff --git a/ui/ja.lproj/Accounts.strings b/ui/ja.lproj/Accounts.strings
new file mode 100644
index 0000000..cdae72e
--- /dev/null
+++ b/ui/ja.lproj/Accounts.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSTabViewItem"; label = "Ring"; ObjectID = "1HC-kF-Jun"; */
+"1HC-kF-Jun.label" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
+"KoR-IH-uuI.placeholderString" = "種類";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
+"RT7-u6-bhe.label" = "詳細";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "Vp5-yV-ScC"; */
+"Vp5-yV-ScC.label" = "セキュリティ";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
+"ZDh-Jh-hfW.placeholderString" = "名前";
+
+/* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
+"cT1-A5-rbj.label" = "端末";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
+"eEz-Lm-SOj.placeholderString" = "状態";
+
+/* Class = "NSTabViewItem"; label = "Media"; ObjectID = "lxr-my-vH8"; */
+"lxr-my-vH8.label" = "メディア";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
+"tPR-Ac-N5Y.label" = "全般";
diff --git a/ui/ja.lproj/AudioPrefs.strings b/ui/ja.lproj/AudioPrefs.strings
new file mode 100644
index 0000000..1d0ede5
--- /dev/null
+++ b/ui/ja.lproj/AudioPrefs.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
+"2gZ-Ab-XHf.title" = "Output";
+
+/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
+"9HH-Pa-4Aq.title" = "記録";
+
+/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
+"B0r-wh-wc3.title" = "Audio devices";
+
+/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
+"jeD-Nk-KHA.title" = "Always recording";
+
+/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
+"ksV-r2-EVJ.title" = "Save in";
+
+/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
+"pAA-Iv-EmI.title" = "Mute DTMF";
+
+/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
+"x1o-rT-jy6.title" = "Input";
diff --git a/ui/ja.lproj/BackupAccountWindow.strings b/ui/ja.lproj/BackupAccountWindow.strings
new file mode 100644
index 0000000..4cfb183
--- /dev/null
+++ b/ui/ja.lproj/BackupAccountWindow.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
+"5Qf-em-tN4.placeholderString" = "確認...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "パスワード...";
+
+/* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
+"9h8-GU-av4.title" = "場所";
+
+/* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
+"KYZ-TW-44Y.title" = "アカウントの保存先を選んでください。これは、パスワードで保護する必要があります。";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "ウィンドウ";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "キャンセル";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "パスワード...";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.title" = "バックアップの保存中にエラーが発生しました";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "パスワード";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "パスワード...";
diff --git a/ui/ja.lproj/CertificateWindow.strings b/ui/ja.lproj/CertificateWindow.strings
new file mode 100644
index 0000000..80db271
--- /dev/null
+++ b/ui/ja.lproj/CertificateWindow.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Certificate information"; ObjectID = "BrE-Hz-sVE"; */
+"BrE-Hz-sVE.title" = "証明書情報";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "G7a-wY-fOS"; */
+"G7a-wY-fOS.title" = "テキストセル";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "Od1-pH-TGO"; */
+"Od1-pH-TGO.title" = "Table View Cell";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "ウィンドウ";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RMj-fd-OsX"; */
+"RMj-fd-OsX.title" = "テキストセル";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "khh-uZ-Keh"; */
+"khh-uZ-Keh.title" = "Table View Cell";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "x6p-u4-4Ot"; */
+"x6p-u4-4Ot.title" = "OK";
diff --git a/ui/ja.lproj/Conversation.strings b/ui/ja.lproj/Conversation.strings
new file mode 100644
index 0000000..99575ed
--- /dev/null
+++ b/ui/ja.lproj/Conversation.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
+"FgV-iF-gGQ.title" = "テキストセル";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
+"HnC-1N-RmR.placeholderString" = "タイトル";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
+"Ilz-7v-2fr.placeholderString" = "メッセージを送信";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "メッセージを送信";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "メッセージを送信";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "メッセージを送信";
+
+/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
+"bsl-nv-Wqq.title" = "会話を始めましょう";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "記録";
diff --git a/ui/ja.lproj/CurrentCall.strings b/ui/ja.lproj/CurrentCall.strings
new file mode 100644
index 0000000..57eec6a
--- /dev/null
+++ b/ui/ja.lproj/CurrentCall.strings
@@ -0,0 +1,81 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
+"2cB-dz-KYg.ibShadowedToolTip" = "通話終了";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
+"9e8-ji-QId.ibShadowedToolTip" = "通話に参加";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
+"ChW-kg-Sja.ibShadowedToolTip" = "転送";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
+"D0G-XT-lhI.ibShadowedToolTip" = "通話終了";
+
+/* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "Dqv-um-UUk"; */
+"Dqv-um-UUk.title" = "URI";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
+"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
+"G0w-c3-9pJ.ibShadowedToolTip" = "記録";
+
+/* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
+"KPG-pB-gPm.title" = "応答";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
+"Kjq-iM-NBL.ibShadowedToolTip" = "通話終了";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
+"LVS-yZ-98V.ibShadowedToolTip" = "動画オフ";
+
+/* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
+"TlL-HO-5Ey.title" = "キャンセル";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
+"VVL-A4-r7n.ibShadowedToolTip" = "記録";
+
+/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
+"X0W-vv-xua.title" = "wants to talk to you!";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
+"anb-Y8-JQi.ibShadowedToolTip" = "保留";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
+"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
+"kIZ-mf-moM.ibShadowedToolTip" = "Add participant";
+
+/* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
+"kxH-yM-TLd.title" = "ボタン";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
+"mc3-HV-hek.ibShadowedToolTip" = "通話終了";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
+"oRa-pS-HN2.ibShadowedToolTip" = "記録";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
+"osk-LS-0Qg.placeholderString" = "個人名";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
+"qgD-3D-nD5.ibShadowedToolTip" = "ピックアップ";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
+"tQl-cT-0Lb.ibShadowedToolTip" = "音声オフ";
+
+/* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
+"tjM-py-p4V.title" = "無視";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
+"ugy-uK-901.placeholderString" = "状態";
+
+/* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
+"wRO-X4-7IU.title" = "応答";
+
+/* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
+"yZ6-1A-ZLT.title" = "wants to talk with you!";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
+"zsO-T7-9yi.placeholderString" = "時刻";
diff --git a/ui/ja.lproj/ExportPasswordWindow.strings b/ui/ja.lproj/ExportPasswordWindow.strings
new file mode 100644
index 0000000..8bd579b
--- /dev/null
+++ b/ui/ja.lproj/ExportPasswordWindow.strings
@@ -0,0 +1,42 @@
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "パスワード...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "パスワード...";
+
+/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "開始するにはRingアカウントのパスワードを入力してください";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "ウィンドウ";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "キャンセル";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
+"dfD-AK-f3R.title" = "OK";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "エラーラベル";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "パスワード";
+
+/* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "別のデバイスをこのアカウントへリンク";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "パスワード...";
diff --git a/ui/ja.lproj/GeneralPrefs.strings b/ui/ja.lproj/GeneralPrefs.strings
new file mode 100644
index 0000000..af5b761
--- /dev/null
+++ b/ui/ja.lproj/GeneralPrefs.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
+"3Pb-Ec-zl5.title" = "Keep my history for";
+
+/* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
+"42E-UY-qlP.title" = "毎月";
+
+/* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
+"AId-am-73Q.title" = "毎週";
+
+/* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
+"JvS-c4-OeT.title" = "30";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Profile"; ObjectID = "MV1-AC-qE7"; */
+"MV1-AC-qE7.ibShadowedToolTip" = "プロフィール";
+
+/* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
+"O2C-xR-mHF.title" = "起動時に実行";
+
+/* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
+"OTl-vx-S43.title" = "(アプリケーションの再開時に適用されます)";
+
+/* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
+"Rzy-Gh-3wQ.title" = "動作";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
+"T3a-yx-ZaW.title" = "更新を自動的に確認する";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
+"Thg-oC-5Qw.title" = "プロフィール";
+
+/* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
+"cB6-4m-9MU.title" = "毎日";
+
+/* Class = "NSButtonCell"; title = "Clear History"; ObjectID = "cd5-9L-Bbb"; */
+"cd5-9L-Bbb.title" = "履歴を消去";
+
+/* Class = "NSTextFieldCell"; title = "days"; ObjectID = "e5K-l0-Nfw"; */
+"e5K-l0-Nfw.title" = "日";
+
+/* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
+"mbu-TH-bs8.title" = "毎時";
+
+/* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
+"r4u-t3-gBc.title" = "更新";
+
+/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
+"uCL-ye-tsv.title" = "デスクトップ通知を有効化";
+
+/* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
+"uYI-hA-JHk.title" = "着信時にRingを最前面に表示する";
+
+/* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
+"vbU-2S-O58.title" = "This is shared with your contacts ";
diff --git a/ui/ja.lproj/Localizable.strings b/ui/ja.lproj/Localizable.strings
new file mode 100644
index 0000000..984de3b
--- /dev/null
+++ b/ui/ja.lproj/Localizable.strings
@@ -0,0 +1,147 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Contextual menu action */
+"Add to contacts" = "Add to contacts";
+
+/* Text shown to the user */
+"Alias : " = "Alias : ";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Contextual menu entry */
+"Backup account" = "Backup account";
+
+/* Contextual menu action */
+"Call number" = "Call number";
+
+/* Open panel title */
+"Choose a CA list" = "Choose a CA list";
+
+/* Open panel title */
+"Choose a certificate" = "Choose a certificate";
+
+/* Open panel title */
+"Choose a directory" = "Choose a directory";
+
+/* Open panel title */
+"Choose a private key file" = "Choose a private key file";
+
+/* Open panel prompt for 'Choose a file' */
+"Choose CA" = "Choose CA";
+
+/* Open panel prompt for 'Choose a directory' */
+"Choose directory" = "Choose directory";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Contextual menu action */
+"Copy name" = "Copy name";
+
+/* Contextual menu action */
+"Copy number" = "Copy number";
+
+/* Contextual menu entry */
+"Create RING Account" = "Create RING Account";
+
+/* Contextual menu entry */
+"Create SIP Account" = "Create SIP Account";
+
+/* Alert dialog title */
+"Entered name not found" = "Entered name not found";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Alert dialo message */
+"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+
+/* Message from {Name} */
+"Message from %@" = "Message from %@";
+
+/* User label */
+"New SIP account" = "New SIP account";
+
+/* Alert dialog title */
+"No valid account available" = "No valid account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "パスワードが一致しません";
+
+/* Button label */
+"Pause" = "Pause";
+
+/* Button label */
+"Play" = "再生";
+
+/* Button Action */
+"Refuse" = "Refuse";
+
+/* Contextual menu entry */
+"Remove value" = "Remove value";
+
+/* Show advice to user */
+"Reopen account to see your hash" = "Reopen account to see your hash";
+
+/* Contextual menu entry */
+"Restore account" = "Restore account";
+
+/* Button title */
+"Revise Input" = "Revise Input";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is invalid to be registered */
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Text shown to the user */
+"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Alert dialog title */
+"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+
+/* Title shown to user to concat with Pin */
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+
+/* Text shown to the user */
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Name used when user leave field empty */
+"Unknown" = "不明";
+
+/* Error shown to user */
+"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+
diff --git a/ui/ja.lproj/MainMenu.strings b/ui/ja.lproj/MainMenu.strings
new file mode 100644
index 0000000..2fbc0ba
--- /dev/null
+++ b/ui/ja.lproj/MainMenu.strings
@@ -0,0 +1,213 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Bring All to Front";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "ウィンドウ";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimize";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "ウィンドウ";
+
+/* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
+"29.title" = "AMainMenu";
+
+/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
+"56.title" = "Ring";
+
+/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
+"57.title" = "Ring";
+
+/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
+"58.title" = "Ring について";
+
+/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
+"129.title" = "Preferences…";
+
+/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
+"130.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
+"131.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
+"134.title" = "Hide Ring";
+
+/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
+"136.title" = "Quit Ring";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Hide Others";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Show All";
+
+/* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
+"195.title" = "Stop Speaking";
+
+/* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
+"196.title" = "Start Speaking";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
+"197.title" = "Copy";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
+"198.title" = "Select All";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
+"199.title" = "Cut";
+
+/* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
+"200.title" = "Spelling and Grammar";
+
+/* Class = "NSMenuItem"; title = "Check Document Now"; ObjectID = "201"; */
+"201.title" = "Check Document Now";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
+"202.title" = "削除";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
+"203.title" = "Paste";
+
+/* Class = "NSMenuItem"; title = "Show Spelling and Grammar"; ObjectID = "204"; */
+"204.title" = "Show Spelling and Grammar";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
+"205.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */
+"207.title" = "Undo";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "208"; */
+"208.title" = "Find Next";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
+"209.title" = "Find…";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "210"; */
+"210.title" = "Jump to Selection";
+
+/* Class = "NSMenuItem"; title = "Speech"; ObjectID = "211"; */
+"211.title" = "Speech";
+
+/* Class = "NSMenu"; title = "Speech"; ObjectID = "212"; */
+"212.title" = "Speech";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "213"; */
+"213.title" = "Find Previous";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
+"215.title" = "Redo";
+
+/* Class = "NSMenuItem"; title = "Spelling and Grammar"; ObjectID = "216"; */
+"216.title" = "Spelling and Grammar";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
+"217.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "218"; */
+"218.title" = "Find";
+
+/* Class = "NSMenuItem"; title = "Check Spelling While Typing"; ObjectID = "219"; */
+"219.title" = "Check Spelling While Typing";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "220"; */
+"220.title" = "Find";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "221"; */
+"221.title" = "Use Selection for Find";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
+"239.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
+"295.title" = "View";
+
+/* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
+"296.title" = "View";
+
+/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
+"297.title" = "Show Toolbar";
+
+/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
+"298.title" = "Customize Toolbar…";
+
+/* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "346"; */
+"346.title" = "Check Grammar With Spelling";
+
+/* Class = "NSMenuItem"; title = "Substitutions"; ObjectID = "348"; */
+"348.title" = "Substitutions";
+
+/* Class = "NSMenu"; title = "Substitutions"; ObjectID = "349"; */
+"349.title" = "Substitutions";
+
+/* Class = "NSMenuItem"; title = "Smart Copy/Paste"; ObjectID = "350"; */
+"350.title" = "Smart Copy/Paste";
+
+/* Class = "NSMenuItem"; title = "Smart Quotes"; ObjectID = "351"; */
+"351.title" = "Smart Quotes";
+
+/* Class = "NSMenuItem"; title = "Smart Links"; ObjectID = "354"; */
+"354.title" = "Smart Links";
+
+/* Class = "NSMenuItem"; title = "Transformations"; ObjectID = "450"; */
+"450.title" = "Transformations";
+
+/* Class = "NSMenu"; title = "Transformations"; ObjectID = "451"; */
+"451.title" = "Transformations";
+
+/* Class = "NSMenuItem"; title = "Make Upper Case"; ObjectID = "452"; */
+"452.title" = "Make Upper Case";
+
+/* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
+"454.title" = "Correct Spelling Automatically";
+
+/* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
+"457.title" = "Show Substitutions";
+
+/* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
+"460.title" = "Smart Dashes";
+
+/* Class = "NSMenuItem"; title = "Text Replacement"; ObjectID = "462"; */
+"462.title" = "Text Replacement";
+
+/* Class = "NSMenuItem"; title = "Make Lower Case"; ObjectID = "465"; */
+"465.title" = "Make Lower Case";
+
+/* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
+"466.title" = "Capitalize";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
+"485.title" = "Paste and Match Style";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
+"490.title" = "Help";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
+"491.title" = "Help";
+
+/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
+"492.title" = "Ring Help";
+
+/* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
+"534.title" = "Find and Replace…";
+
+/* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
+"593.title" = "Check for Update...";
+
+/* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
+"12w-Fz-Scs.title" = "表示";
+
+/* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
+"1fJ-em-1ww.title" = "表示";
+
+/* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
+"GTY-d8-NBf.title" = "Show recent";
+
+/* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
+"GU3-tt-2de.title" = "Show contacts";
+
+/* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
+"Oco-m7-LtS.title" = "Show call history";
diff --git a/ui/ja.lproj/MigrateRingAccountsWindow.strings b/ui/ja.lproj/MigrateRingAccountsWindow.strings
new file mode 100644
index 0000000..80242a4
--- /dev/null
+++ b/ui/ja.lproj/MigrateRingAccountsWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
+"1ob-x1-u74.title" = "Account migration completed";
+
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
+"8K3-9Z-MKH.title" = "Account migration error";
+
+/* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
+"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
+"ITE-yD-CTb.title" = "Delete this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
+"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
+"PT7-XI-WDR.title" = "OK";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "ウィンドウ";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
+"aOa-1q-AZe.title" = "Confirmation";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "エラーラベル";
+
+/* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Migrate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "パスワード";
+
+/* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Account migration required";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "パスワード...";
diff --git a/ui/ja.lproj/PersonLinker.strings b/ui/ja.lproj/PersonLinker.strings
new file mode 100644
index 0000000..72d7e7a
--- /dev/null
+++ b/ui/ja.lproj/PersonLinker.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
+"Jcn-cg-rbR.placeholderString" = "Display Role";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
+"M4f-N4-msh.title" = "テキストセル";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
+"a9R-r5-K3w.placeholderString" = "問い合わせ方法";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Last name..."; ObjectID = "cGT-nu-sPa"; */
+"cGT-nu-sPa.placeholderString" = "Last name...";
+
+/* Class = "NSButtonCell"; title = "Add new contact"; ObjectID = "had-9Y-eza"; */
+"had-9Y-eza.title" = "Add new contact";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "qZc-Z2-TpP"; */
+"qZc-Z2-TpP.title" = "Create";
+
+/* Class = "NSTextFieldCell"; title = "New Contact"; ObjectID = "v7b-de-MVd"; */
+"v7b-de-MVd.title" = "New Contact";
+
+/* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
+"vyb-95-XaF.placeholderString" = "First name...";
diff --git a/ui/ja.lproj/PreferencesWindow.strings b/ui/ja.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000..8ae5b8e
--- /dev/null
+++ b/ui/ja.lproj/PreferencesWindow.strings
@@ -0,0 +1,33 @@
+
+/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Ring Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "全般";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "全般";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "詳細";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "詳細";
+
+/* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.label" = "アカウント";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.paletteLabel" = "アカウント";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = "音声";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = "音声";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "ビデオ";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "ビデオ";
diff --git a/ui/ja.lproj/RegisterNameWindow.strings b/ui/ja.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000..5e3835b
--- /dev/null
+++ b/ui/ja.lproj/RegisterNameWindow.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "ユーザー名の登録中にエラーが発生しました";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Ring アカウントのパスワードを入力してください";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "ウィンドウ";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "少しお待ちください...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "ユーザー名...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "キャンセル";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "キャンセル";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "登録";
+
+/* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "ブロックチェーンにユーザー名を登録します";
diff --git a/ui/ja.lproj/RingWindow.strings b/ui/ja.lproj/RingWindow.strings
new file mode 100644
index 0000000..b1d8da8
--- /dev/null
+++ b/ui/ja.lproj/RingWindow.strings
@@ -0,0 +1,69 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "スマートビュー";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
+"3Bh-xR-4Vn.title" = "テキスト";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "テキストセル";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
+"BfK-c5-B1l.placeholderString" = "詳細";
+
+/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
+"FlQ-Th-nfO.placeholderString" = "問い合わせ方法";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
+"GAa-pQ-t4g.title" = "テキストセル";
+
+/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
+"Pav-Bw-GgK.title" = "タイトル";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
+"Q1F-xo-N3e.placeholderString" = "Display Role";
+
+/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
+"UKP-Et-CT0.placeholderString" = "日付";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
+"Wi9-Zd-O1N.label" = "履歴";
+
+/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+
+/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
+"Zbi-X6-DLT.label" = "連絡先";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
+"bgk-oz-u7n.placeholderString" = "名前";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
+"d5o-nL-fRP.placeholderString" = "カテゴリー";
+
+/* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
+"gaf-Za-tuc.placeholderString" = "カテゴリー";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
+"isD-c6-X5Q.placeholderString" = "詳細";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "詳細";
+
+/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
+"sGB-x7-gig.placeholderString" = "n";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
+"uSw-g5-kte.placeholderString" = "Display Role";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "名前, RingID";
diff --git a/ui/ja.lproj/RingWizard.strings b/ui/ja.lproj/RingWizard.strings
new file mode 100644
index 0000000..26aabc9
--- /dev/null
+++ b/ui/ja.lproj/RingWizard.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Ring へようこそ";
diff --git a/ui/ja.lproj/RingWizardChoose.strings b/ui/ja.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000..ac907ec
--- /dev/null
+++ b/ui/ja.lproj/RingWizardChoose.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "キャンセル";
+
+/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Link this device to an account";
+
+/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Ringアカウントを作成";
diff --git a/ui/ja.lproj/RingWizardLinkAccount.strings b/ui/ja.lproj/RingWizardLinkAccount.strings
new file mode 100644
index 0000000..c06e3f9
--- /dev/null
+++ b/ui/ja.lproj/RingWizardLinkAccount.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
+"4ev-TK-8Yt.title" = "キャンセル";
+
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
+
+/* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
+"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
+"M4C-GY-B6t.title" = "少しお待ちください...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "キャンセル";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ring アカウントのパスワードを入力してください";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
+"t12-O0-kcf.title" = "キャンセル";
diff --git a/ui/ja.lproj/RingWizardNewAccount.strings b/ui/ja.lproj/RingWizardNewAccount.strings
new file mode 100644
index 0000000..0c82684
--- /dev/null
+++ b/ui/ja.lproj/RingWizardNewAccount.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
+
+/* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Choose your password";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "少しお待ちください...";
+
+/* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
+"fEY-eO-HwI.title" = "Repeat your password";
+
+/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
+"gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
+
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
+"v7f-52-GJA.title" = "キャンセル";
+
+/* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
+"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
+"zfA-n9-V4X.title" = "Create";
diff --git a/ui/ja.lproj/VideoPrefs.strings b/ui/ja.lproj/VideoPrefs.strings
new file mode 100644
index 0000000..54e599f
--- /dev/null
+++ b/ui/ja.lproj/VideoPrefs.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Device"; ObjectID = "170-NP-CSP"; */
+"170-NP-CSP.title" = "端末";
+
+/* Class = "NSTextFieldCell"; title = "Size"; ObjectID = "4bq-ls-mCp"; */
+"4bq-ls-mCp.title" = "サイズ";
+
+/* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
+"5Im-df-jdd.title" = "レート";
+
+/* Class = "NSTextFieldCell"; title = "Selection"; ObjectID = "VqO-Gm-CbB"; */
+"VqO-Gm-CbB.title" = "選択";
+
+/* Class = "NSTextFieldCell"; title = "Camera"; ObjectID = "YCM-JC-jin"; */
+"YCM-JC-jin.title" = "カメラ";
diff --git a/ui/lt.lproj/Accounts.strings b/ui/lt.lproj/Accounts.strings
index 584eb26..4797f58 100644
--- a/ui/lt.lproj/Accounts.strings
+++ b/ui/lt.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Vardas";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Įrenginiai";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Būsena";
diff --git a/ui/lt.lproj/ExportPasswordWindow.strings b/ui/lt.lproj/ExportPasswordWindow.strings
index 9d3ce59..934d156 100644
--- a/ui/lt.lproj/ExportPasswordWindow.strings
+++ b/ui/lt.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Slaptažodis...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Norėdami pradėti, pateikite savo Ring paskyros slaptažodį";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Langas";
@@ -27,7 +27,7 @@
 "dfD-AK-f3R.title" = "Gerai";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "klaidos etiketė";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "Gerai";
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Slaptažodis";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Susieti kitą įrenginį su šia paskyra";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Slaptažodis...";
diff --git a/ui/lt.lproj/GeneralPrefs.strings b/ui/lt.lproj/GeneralPrefs.strings
index faface5..8c3fce8 100644
--- a/ui/lt.lproj/GeneralPrefs.strings
+++ b/ui/lt.lproj/GeneralPrefs.strings
@@ -21,7 +21,7 @@
 "OTl-vx-S43.title" = "(Pritaikoma, iš naujo paleidus programą)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Elgsenos";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Automatiškai tikrinti ar yra naujinimų";
@@ -45,7 +45,7 @@
 "r4u-t3-gBc.title" = "Update";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Įjungti darbalaukio pranešimus";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Esant gaunamiesiems skambučiams, rodyti Ring priekiniame plane";
diff --git a/ui/lt.lproj/Localizable.strings b/ui/lt.lproj/Localizable.strings
index 4f014cc..1d797d3 100644
--- a/ui/lt.lproj/Localizable.strings
+++ b/ui/lt.lproj/Localizable.strings
@@ -1,11 +1,11 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Eksportavimo metu, įvyko klaida";
 
 /* Contextual menu action */
 "Add to contacts" = "Pridėti prie kontaktų";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Slapyvardis : ";
 
 /* Error shown to the user */
 "An error occured during the export" = "Eksportavimo metu, įvyko klaida";
@@ -47,22 +47,19 @@
 "Copy number" = "Kopijuoti numerį";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Sukurti RING paskyrą";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "Sukurti SIP paskyrą";
 
 /* Alert dialog title */
 "Entered name not found" = "Entered name not found";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Nepavyko perkelti jūsų paskyros. Jūs galite bandyti vėl, spusteldami Gerai arba galite ištrinti savo paskyrą.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Nepavyko atlikti informacijos paiešką";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Gaunamasis skambutis nuo %@";
@@ -74,19 +71,19 @@
 "Message from %@" = "Žinutė nuo %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Nauja SIP paskyra";
 
 /* Alert dialog title */
 "No valid account available" = "No valid account available";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Slaptažodis ir jo patvirtinimas nesutampa.";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Slaptažodis per trumpas";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Slaptažodžiai nesutampa";
 
 /* Button label */
 "Pause" = "Pristabdyti";
@@ -98,17 +95,20 @@
 "Refuse" = "Atmesti";
 
 /* Contextual menu entry */
-"Remove value" = "Remove value";
+"Remove value" = "Šalinti reikšmę";
 
 /* Show advice to user */
 "Reopen account to see your hash" = "Reopen account to see your hash";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Atkurti paskyrą";
 
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -116,19 +116,19 @@
 "Text Actions" = "Teksto veiksmai";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Įrašytas naudotojo vardas yra prieinamas";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Įrašytas naudotojo vardas yra neprieinamas";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Ring account format:" = "Ši paskyra turi būti perkelta į naująjį Ring paskyros formatą:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "Slaptažodis, kurį įrašėte, neatrakina šios paskyros";
 
 /* Alert dialog title */
 "The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
@@ -137,11 +137,11 @@
 "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Norėdami tęsti perkėlimą, privalote pasirinkti savo paskyrai slaptažodį. Šis slaptažodis bus naudojamas jūsų pagrindiniam raktui užšifruoti. Taip pat jis bus reikalingas pridedant naujus įrenginius į jūsų Ring paskyrą. Jeigu jūs nesate pasiruošę pasirinkti slaptažodį, tuomet galite užverti Ring ir pratęsti perkėlimą vėliau.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Nežinomas";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Prieš eksportuodami, turite perkelti savo paskyrą";
 
diff --git a/ui/lt.lproj/MainMenu.strings b/ui/lt.lproj/MainMenu.strings
index 28cc822..6958ba4 100644
--- a/ui/lt.lproj/MainMenu.strings
+++ b/ui/lt.lproj/MainMenu.strings
@@ -39,7 +39,7 @@
 "136.title" = "Išeiti iš Ring";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
-"145.title" = "Hide Others";
+"145.title" = "Slėpti kitus";
 
 /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
 "150.title" = "Show All";
diff --git a/ui/lt.lproj/MigrateRingAccountsWindow.strings b/ui/lt.lproj/MigrateRingAccountsWindow.strings
index 7d581b3..57249b7 100644
--- a/ui/lt.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/lt.lproj/MigrateRingAccountsWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Paskyros perkėlimas užbaigtas";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
@@ -9,16 +9,16 @@
 "859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Paskyros perkėlimo klaida";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Sveikiname, jūsų paskyra buvo sėkmingai perkelta.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Ištrinti šią paskyrą";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Patvirtinkite savo naująjį slaptažodį...";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "Gerai";
@@ -33,16 +33,16 @@
 "aOa-1q-AZe.title" = "Confirmation";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "klaidos etiketė";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Perkelti";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Slaptažodis";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Account migration required";
+"wmv-sA-Mlh.title" = "Reikalingas paskyros perkėlimas";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Slaptažodis...";
diff --git a/ui/lt.lproj/RegisterNameWindow.strings b/ui/lt.lproj/RegisterNameWindow.strings
index d9c6189..94b1ec9 100644
--- a/ui/lt.lproj/RegisterNameWindow.strings
+++ b/ui/lt.lproj/RegisterNameWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Privaloma*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
 "9gi-0u-67t.title" = "Other users can use it instead of your RingID";
@@ -9,7 +9,7 @@
 "Aeh-tK-RjX.title" = "An error occured during your username registration";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Įrašykite savo Ring paskyros slaptažodį";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Langas";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Minutėlę...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Naudotojo vardas...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Atsisakyti";
diff --git a/ui/lt.lproj/RingWindow.strings b/ui/lt.lproj/RingWindow.strings
index adf0e8c..f7f0d4a 100644
--- a/ui/lt.lproj/RingWindow.strings
+++ b/ui/lt.lproj/RingWindow.strings
@@ -27,7 +27,7 @@
 "Q1F-xo-N3e.placeholderString" = "Display Role";
 
 /* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "date";
+"UKP-Et-CT0.placeholderString" = "data";
 
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Istorija";
diff --git a/ui/lt.lproj/RingWizardChoose.strings b/ui/lt.lproj/RingWizardChoose.strings
index 2bd9853..360007f 100644
--- a/ui/lt.lproj/RingWizardChoose.strings
+++ b/ui/lt.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Atsisakyti";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Susieti šį įrenginį su paskyra";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Sukurti Ring paskyrą";
diff --git a/ui/lt.lproj/RingWizardLinkAccount.strings b/ui/lt.lproj/RingWizardLinkAccount.strings
index c002ded..c626876 100644
--- a/ui/lt.lproj/RingWizardLinkAccount.strings
+++ b/ui/lt.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Atsisakyti";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Kitas";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Įvyko klaida, prašome patikrinti savo slaptažodį ir pin.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Minutėlę...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Atsisakyti";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Įrašykite savo Ring paskyros slaptažodį";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Atsisakyti";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Atsisakyti";
diff --git a/ui/lt.lproj/RingWizardNewAccount.strings b/ui/lt.lproj/RingWizardNewAccount.strings
index 67931eb..8ba2a18 100644
--- a/ui/lt.lproj/RingWizardNewAccount.strings
+++ b/ui/lt.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Privaloma*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Pasirinkite savo slaptažodį";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Privaloma*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Minutėlę...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Pakartokite savo slaptažodį";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
+"gEy-ak-Cgq.placeholderString" = "Jei tuščia, bus naudojama \"Nežinoma\"...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Atsisakyti";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Jūsų slaptažodis privalo būti bent 6 simbolių. Jis bus naudojamas šifruoti jūsų paskyros duomenis ir susieti naujus įrenginius su jūsų paskyra.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
-"zfA-n9-V4X.title" = "Kurti";
+"zfA-n9-V4X.title" = "Sukurti";
diff --git a/ui/ms.lproj/AccAdvanced.strings b/ui/ms.lproj/AccAdvanced.strings
new file mode 100644
index 0000000..4cd9053
--- /dev/null
+++ b/ui/ms.lproj/AccAdvanced.strings
@@ -0,0 +1,72 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "0eY-9x-bAr"; */
+"0eY-9x-bAr.placeholderString" = "Server url...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
+"6u9-cM-ep0.placeholderString" = "realm...";
+
+/* Class = "NSButtonCell"; title = "Same as local parameters"; ObjectID = "Atv-t7-5YJ"; */
+"Atv-t7-5YJ.title" = "Same as local parameters";
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "FQ4-fp-Pxj"; */
+"FQ4-fp-Pxj.title" = "Min";
+
+/* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Jho-hi-Mvg"; */
+"Jho-hi-Mvg.title" = "Audio RTP port Range";
+
+/* Class = "NSTextFieldCell"; title = "Network Interface"; ObjectID = "K9I-vh-jeu"; */
+"K9I-vh-jeu.title" = "Network Interface";
+
+/* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
+"OL5-DI-aCq.title" = "Set published address and port";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
+"OR2-la-DUE.placeholderString" = "password...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "username..."; ObjectID = "P7k-xH-2mr"; */
+"P7k-xH-2mr.placeholderString" = "username...";
+
+/* Class = "NSButtonCell"; title = "Using TURN"; ObjectID = "QS0-TJ-NQh"; */
+"QS0-TJ-NQh.title" = "Using TURN";
+
+/* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
+"Qf3-E3-5U6.title" = "Alamat server pengagihan";
+
+/* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
+"XA8-Sy-CYG.title" = "Video RTP port Range";
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "a6W-wm-OmC"; */
+"a6W-wm-OmC.title" = "Min";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "dbq-qU-93x"; */
+"dbq-qU-93x.title" = "Max";
+
+/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "fB0-X8-GXk"; */
+"fB0-X8-GXk.title" = "Radio";
+
+/* Class = "NSTextFieldCell"; title = "Registration expire"; ObjectID = "fCd-4d-sP0"; */
+"fCd-4d-sP0.title" = "Registration expire";
+
+/* Class = "NSButtonCell"; title = "Using STUN"; ObjectID = "gVd-Dw-1B4"; */
+"gVd-Dw-1B4.title" = "Using STUN";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "oa2-Pe-6Uw"; */
+"oa2-Pe-6Uw.title" = "Max";
+
+/* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "sTk-1C-1KO"; */
+"sTk-1C-1KO.title" = "Address";
+
+/* Class = "NSTextFieldCell"; title = "Local port"; ObjectID = "shs-Xm-qnY"; */
+"shs-Xm-qnY.title" = "Local port";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
+"uzg-09-8vi.placeholderString" = "Server url...";
+
+/* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "wl8-YK-M76"; */
+"wl8-YK-M76.title" = "Port";
+
+/* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "xGw-j0-4ID"; */
+"xGw-j0-4ID.title" = "seconds";
+
+/* Class = "NSTextFieldCell"; title = "Registration"; ObjectID = "yB5-ET-gBL"; */
+"yB5-ET-gBL.title" = "Registration";
diff --git a/ui/ms.lproj/AccGeneral.strings b/ui/ms.lproj/AccGeneral.strings
new file mode 100644
index 0000000..3bec01b
--- /dev/null
+++ b/ui/ms.lproj/AccGeneral.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSButtonCell"; title = "RTP"; ObjectID = "0D8-im-2uM"; */
+"0D8-im-2uM.title" = "RTP";
+
+/* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
+"21g-eQ-0Sc.title" = "Try Registration";
+
+/* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
+"3uy-g0-eCm.title" = "Server hostname";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
+"4Nm-hw-379.title" = "Nama pengguna";
+
+/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
+"KSm-ZB-4aj.title" = "Use custom user-agent";
+
+/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
+"Mxv-Rt-ON6.title" = "Nama panggilan";
+
+/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
+"N5h-tI-ZLz.title" = "Upnp enabled";
+
+/* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
+"Rg8-qR-h1X.title" = "DTMF tone type";
+
+/* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
+"UXm-73-BNy.title" = "Show password";
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "WCR-30-BX0"; */
+"WCR-30-BX0.title" = "Password:";
+
+/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
+"YMy-QE-7A3.title" = "Auto-answer calls";
+
+/* Class = "NSButtonCell"; title = "SIP"; ObjectID = "jch-Qt-hTO"; */
+"jch-Qt-hTO.title" = "SIP";
+
+/* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
+"mlN-YG-fLS.title" = "Parameters";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
+"upU-sL-9i3.title" = "Akaun";
diff --git a/ui/ms.lproj/AccMedia.strings b/ui/ms.lproj/AccMedia.strings
new file mode 100644
index 0000000..c99bbb5
--- /dev/null
+++ b/ui/ms.lproj/AccMedia.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
+"Bbz-hd-1CE.title" = "Bawah";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "CO7-VF-04Q"; */
+"CO7-VF-04Q.title" = "Atas";
+
+/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
+"KkI-i1-mfY.title" = "Aktifkan nada dering";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
+"MbZ-7X-K5I.title" = "Atas";
+
+/* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
+"OSC-eG-2kt.title" = "Video";
+
+/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
+"aMg-uJ-Krx.title" = "Nada dering";
+
+/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
+"biN-bX-qM1.title" = "Codec";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.placeholderString" = "Frekuensi";
+
+/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.title" = "maklumat";
+
+/* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
+"gzX-Wc-S6g.title" = "Bunyi";
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "gza-RF-yKF"; */
+"gza-RF-yKF.title" = "Bawah";
+
+/* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
+"hHf-uc-NlW.title" = "Main";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
+"pvl-9U-X4l.placeholderString" = "Nama";
+
+/* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
+"rRr-la-G9L.title" = "Codecdigunakan apabila membuat penyambungan komunikasi dengan kenalan. Ia diaktifkan dan disusun kembali (yang pertama diaktifkan didalam senarai adalah diutamakan)";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
+"rU5-XQ-Ixc.placeholderString" = "Nama";
diff --git a/ui/ms.lproj/AccRing.strings b/ui/ms.lproj/AccRing.strings
new file mode 100644
index 0000000..b3612ea
--- /dev/null
+++ b/ui/ms.lproj/AccRing.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
+"1Sx-Et-CDM.title" = "Akaun";
+
+/* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
+"8WI-fC-Due.title" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
+"B6b-iB-REZ.title" = "Bootstrap server";
+
+/* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
+"EDd-FX-wcz.title" = "Permissions";
+
+/* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
+"G8M-go-xvD.title" = "Daftarkan nama";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
+"HN3-i9-zmw.placeholderString" = "Name or nickname...";
+
+/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "OeY-na-0YT"; */
+"OeY-na-0YT.title" = "Auto-answer calls";
+
+/* Class = "NSButtonCell"; title = "Allow calls from peers in your call history"; ObjectID = "PaC-xE-SHA"; */
+"PaC-xE-SHA.title" = "Allow calls from peers in your call history";
+
+/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Wzq-V2-YLU"; */
+"Wzq-V2-YLU.title" = "Nama panggilan";
+
+/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
+"ddk-1G-0jU.title" = "Use custom user-agent";
+
+/* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
+"fSU-Pc-Y5a.title" = "Blockchain server";
+
+/* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
+"fX7-9W-XFl.title" = "Allow calls from peers in your contact list";
+
+/* Class = "NSButtonCell"; title = "Allow calls from unknown peers"; ObjectID = "kmI-jb-aal"; */
+"kmI-jb-aal.title" = "Allow calls from unknown peers";
+
+/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
+"lHI-bz-ddQ.title" = "Upnp enabled";
+
+/* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
+"sBB-y7-xhL.title" = "Registered Name";
diff --git a/ui/ms.lproj/Accounts.strings b/ui/ms.lproj/Accounts.strings
new file mode 100644
index 0000000..d3b15bf
--- /dev/null
+++ b/ui/ms.lproj/Accounts.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSTabViewItem"; label = "Ring"; ObjectID = "1HC-kF-Jun"; */
+"1HC-kF-Jun.label" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
+"KoR-IH-uuI.placeholderString" = "Jenis";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
+"RT7-u6-bhe.label" = "Lanjut";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "Vp5-yV-ScC"; */
+"Vp5-yV-ScC.label" = "Penyulitan";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
+"ZDh-Jh-hfW.placeholderString" = "Nama";
+
+/* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
+"cT1-A5-rbj.label" = "Perangkat";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
+"eEz-Lm-SOj.placeholderString" = "Status";
+
+/* Class = "NSTabViewItem"; label = "Media"; ObjectID = "lxr-my-vH8"; */
+"lxr-my-vH8.label" = "Media";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
+"tPR-Ac-N5Y.label" = "Utama";
diff --git a/ui/ms.lproj/AudioPrefs.strings b/ui/ms.lproj/AudioPrefs.strings
new file mode 100644
index 0000000..c4472ce
--- /dev/null
+++ b/ui/ms.lproj/AudioPrefs.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
+"2gZ-Ab-XHf.title" = "Output";
+
+/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
+"9HH-Pa-4Aq.title" = "Rakaman";
+
+/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
+"B0r-wh-wc3.title" = "Audio devices";
+
+/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
+"jeD-Nk-KHA.title" = "Always recording";
+
+/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
+"ksV-r2-EVJ.title" = "Save in";
+
+/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
+"pAA-Iv-EmI.title" = "Mute DTMF";
+
+/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
+"x1o-rT-jy6.title" = "Input";
diff --git a/ui/ms.lproj/BackupAccountWindow.strings b/ui/ms.lproj/BackupAccountWindow.strings
new file mode 100644
index 0000000..fdb47b6
--- /dev/null
+++ b/ui/ms.lproj/BackupAccountWindow.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
+"5Qf-em-tN4.placeholderString" = "Confirm...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
+"9h8-GU-av4.title" = "Where";
+
+/* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
+"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Cancel";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.title" = "An error occured during the backup";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Kara laluan";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/ms.lproj/CurrentCall.strings b/ui/ms.lproj/CurrentCall.strings
new file mode 100644
index 0000000..9fb962d
--- /dev/null
+++ b/ui/ms.lproj/CurrentCall.strings
@@ -0,0 +1,81 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
+"2cB-dz-KYg.ibShadowedToolTip" = "Putuskan";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
+"9e8-ji-QId.ibShadowedToolTip" = "Join call";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
+"ChW-kg-Sja.ibShadowedToolTip" = "Pindah";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
+"D0G-XT-lhI.ibShadowedToolTip" = "Putuskan";
+
+/* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "Dqv-um-UUk"; */
+"Dqv-um-UUk.title" = "URI";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
+"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
+"G0w-c3-9pJ.ibShadowedToolTip" = "Record";
+
+/* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
+"KPG-pB-gPm.title" = "Answer";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
+"Kjq-iM-NBL.ibShadowedToolTip" = "Putuskan";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
+"LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
+
+/* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
+"TlL-HO-5Ey.title" = "Cancel";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
+"VVL-A4-r7n.ibShadowedToolTip" = "Record";
+
+/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
+"X0W-vv-xua.title" = "wants to talk to you!";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
+"anb-Y8-JQi.ibShadowedToolTip" = "Tangguh";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
+"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
+"kIZ-mf-moM.ibShadowedToolTip" = "Add participant";
+
+/* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
+"kxH-yM-TLd.title" = "Button";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
+"mc3-HV-hek.ibShadowedToolTip" = "Putuskan";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
+"oRa-pS-HN2.ibShadowedToolTip" = "Record";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
+"osk-LS-0Qg.placeholderString" = "Person name";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
+"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
+"tQl-cT-0Lb.ibShadowedToolTip" = "Mute Audio";
+
+/* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
+"tjM-py-p4V.title" = "Ignore";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
+"ugy-uK-901.placeholderString" = "Keadaan";
+
+/* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
+"wRO-X4-7IU.title" = "Answer";
+
+/* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
+"yZ6-1A-ZLT.title" = "wants to talk with you!";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
+"zsO-T7-9yi.placeholderString" = "Masa";
diff --git a/ui/ms.lproj/ExportPasswordWindow.strings b/ui/ms.lproj/ExportPasswordWindow.strings
new file mode 100644
index 0000000..0ef91a8
--- /dev/null
+++ b/ui/ms.lproj/ExportPasswordWindow.strings
@@ -0,0 +1,42 @@
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Please provide your Ring account password to start";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
+"dfD-AK-f3R.title" = "OK";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Kara laluan";
+
+/* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Sambungkan perangkat lain dengan akaun ini";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/ms.lproj/Localizable.strings b/ui/ms.lproj/Localizable.strings
new file mode 100644
index 0000000..2380c23
--- /dev/null
+++ b/ui/ms.lproj/Localizable.strings
@@ -0,0 +1,147 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Contextual menu action */
+"Add to contacts" = "Tambahkan sebagai kenalan";
+
+/* Text shown to the user */
+"Alias : " = "Alias : ";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Contextual menu entry */
+"Backup account" = "Backup account";
+
+/* Contextual menu action */
+"Call number" = "Call number";
+
+/* Open panel title */
+"Choose a CA list" = "Choose a CA list";
+
+/* Open panel title */
+"Choose a certificate" = "Choose a certificate";
+
+/* Open panel title */
+"Choose a directory" = "Choose a directory";
+
+/* Open panel title */
+"Choose a private key file" = "Choose a private key file";
+
+/* Open panel prompt for 'Choose a file' */
+"Choose CA" = "Choose CA";
+
+/* Open panel prompt for 'Choose a directory' */
+"Choose directory" = "Choose directory";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Contextual menu action */
+"Copy name" = "Copy name";
+
+/* Contextual menu action */
+"Copy number" = "Salin nombor";
+
+/* Contextual menu entry */
+"Create RING Account" = "Create RING Account";
+
+/* Contextual menu entry */
+"Create SIP Account" = "Create SIP Account";
+
+/* Alert dialog title */
+"Entered name not found" = "Entered name not found";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Alert dialo message */
+"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+
+/* Message from {Name} */
+"Message from %@" = "Message from %@";
+
+/* User label */
+"New SIP account" = "New SIP account";
+
+/* Alert dialog title */
+"No valid account available" = "No valid account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
+/* Button label */
+"Pause" = "Pause";
+
+/* Button label */
+"Play" = "Main";
+
+/* Button Action */
+"Refuse" = "Refuse";
+
+/* Contextual menu entry */
+"Remove value" = "Remove value";
+
+/* Show advice to user */
+"Reopen account to see your hash" = "Reopen account to see your hash";
+
+/* Contextual menu entry */
+"Restore account" = "Restore account";
+
+/* Button title */
+"Revise Input" = "Revise Input";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is invalid to be registered */
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Text shown to the user */
+"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Alert dialog title */
+"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+
+/* Title shown to user to concat with Pin */
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+
+/* Text shown to the user */
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Name used when user leave field empty */
+"Unknown" = "Tidak diketahui";
+
+/* Error shown to user */
+"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+
diff --git a/ui/ms.lproj/MainMenu.strings b/ui/ms.lproj/MainMenu.strings
new file mode 100644
index 0000000..269c012
--- /dev/null
+++ b/ui/ms.lproj/MainMenu.strings
@@ -0,0 +1,213 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Bring All to Front";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimize";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Window";
+
+/* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
+"29.title" = "AMainMenu";
+
+/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
+"56.title" = "Ring";
+
+/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
+"57.title" = "Ring";
+
+/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
+"58.title" = "Mengenai Ring";
+
+/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
+"129.title" = "Preferences…";
+
+/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
+"130.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
+"131.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
+"134.title" = "Hide Ring";
+
+/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
+"136.title" = "Quit Ring";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Hide Others";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Show All";
+
+/* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
+"195.title" = "Stop Speaking";
+
+/* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
+"196.title" = "Start Speaking";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
+"197.title" = "Copy";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
+"198.title" = "Select All";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
+"199.title" = "Cut";
+
+/* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
+"200.title" = "Spelling and Grammar";
+
+/* Class = "NSMenuItem"; title = "Check Document Now"; ObjectID = "201"; */
+"201.title" = "Check Document Now";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
+"202.title" = "Hapus";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
+"203.title" = "Paste";
+
+/* Class = "NSMenuItem"; title = "Show Spelling and Grammar"; ObjectID = "204"; */
+"204.title" = "Show Spelling and Grammar";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
+"205.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */
+"207.title" = "Undo";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "208"; */
+"208.title" = "Find Next";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
+"209.title" = "Find…";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "210"; */
+"210.title" = "Jump to Selection";
+
+/* Class = "NSMenuItem"; title = "Speech"; ObjectID = "211"; */
+"211.title" = "Speech";
+
+/* Class = "NSMenu"; title = "Speech"; ObjectID = "212"; */
+"212.title" = "Speech";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "213"; */
+"213.title" = "Find Previous";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
+"215.title" = "Redo";
+
+/* Class = "NSMenuItem"; title = "Spelling and Grammar"; ObjectID = "216"; */
+"216.title" = "Spelling and Grammar";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
+"217.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "218"; */
+"218.title" = "Find";
+
+/* Class = "NSMenuItem"; title = "Check Spelling While Typing"; ObjectID = "219"; */
+"219.title" = "Check Spelling While Typing";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "220"; */
+"220.title" = "Find";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "221"; */
+"221.title" = "Use Selection for Find";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
+"239.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
+"295.title" = "View";
+
+/* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
+"296.title" = "View";
+
+/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
+"297.title" = "Show Toolbar";
+
+/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
+"298.title" = "Customize Toolbar…";
+
+/* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "346"; */
+"346.title" = "Check Grammar With Spelling";
+
+/* Class = "NSMenuItem"; title = "Substitutions"; ObjectID = "348"; */
+"348.title" = "Substitutions";
+
+/* Class = "NSMenu"; title = "Substitutions"; ObjectID = "349"; */
+"349.title" = "Substitutions";
+
+/* Class = "NSMenuItem"; title = "Smart Copy/Paste"; ObjectID = "350"; */
+"350.title" = "Smart Copy/Paste";
+
+/* Class = "NSMenuItem"; title = "Smart Quotes"; ObjectID = "351"; */
+"351.title" = "Smart Quotes";
+
+/* Class = "NSMenuItem"; title = "Smart Links"; ObjectID = "354"; */
+"354.title" = "Smart Links";
+
+/* Class = "NSMenuItem"; title = "Transformations"; ObjectID = "450"; */
+"450.title" = "Transformations";
+
+/* Class = "NSMenu"; title = "Transformations"; ObjectID = "451"; */
+"451.title" = "Transformations";
+
+/* Class = "NSMenuItem"; title = "Make Upper Case"; ObjectID = "452"; */
+"452.title" = "Make Upper Case";
+
+/* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
+"454.title" = "Correct Spelling Automatically";
+
+/* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
+"457.title" = "Show Substitutions";
+
+/* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
+"460.title" = "Smart Dashes";
+
+/* Class = "NSMenuItem"; title = "Text Replacement"; ObjectID = "462"; */
+"462.title" = "Text Replacement";
+
+/* Class = "NSMenuItem"; title = "Make Lower Case"; ObjectID = "465"; */
+"465.title" = "Make Lower Case";
+
+/* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
+"466.title" = "Capitalize";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
+"485.title" = "Paste and Match Style";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
+"490.title" = "Help";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
+"491.title" = "Help";
+
+/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
+"492.title" = "Ring Help";
+
+/* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
+"534.title" = "Find and Replace…";
+
+/* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
+"593.title" = "Check for Update...";
+
+/* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
+"12w-Fz-Scs.title" = "Show";
+
+/* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
+"1fJ-em-1ww.title" = "Show";
+
+/* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
+"GTY-d8-NBf.title" = "Show recent";
+
+/* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
+"GU3-tt-2de.title" = "Show contacts";
+
+/* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
+"Oco-m7-LtS.title" = "Show call history";
diff --git a/ui/ms.lproj/MigrateRingAccountsWindow.strings b/ui/ms.lproj/MigrateRingAccountsWindow.strings
new file mode 100644
index 0000000..7418c98
--- /dev/null
+++ b/ui/ms.lproj/MigrateRingAccountsWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
+"1ob-x1-u74.title" = "Account migration completed";
+
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
+"8K3-9Z-MKH.title" = "Account migration error";
+
+/* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
+"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
+"ITE-yD-CTb.title" = "Delete this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
+"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
+"PT7-XI-WDR.title" = "OK";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
+"aOa-1q-AZe.title" = "Confirmation";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Migrate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Kara laluan";
+
+/* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Account migration required";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/ms.lproj/PreferencesWindow.strings b/ui/ms.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000..be1516c
--- /dev/null
+++ b/ui/ms.lproj/PreferencesWindow.strings
@@ -0,0 +1,33 @@
+
+/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Ring Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "Utama";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "Utama";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "Lanjut";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "Lanjut";
+
+/* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.label" = "Akaun";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
+"bRw-gW-tRJ.paletteLabel" = "Akaun";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = "Bunyi";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = "Bunyi";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "Video";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "Video";
diff --git a/ui/ms.lproj/RegisterNameWindow.strings b/ui/ms.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000..3b1ff9e
--- /dev/null
+++ b/ui/ms.lproj/RegisterNameWindow.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "An error occured during your username registration";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Enter your Ring account password";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Username...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Daftar";
+
+/* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register username on the blockchain";
diff --git a/ui/ms.lproj/RingWindow.strings b/ui/ms.lproj/RingWindow.strings
new file mode 100644
index 0000000..591450e
--- /dev/null
+++ b/ui/ms.lproj/RingWindow.strings
@@ -0,0 +1,69 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "SmartView";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
+"3Bh-xR-4Vn.title" = "Text";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
+"BfK-c5-B1l.placeholderString" = "maklumat";
+
+/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Ring";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
+"FlQ-Th-nfO.placeholderString" = "Contact Method";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
+"GAa-pQ-t4g.title" = "Text Cell";
+
+/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
+"Pav-Bw-GgK.title" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
+"Q1F-xo-N3e.placeholderString" = "Display Role";
+
+/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
+"UKP-Et-CT0.placeholderString" = "date";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
+"Wi9-Zd-O1N.label" = "Sejarah";
+
+/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+
+/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
+"Zbi-X6-DLT.label" = "Kenalan";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
+"bgk-oz-u7n.placeholderString" = "Nama";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
+"d5o-nL-fRP.placeholderString" = "Category";
+
+/* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
+"gaf-Za-tuc.placeholderString" = "Category";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
+"isD-c6-X5Q.placeholderString" = "maklumat";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "maklumat";
+
+/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
+"sGB-x7-gig.placeholderString" = "n";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
+"uSw-g5-kte.placeholderString" = "Display Role";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "Name, ringID";
diff --git a/ui/ms.lproj/RingWizardChoose.strings b/ui/ms.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000..b71a670
--- /dev/null
+++ b/ui/ms.lproj/RingWizardChoose.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Sambungkan perangkat ini dengan akaun yang telah sedia ada";
+
+/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Cipta akaun Ring";
diff --git a/ui/nb.lproj/Localizable.strings b/ui/nb.lproj/Localizable.strings
index d240e83..c3a5761 100644
--- a/ui/nb.lproj/Localizable.strings
+++ b/ui/nb.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/nb.lproj/RingWizardLinkAccount.strings b/ui/nb.lproj/RingWizardLinkAccount.strings
index 57ab6a4..4a8f9ac 100644
--- a/ui/nb.lproj/RingWizardLinkAccount.strings
+++ b/ui/nb.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Avbryt";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Neste";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Avbryt";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Avbryt";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Avbryt";
diff --git a/ui/nb.lproj/RingWizardNewAccount.strings b/ui/nb.lproj/RingWizardNewAccount.strings
index bfcc04d..c1611e7 100644
--- a/ui/nb.lproj/RingWizardNewAccount.strings
+++ b/ui/nb.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Avbryt";
diff --git a/ui/nl.lproj/CurrentCall.strings b/ui/nl.lproj/CurrentCall.strings
index 9077a83..832c897 100644
--- a/ui/nl.lproj/CurrentCall.strings
+++ b/ui/nl.lproj/CurrentCall.strings
@@ -36,7 +36,7 @@
 "VVL-A4-r7n.ibShadowedToolTip" = "Opnemen";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "wil met u spreken!";
+"X0W-vv-xua.title" = "wil met je praten!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
 "anb-Y8-JQi.ibShadowedToolTip" = "In wacht zetten";
@@ -75,7 +75,7 @@
 "wRO-X4-7IU.title" = "Beantwoorden";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "wil met u spreken!";
+"yZ6-1A-ZLT.title" = "wil met je praten!";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
 "zsO-T7-9yi.placeholderString" = "Tijd";
diff --git a/ui/nl.lproj/Localizable.strings b/ui/nl.lproj/Localizable.strings
index 2e285ec..e6e4650 100644
--- a/ui/nl.lproj/Localizable.strings
+++ b/ui/nl.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Opzoeken mislukt";
 
-/* Text shown to the user */
-"ID : " = "ID:";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Inkomende oproep van %@";
 
@@ -101,7 +98,7 @@
 "Remove value" = "Waarde verwijderen";
 
 /* Show advice to user */
-"Reopen account to see your hash" = "Account heropenen om uw hash te bekijken";
+"Reopen account to see your hash" = "Heropen de account om je hash te bekijken";
 
 /* Contextual menu entry */
 "Restore account" = "Account herstellen";
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Invoer herzien";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Delen";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "De ingevoerde gebruikersnaam is beschikbaar";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "De ingevoerde gebruikersnaam is ongeldig. De gebruikersnaam moet minstens 3 tekens lang zijn, en mag enkel kleine alfanumerieke tekens bevatten.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "De ingevoerde gebruikersnaam is niet beschikbaar";
diff --git a/ui/nl.lproj/RingWindow.strings b/ui/nl.lproj/RingWindow.strings
index ffd36f9..cce5db3 100644
--- a/ui/nl.lproj/RingWindow.strings
+++ b/ui/nl.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Geschiedenis";
 
 /* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dit is uw Ring-ID.\nDeel hem met uw vrienden!";
+"Xb9-UT-M2F.title" = "Dit is je Ring-ID.\nDeel hem met je vrienden!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacten";
diff --git a/ui/nl.lproj/RingWizardLinkAccount.strings b/ui/nl.lproj/RingWizardLinkAccount.strings
index 9181d93..2525748 100644
--- a/ui/nl.lproj/RingWizardLinkAccount.strings
+++ b/ui/nl.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Voer je PIN-code in";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuleren";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Volgende";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "Er is een fout opgetreden, controleer je wachtwoord en PIN-code.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Even geduld aub...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Annuleren";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Voer je Ring-accountwachtwoord in";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "Om dit apparaat aan een andere account te koppelen moet je eerst een PIN-code verkrijgen.\nGa om de PIN-code te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer \"Een ander apparaat aan deze account koppelen\".\nJe zal de PIN-code krijgen die je nodig hebt om dit proces te voltooien. De PIN-code is slechts 10 minuten geldig.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Annuleren";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Annuleren";
diff --git a/ui/nl.lproj/RingWizardNewAccount.strings b/ui/nl.lproj/RingWizardNewAccount.strings
index cf187da..e62def0 100644
--- a/ui/nl.lproj/RingWizardNewAccount.strings
+++ b/ui/nl.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Als je dit aanvinkt zal je een unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen het gebruiken om je te bellen.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Vereist*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Kies je wachtwoord";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Onbekend' wanneer leeg...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Kies uw gebruikersnaam";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Annuleren";
diff --git a/ui/nl_NL.lproj/Localizable.strings b/ui/nl_NL.lproj/Localizable.strings
index 04ea210..cb712b5 100644
--- a/ui/nl_NL.lproj/Localizable.strings
+++ b/ui/nl_NL.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/pl.lproj/Localizable.strings b/ui/pl.lproj/Localizable.strings
index c346ae2..4f870db 100644
--- a/ui/pl.lproj/Localizable.strings
+++ b/ui/pl.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Połączenie przychodzące od %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Podziel się";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/pl.lproj/RingWizardLinkAccount.strings b/ui/pl.lproj/RingWizardLinkAccount.strings
index 0c07556..578daba 100644
--- a/ui/pl.lproj/RingWizardLinkAccount.strings
+++ b/ui/pl.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Anuluj";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Następne";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Chwileczkę...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Anuluj";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Anuluj";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Anuluj";
diff --git a/ui/pl.lproj/RingWizardNewAccount.strings b/ui/pl.lproj/RingWizardNewAccount.strings
index 4c0e768..c6e879e 100644
--- a/ui/pl.lproj/RingWizardNewAccount.strings
+++ b/ui/pl.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Nieznane' jeśli puste...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Wybierz swoją nazwę użytkownika";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Anuluj";
diff --git a/ui/pl_PL.lproj/Localizable.strings b/ui/pl_PL.lproj/Localizable.strings
index c1f1510..4a4cc4c 100644
--- a/ui/pl_PL.lproj/Localizable.strings
+++ b/ui/pl_PL.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/pt.lproj/RingWizardLinkAccount.strings b/ui/pt.lproj/RingWizardLinkAccount.strings
index 1c472a5..e826b2b 100644
--- a/ui/pt.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Próximo";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancel";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancel";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancel";
diff --git a/ui/pt.lproj/RingWizardNewAccount.strings b/ui/pt.lproj/RingWizardNewAccount.strings
index 68d7938..ae509d6 100644
--- a/ui/pt.lproj/RingWizardNewAccount.strings
+++ b/ui/pt.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancel";
diff --git a/ui/pt_BR.lproj/AccRing.strings b/ui/pt_BR.lproj/AccRing.strings
index ad84c71..5760e06 100644
--- a/ui/pt_BR.lproj/AccRing.strings
+++ b/ui/pt_BR.lproj/AccRing.strings
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "Permissões";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Registrar nome";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Nome ou nome de usuário";
@@ -30,7 +30,7 @@
 "ddk-1G-0jU.title" = "Use user-agent personalizado";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
-"fSU-Pc-Y5a.title" = "Blockchain server";
+"fSU-Pc-Y5a.title" = "Servidor blockchain";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
 "fX7-9W-XFl.title" = "Permitir chamadas de pares em sua lista de contatos";
@@ -42,4 +42,4 @@
 "lHI-bz-ddQ.title" = "Habilitar Upnp";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Registrar nome";
diff --git a/ui/pt_BR.lproj/BackupAccountWindow.strings b/ui/pt_BR.lproj/BackupAccountWindow.strings
index 7a99194..8fc356f 100644
--- a/ui/pt_BR.lproj/BackupAccountWindow.strings
+++ b/ui/pt_BR.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Confirmar...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Senha...";
@@ -15,10 +15,10 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Senha...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Aonde";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+"KYZ-TW-44Y.title" = "Escolha aonde será feita a cópia de segurança da sua conta. Deve ser protegido por senha.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Janela";
@@ -42,7 +42,7 @@
 "ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Senha...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Ocorreu um erro durante a cópia de segurança";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
diff --git a/ui/pt_BR.lproj/ExportPasswordWindow.strings b/ui/pt_BR.lproj/ExportPasswordWindow.strings
index d0bfbbc..1e4c493 100644
--- a/ui/pt_BR.lproj/ExportPasswordWindow.strings
+++ b/ui/pt_BR.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Senha...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Por favor, informe a senha da conta Ring para iniciar";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Janela";
@@ -27,7 +27,7 @@
 "dfD-AK-f3R.title" = "OK";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "título do erro";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Senha";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Associar outro dispositivo à esta conta.";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Senha...";
diff --git a/ui/pt_BR.lproj/GeneralPrefs.strings b/ui/pt_BR.lproj/GeneralPrefs.strings
index 75ca980..a9f9638 100644
--- a/ui/pt_BR.lproj/GeneralPrefs.strings
+++ b/ui/pt_BR.lproj/GeneralPrefs.strings
@@ -21,7 +21,7 @@
 "OTl-vx-S43.title" = "(Aplicado ao reiniciar a aplicação)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Comportamentos";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Verificar automaticamente se há atualizações";
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Atualização";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Habilitar notificações de área de trabalho";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "razer Ring para o primeiro plano ao receber chamadas";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "Isto é compartilhado com seus contatos";
diff --git a/ui/pt_BR.lproj/Localizable.strings b/ui/pt_BR.lproj/Localizable.strings
index 8cfb165..6126d66 100644
--- a/ui/pt_BR.lproj/Localizable.strings
+++ b/ui/pt_BR.lproj/Localizable.strings
@@ -1,17 +1,17 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ocorreu um erro de rede durante a exportação";
 
 /* Contextual menu action */
 "Add to contacts" = "Adicionar aos contatos";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Apelido :";
 
 /* Error shown to the user */
 "An error occured during the export" = "  Ocorreu um erro durante a exportação ";
 
 /* Contextual menu entry */
-"Backup account" = "Backup account";
+"Backup account" = "Cópia de segurança da conta";
 
 /* Contextual menu action */
 "Call number" = "Chamar número";
@@ -41,49 +41,46 @@
 "Copy" = "Copiar";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Copiar nome";
 
 /* Contextual menu action */
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Criar conta RING";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "Criar conta SIP";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "Nome inserido não foi encontrado";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Falha ao migrar sua conta. Você pode tentar novamente selecionando Ok ou removendo sua conta.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Falha ao realizar verificação";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Chamada de %@";
 
 /* Alert dialo message */
-"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+"Make sure you have at least one valid account" = "Tenha certeza que possui pelo menos uma conta válida";
 
 /* Message from {Name} */
 "Message from %@" = "Mensagem de %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Nova conta SIP";
 
 /* Alert dialog title */
-"No valid account available" = "No valid account available";
+"No valid account available" = "Nenhuma conta válida disponível";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Senhas não correspondem.";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Senha é muito curta";
 
 /* Indication for user */
 "Passwords don't match" = "Senhas não condizentes";
@@ -104,10 +101,13 @@
 "Reopen account to see your hash" = "Reabrir conta para ver seu hash";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Recuperar conta";
 
 /* Button title */
-"Revise Input" = "Revise Input";
+"Revise Input" = "Revisar dados";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Compartilhar";
@@ -116,25 +116,25 @@
 "Text Actions" = "Ações de Texto";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "O nome de usuário entrado está disponível";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "O nome de usuário entrado não está disponível.";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "A seguinte conta precisa ser migrada para o novo formato de contas do Ring:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "A senha informada não desbloqueia esta conta";
 
 /* Alert dialog title */
-"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+"The username you entered do not match a RingID on the network" = "O usuário informado não confere com o RingID desta rede";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Para concluir este processo, você deve iniciar o Ring em um novo dispositivo e escolher a opção \"Vincular este dispositivo a uma conta\". Seu PIN é válido por 10 minutos.";
 
 /* Text shown to the user */
 "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Para continuar a migração, você deve escolher uma senha para a sua conta. Essa senha senha utilizada para encriptar sua senha mestre. Ela será necessária para adicionar novos dispositivos à sua conta Ring. Se você não estiver pronto para escolher uma senha, deve fechar o Ring e continuar a migração depois.";
@@ -143,5 +143,5 @@
 "Unknown" = "Desconhecido";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Você deve migrar sua conta antes de exportar";
 
diff --git a/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings b/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
index a5263f8..1ad84d5 100644
--- a/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Migração da conta completa";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "A seguinte conta precisa ser migrada para o formato da nova conta Ring:\\nAlias : \\nID:\\nPara continuar a migração, você deverá escolher uma senha para sua conta. Esta senha será utilizada para criptografar sua senha mestre. Ela será solicitada quando forem adicionados novos dispositivos na sua conta Ring. Caso não decida criar uma senha agora, você poderá fechar o Ring e continuar com a migração mais tarde.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Erro de migração de conta";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Parabéns, sua nova conta foi migrada com sucesso.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Remover esta conta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Confirme sua nova senha...";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "OK";
@@ -30,13 +30,13 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Confirmação";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "título do erro";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Migrar";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Senha";
diff --git a/ui/pt_BR.lproj/RegisterNameWindow.strings b/ui/pt_BR.lproj/RegisterNameWindow.strings
index cb87d30..a53edde 100644
--- a/ui/pt_BR.lproj/RegisterNameWindow.strings
+++ b/ui/pt_BR.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Outros usuários podem utilizar isso ao invés do seu Ring ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Ocorreu um erro durante o registro do seu usuário";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Entre com a senha da sua conta Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Janela";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Só um momento...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Usuário...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Cancelar";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Registrar";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register username on the blockchain";
+"tje-EZ-ZPI.title" = "Registrar usuário no blockchain";
diff --git a/ui/pt_BR.lproj/RingWizardChoose.strings b/ui/pt_BR.lproj/RingWizardChoose.strings
index a1eed57..a468bd4 100644
--- a/ui/pt_BR.lproj/RingWizardChoose.strings
+++ b/ui/pt_BR.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Cancelar";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Associar este dispositivo a uma conta";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Criar uma conta no Ring";
diff --git a/ui/pt_BR.lproj/RingWizardLinkAccount.strings b/ui/pt_BR.lproj/RingWizardLinkAccount.strings
index c1193c0..378e148 100644
--- a/ui/pt_BR.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt_BR.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Próximo";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Ocorreu um erro, por favor, confira sua senha e pin.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Só um momento...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Entre com a senha da sua conta Ring";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Cancelar";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Cancelar";
diff --git a/ui/pt_BR.lproj/RingWizardNewAccount.strings b/ui/pt_BR.lproj/RingWizardNewAccount.strings
index fc710e8..ac3e702 100644
--- a/ui/pt_BR.lproj/RingWizardNewAccount.strings
+++ b/ui/pt_BR.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Escolha sua senha";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Obrigatório*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Só um momento...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Repita sua senha";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Desconhecido' se vazio...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Escolha seu nome de usuário";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Sua senha deve ter pelo menos 6 caracteres. Ela será utilizada para criptografar os dados da sua conta e vincular novos dispositivos a sua conta.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Criar";
diff --git a/ui/ro.lproj/AccGeneral.strings b/ui/ro.lproj/AccGeneral.strings
new file mode 100644
index 0000000..b0a948a
--- /dev/null
+++ b/ui/ro.lproj/AccGeneral.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSButtonCell"; title = "RTP"; ObjectID = "0D8-im-2uM"; */
+"0D8-im-2uM.title" = "RTP";
+
+/* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
+"21g-eQ-0Sc.title" = "Try Registration";
+
+/* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
+"3uy-g0-eCm.title" = "Server hostname";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
+"4Nm-hw-379.title" = "Nume de utilizator";
+
+/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
+"KSm-ZB-4aj.title" = "Use custom user-agent";
+
+/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
+"Mxv-Rt-ON6.title" = "Alias";
+
+/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
+"N5h-tI-ZLz.title" = "Upnp enabled";
+
+/* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
+"Rg8-qR-h1X.title" = "DTMF tone type";
+
+/* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
+"UXm-73-BNy.title" = "Show password";
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "WCR-30-BX0"; */
+"WCR-30-BX0.title" = "Password:";
+
+/* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
+"YMy-QE-7A3.title" = "Auto-answer calls";
+
+/* Class = "NSButtonCell"; title = "SIP"; ObjectID = "jch-Qt-hTO"; */
+"jch-Qt-hTO.title" = "SIP";
+
+/* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
+"mlN-YG-fLS.title" = "Parameters";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
+"upU-sL-9i3.title" = "Account";
diff --git a/ui/ro.lproj/Accounts.strings b/ui/ro.lproj/Accounts.strings
index 3a10ee5..14a02ee 100644
--- a/ui/ro.lproj/Accounts.strings
+++ b/ui/ro.lproj/Accounts.strings
@@ -6,10 +6,10 @@
 "KoR-IH-uuI.placeholderString" = "Type";
 
 /* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
-"RT7-u6-bhe.label" = "Advanced";
+"RT7-u6-bhe.label" = "Avansat";
 
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "Vp5-yV-ScC"; */
-"Vp5-yV-ScC.label" = "Security";
+"Vp5-yV-ScC.label" = "Seuritate";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
 "ZDh-Jh-hfW.placeholderString" = "Nume";
diff --git a/ui/ro.lproj/BackupAccountWindow.strings b/ui/ro.lproj/BackupAccountWindow.strings
new file mode 100644
index 0000000..e5e7358
--- /dev/null
+++ b/ui/ro.lproj/BackupAccountWindow.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
+"5Qf-em-tN4.placeholderString" = "Confirm...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
+"9h8-GU-av4.title" = "Where";
+
+/* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
+"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Cancel";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.title" = "An error occured during the backup";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Parola";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/ro.lproj/Localizable.strings b/ui/ro.lproj/Localizable.strings
index 27a1ae8..0b74aa4 100644
--- a/ui/ro.lproj/Localizable.strings
+++ b/ui/ro.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 "A network error occured during the export" = "A network error occured during the export";
 
 /* Contextual menu action */
-"Add to contacts" = "Add to contacts";
+"Add to contacts" = "Adaugă la contacte";
 
 /* Text shown to the user */
 "Alias : " = "Alias : ";
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
@@ -140,7 +140,7 @@
 "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
 
 /* Name used when user leave field empty */
-"Unknown" = "Unknown";
+"Unknown" = "Necunoscut";
 
 /* Error shown to user */
 "You have to migrate your account before exporting" = "You have to migrate your account before exporting";
diff --git a/ui/ro.lproj/MainMenu.strings b/ui/ro.lproj/MainMenu.strings
index 3f535db..bdd75b4 100644
--- a/ui/ro.lproj/MainMenu.strings
+++ b/ui/ro.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Suna";
 
 /* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "About Ring";
+"58.title" = "Despre Ring";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferences…";
@@ -66,7 +66,7 @@
 "201.title" = "Check Document Now";
 
 /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
-"202.title" = "Delete";
+"202.title" = "Șterge";
 
 /* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
 "203.title" = "Paste";
diff --git a/ui/ro.lproj/MigrateRingAccountsWindow.strings b/ui/ro.lproj/MigrateRingAccountsWindow.strings
new file mode 100644
index 0000000..8bba9a0
--- /dev/null
+++ b/ui/ro.lproj/MigrateRingAccountsWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
+"1ob-x1-u74.title" = "Account migration completed";
+
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+
+/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
+"8K3-9Z-MKH.title" = "Account migration error";
+
+/* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
+"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
+"ITE-yD-CTb.title" = "Delete this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
+"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
+"PT7-XI-WDR.title" = "OK";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
+"aOa-1q-AZe.title" = "Confirmation";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Migrate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Parola";
+
+/* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Account migration required";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/ro.lproj/PreferencesWindow.strings b/ui/ro.lproj/PreferencesWindow.strings
index 70cfcdd..3a03ad7 100644
--- a/ui/ro.lproj/PreferencesWindow.strings
+++ b/ui/ro.lproj/PreferencesWindow.strings
@@ -9,16 +9,16 @@
 "GQi-nL-0Ey.paletteLabel" = "General";
 
 /* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
-"Qza-fj-d45.label" = "Advanced";
+"Qza-fj-d45.label" = "Avansat";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
-"Qza-fj-d45.paletteLabel" = "Advanced";
+"Qza-fj-d45.paletteLabel" = "Avansat";
 
 /* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.label" = "Accounts";
+"bRw-gW-tRJ.label" = "Conturi";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.paletteLabel" = "Accounts";
+"bRw-gW-tRJ.paletteLabel" = "Conturi";
 
 /* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
 "iuJ-eu-b7f.label" = "Audio";
diff --git a/ui/ro.lproj/RegisterNameWindow.strings b/ui/ro.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000..7bc90a0
--- /dev/null
+++ b/ui/ro.lproj/RegisterNameWindow.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "An error occured during your username registration";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Enter your Ring account password";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Username...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Registrare";
+
+/* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register username on the blockchain";
diff --git a/ui/ro.lproj/RingWizardChoose.strings b/ui/ro.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000..b7e19d8
--- /dev/null
+++ b/ui/ro.lproj/RingWizardChoose.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Link this device to an account";
+
+/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Creați un cont Ring";
diff --git a/ui/ru.lproj/AccAdvanced.strings b/ui/ru.lproj/AccAdvanced.strings
index d2884fc..9f4e41f 100644
--- a/ui/ru.lproj/AccAdvanced.strings
+++ b/ui/ru.lproj/AccAdvanced.strings
@@ -18,7 +18,7 @@
 "K9I-vh-jeu.title" = "Сетевой интерфейс";
 
 /* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
-"OL5-DI-aCq.title" = "Установить опубликованный адрес и порт";
+"OL5-DI-aCq.title" = "Установить публикуемый адрес и порт";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
 "OR2-la-DUE.placeholderString" = "пароль...";
@@ -30,7 +30,7 @@
 "QS0-TJ-NQh.title" = "Использовать TURN";
 
 /* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
-"Qf3-E3-5U6.title" = "Опубликованный адрес";
+"Qf3-E3-5U6.title" = "Публикуемый адрес";
 
 /* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
 "XA8-Sy-CYG.title" = "Диапазон портов RTP видео";
diff --git a/ui/ru.lproj/AccGeneral.strings b/ui/ru.lproj/AccGeneral.strings
index dc14ccf..9a76101 100644
--- a/ui/ru.lproj/AccGeneral.strings
+++ b/ui/ru.lproj/AccGeneral.strings
@@ -39,4 +39,4 @@
 "mlN-YG-fLS.title" = "Параметры";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
-"upU-sL-9i3.title" = "Учётная запись";
+"upU-sL-9i3.title" = "Аккаунт";
diff --git a/ui/ru.lproj/AccMedia.strings b/ui/ru.lproj/AccMedia.strings
index 7b557bc..1a0bad2 100644
--- a/ui/ru.lproj/AccMedia.strings
+++ b/ui/ru.lproj/AccMedia.strings
@@ -6,7 +6,7 @@
 "CO7-VF-04Q.title" = "Вверх";
 
 /* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Включить звуки";
+"KkI-i1-mfY.title" = "Включить звонок";
 
 /* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
 "MbZ-7X-K5I.title" = "Вверх";
@@ -15,7 +15,7 @@
 "OSC-eG-2kt.title" = "Видео";
 
 /* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
-"aMg-uJ-Krx.title" = "Звуки";
+"aMg-uJ-Krx.title" = "Звонки ";
 
 /* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
 "biN-bX-qM1.title" = "Кодеки";
@@ -33,13 +33,13 @@
 "gza-RF-yKF.title" = "Вниз";
 
 /* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
-"hHf-uc-NlW.title" = "Играть";
+"hHf-uc-NlW.title" = "Проигрывать";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
 "pvl-9U-X4l.placeholderString" = "Имя";
 
 /* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
-"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
+"rRr-la-G9L.title" = "Кодеки используются при общении с кем-либо. Их можно активировать и сортировать (в порядке предпочтения)";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
 "rU5-XQ-Ixc.placeholderString" = "Имя";
diff --git a/ui/ru.lproj/AccRing.strings b/ui/ru.lproj/AccRing.strings
index 1027cbf..94546d9 100644
--- a/ui/ru.lproj/AccRing.strings
+++ b/ui/ru.lproj/AccRing.strings
@@ -1,18 +1,18 @@
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
-"1Sx-Et-CDM.title" = "Учетная запись";
+"1Sx-Et-CDM.title" = "Аккаунт";
 
 /* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
 "8WI-fC-Due.title" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
-"B6b-iB-REZ.title" = "Поднять сервер";
+"B6b-iB-REZ.title" = "Сервер инициализации";
 
 /* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
 "EDd-FX-wcz.title" = "Разрешения";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Зарегистрировать имя";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Имя или прозвище...";
@@ -30,7 +30,7 @@
 "ddk-1G-0jU.title" = "Использовать указанный user-agent";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
-"fSU-Pc-Y5a.title" = "Blockchain server";
+"fSU-Pc-Y5a.title" = "Сервер блокчейн";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
 "fX7-9W-XFl.title" = "Разрешить вызовы от участников в Вашем списке контактов";
@@ -42,4 +42,4 @@
 "lHI-bz-ddQ.title" = "UPNP включён";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Зарегистрированное имя";
diff --git a/ui/ru.lproj/AccSecurity.strings b/ui/ru.lproj/AccSecurity.strings
index a53d845..39fad4d 100644
--- a/ui/ru.lproj/AccSecurity.strings
+++ b/ui/ru.lproj/AccSecurity.strings
@@ -15,16 +15,16 @@
 "7c2-kF-dcs.placeholderString" = "Пароль...";
 
 /* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
-"9Q3-1W-Lh3.title" = "Negotiation timeout";
+"9Q3-1W-Lh3.title" = "Истёк срок ожидания согласования";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
 "Ig9-B1-7N3.title" = "Откат на RTP";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "JHb-iu-ZwI"; */
-"JHb-iu-ZwI.title" = "Приватный ключ";
+"JHb-iu-ZwI.title" = "Закрытый ключ";
 
 /* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
-"Jqz-P0-zAz.title" = "Пользовательский Сертификат";
+"Jqz-P0-zAz.title" = "Пользовательский сертификат";
 
 /* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
 "UxS-et-whJ.title" = "Имя сервера для исходящих TLS соединений";
@@ -39,7 +39,7 @@
 "uOE-XA-5gW.title" = "Метод протокола TSL";
 
 /* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
-"vPF-Rp-aR6.title" = "Список Авторизованных Сертификатов";
+"vPF-Rp-aR6.title" = "Список удостоверяющих центров";
 
 /* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
 "x2s-ov-cVQ.title" = "Проверять сертификаты как сервер";
diff --git a/ui/ru.lproj/Accounts.strings b/ui/ru.lproj/Accounts.strings
index 50b461a..28aad05 100644
--- a/ui/ru.lproj/Accounts.strings
+++ b/ui/ru.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Имя";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Устройства";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Состояние";
diff --git a/ui/ru.lproj/BackupAccountWindow.strings b/ui/ru.lproj/BackupAccountWindow.strings
index 98c51fc..21459c8 100644
--- a/ui/ru.lproj/BackupAccountWindow.strings
+++ b/ui/ru.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Подтвердите…";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Пароль...";
@@ -15,10 +15,10 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Куда";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account. It needs to be password protected.";
+"KYZ-TW-44Y.title" = "Выберите, куда разместить резервную копию аккаунта. Она должна быть защищена паролем.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Окно";
@@ -42,7 +42,7 @@
 "ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Во время создания резервной копии произошла ошибка";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
diff --git a/ui/ru.lproj/ExportPasswordWindow.strings b/ui/ru.lproj/ExportPasswordWindow.strings
index 3f6c234..3646664 100644
--- a/ui/ru.lproj/ExportPasswordWindow.strings
+++ b/ui/ru.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Пожалуйста, укажите пароль от вашего аккаунта Ring, чтобы начать";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Окно";
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Пароль";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Привязать другое устройство к этому аккаунту";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Пароль...";
diff --git a/ui/ru.lproj/GeneralPrefs.strings b/ui/ru.lproj/GeneralPrefs.strings
index cbfa682..73a1828 100644
--- a/ui/ru.lproj/GeneralPrefs.strings
+++ b/ui/ru.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Обновить";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Включить уведомления на рабочем столе";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Выводить Ring на передний план при входящих звонках";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "К этому имеют доступ ваши контакты";
diff --git a/ui/ru.lproj/Localizable.strings b/ui/ru.lproj/Localizable.strings
index 33c1a1a..6d7211a 100644
--- a/ui/ru.lproj/Localizable.strings
+++ b/ui/ru.lproj/Localizable.strings
@@ -1,17 +1,17 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Во время экспорта произошла ошибка сети";
 
 /* Contextual menu action */
 "Add to contacts" = "Добавить в контакты";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Псевдоним:";
 
 /* Error shown to the user */
-"An error occured during the export" = "An error occured during the export";
+"An error occured during the export" = "Во время экспорта произошла ошибка";
 
 /* Contextual menu entry */
-"Backup account" = "Backup account";
+"Backup account" = "Создать резервную копию аккаунта";
 
 /* Contextual menu action */
 "Call number" = "Позвонить по номеру";
@@ -26,7 +26,7 @@
 "Choose a directory" = "Выбор директории";
 
 /* Open panel title */
-"Choose a private key file" = "Выбрать файл первичного ключа";
+"Choose a private key file" = "Выбрать файл закрытого ключа";
 
 /* Open panel prompt for 'Choose a file' */
 "Choose CA" = "Выбрать CA";
@@ -41,52 +41,49 @@
 "Copy" = "Копировать";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Копировать имя";
 
 /* Contextual menu action */
 "Copy number" = "Копировать номер";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Создать аккаунт Ring";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "Создать SIP аккаунт";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "Указанное имя не найдено";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Не удалось перенести ваш аккаунт. Вы можете либо попробовать снова, нажав ОК, либо удалить ваш аккаунт.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Не удалось осуществить поиск";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Входящий вызов от %@";
 
 /* Alert dialo message */
-"Make sure you have at least one valid account" = "Make sure you have at least one valid account";
+"Make sure you have at least one valid account" = "Убедитесь, что у вас есть хотя бы один действительный аккаунт";
 
 /* Message from {Name} */
 "Message from %@" = "Сообщение от %@";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Новый SIP аккаунт";
 
 /* Alert dialog title */
-"No valid account available" = "No valid account available";
+"No valid account available" = "Нет пригодных аккаунтов";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Пароль и подтверждение не совпадают.";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Пароль слишком короткий";
 
 /* Indication for user */
-"Passwords don't match" = "Passwords don't match";
+"Passwords don't match" = "Пароли не совпадают";
 
 /* Button label */
 "Pause" = "Пауза";
@@ -101,13 +98,16 @@
 "Remove value" = "Удалить значение";
 
 /* Show advice to user */
-"Reopen account to see your hash" = "Переоткрыть учетную запись для просмотра вашего хеша";
+"Reopen account to see your hash" = "Откройте аккаунт повторно для просмотра вашего хеша";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Восстановить аккаунт";
 
 /* Button title */
-"Revise Input" = "Revise Input";
+"Revise Input" = "Проверить ввод";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Поделиться";
@@ -116,32 +116,32 @@
 "Text Actions" = "Действия с текстом";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Указанное имя пользователя доступно";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Указанное имя пользователя недоступно";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Ring account format:" = "Следующий аккаунт требуется преобразовать в новый формат аккаунта Ring:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "Введённый пароль не подходит к этому аккаунту";
 
 /* Alert dialog title */
-"The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
+"The username you entered do not match a RingID on the network" = "Введённое имя пользователя не совпадает с RingID в сети";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Для завершения процесса вам нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Чтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Ring. Если вы не готовы выбрать пароль, можете закрыть Ring и продолжить перенос позднее.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Неизвестно";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Вам нужно перенести аккаунт перед экспортом";
 
diff --git a/ui/ru.lproj/MainMenu.strings b/ui/ru.lproj/MainMenu.strings
index 16cd6a8..34a8547 100644
--- a/ui/ru.lproj/MainMenu.strings
+++ b/ui/ru.lproj/MainMenu.strings
@@ -45,7 +45,7 @@
 "150.title" = "Посмотреть всё";
 
 /* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
-"195.title" = "Остановитъ разговор";
+"195.title" = "Остановить разговор";
 
 /* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
 "196.title" = "Hачать разговор";
@@ -177,7 +177,7 @@
 "465.title" = "Переключить на нижний регистр";
 
 /* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
-"466.title" = "писать прописными буквами";
+"466.title" = "Писать прописными буквами";
 
 /* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
 "485.title" = "Вставить в текущем стиле";
@@ -198,16 +198,16 @@
 "593.title" = "Найти обновления...";
 
 /* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
-"12w-Fz-Scs.title" = "Show";
+"12w-Fz-Scs.title" = "Показать";
 
 /* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
-"1fJ-em-1ww.title" = "Show";
+"1fJ-em-1ww.title" = "Показать";
 
 /* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
-"GTY-d8-NBf.title" = "Show recent";
+"GTY-d8-NBf.title" = "Показать недавнее";
 
 /* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
-"GU3-tt-2de.title" = "Show contacts";
+"GU3-tt-2de.title" = "Показать контакты";
 
 /* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
-"Oco-m7-LtS.title" = "Show call history";
+"Oco-m7-LtS.title" = "Показать историю звонков";
diff --git a/ui/ru.lproj/MigrateRingAccountsWindow.strings b/ui/ru.lproj/MigrateRingAccountsWindow.strings
index 825c220..b4850fb 100644
--- a/ui/ru.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ru.lproj/MigrateRingAccountsWindow.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Перенос аккаунта завершён";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
 "859-10-HEb.placeholderString" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "Следующий аккаунт требуется преобразовать в новый формат аккаунта Ring:\\nПсевдоним:\\nID:\\nЧтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Ring. Если вы не готовы выбрать пароль, можете закрыть Ring и продолжить перенос позднее.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Ошибка переноса аккаунта";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Поздравляем, ваш аккаунт был успешно перенесён.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Удалить этот аккаунт";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Подтвердите ваш новый пароль…";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "OK";
@@ -30,19 +30,19 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Подтверждение";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
 "e7n-Ev-bK7.placeholderString" = "error label";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Перенести";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Пароль";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Account migration required";
+"wmv-sA-Mlh.title" = "Необходим перенос аккаунта";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Пароль...";
diff --git a/ui/ru.lproj/PreferencesWindow.strings b/ui/ru.lproj/PreferencesWindow.strings
index 9a95e4f..fcc045d 100644
--- a/ui/ru.lproj/PreferencesWindow.strings
+++ b/ui/ru.lproj/PreferencesWindow.strings
@@ -15,10 +15,10 @@
 "Qza-fj-d45.paletteLabel" = "Дополнительно";
 
 /* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.label" = "Учётные записи";
+"bRw-gW-tRJ.label" = "Аккаунты";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.paletteLabel" = "Учетные записи";
+"bRw-gW-tRJ.paletteLabel" = "Аккаунты";
 
 /* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
 "iuJ-eu-b7f.label" = "Звук";
diff --git a/ui/ru.lproj/RegisterNameWindow.strings b/ui/ru.lproj/RegisterNameWindow.strings
index 3cecbf6..873ceeb 100644
--- a/ui/ru.lproj/RegisterNameWindow.strings
+++ b/ui/ru.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Обязательно*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Другие пользователи могут использовать его вместо вашего RingID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Произошла ошибка во время регистрации вашего имени пользователя";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Введите пароль от вашего аккаунта Ring";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Окно";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Один момент...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Имя пользователя…";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Отмена";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Регистрация";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register username on the blockchain";
+"tje-EZ-ZPI.title" = "Зарегистрировать имя в блокчейн";
diff --git a/ui/ru.lproj/RingWindow.strings b/ui/ru.lproj/RingWindow.strings
index 428bbf2..9b49c9d 100644
--- a/ui/ru.lproj/RingWindow.strings
+++ b/ui/ru.lproj/RingWindow.strings
@@ -21,7 +21,7 @@
 "GAa-pQ-t4g.title" = "Текстовая ячейка";
 
 /* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Обращение";
+"Pav-Bw-GgK.title" = "Заголовок";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
 "Q1F-xo-N3e.placeholderString" = "Показать роль";
diff --git a/ui/ru.lproj/RingWizardChoose.strings b/ui/ru.lproj/RingWizardChoose.strings
index 7c59429..ba9f452 100644
--- a/ui/ru.lproj/RingWizardChoose.strings
+++ b/ui/ru.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "Отмена";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Привязать это устройство к аккаунту";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+"k1T-a7-yZD.title" = "Создать аккаунт Ring";
diff --git a/ui/ru.lproj/RingWizardLinkAccount.strings b/ui/ru.lproj/RingWizardLinkAccount.strings
index 8641553..6091dad 100644
--- a/ui/ru.lproj/RingWizardLinkAccount.strings
+++ b/ui/ru.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отмена";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Далее";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Произошла ошибка — пожалуйста, проверьте ваш пароль и PIN.";
+
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Один момент...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Отмена";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Введите пароль от вашего аккаунта Ring";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Отмена";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Отмена";
diff --git a/ui/ru.lproj/RingWizardNewAccount.strings b/ui/ru.lproj/RingWizardNewAccount.strings
index 587f4be..11d3bfb 100644
--- a/ui/ru.lproj/RingWizardNewAccount.strings
+++ b/ui/ru.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Обязательно*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Выберите ваш пароль";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Обязательно*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Один момент...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Повторите ваш пароль";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
+"gEy-ak-Cgq.placeholderString" = "'Неизвестно', если пусто…";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Отмена";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Ваш пароль должен содержать не менее 6 символов. Он будет использоваться для шифрования данных вашего аккаунта и для привязки новых устройств к аккаунту.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Создать";
diff --git a/ui/ru_RU.lproj/Localizable.strings b/ui/ru_RU.lproj/Localizable.strings
index dadb110..0377e16 100644
--- a/ui/ru_RU.lproj/Localizable.strings
+++ b/ui/ru_RU.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Поделится";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/ru_RU.lproj/RingWizardLinkAccount.strings b/ui/ru_RU.lproj/RingWizardLinkAccount.strings
index 5dcb3a4..6cdd53c 100644
--- a/ui/ru_RU.lproj/RingWizardLinkAccount.strings
+++ b/ui/ru_RU.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отмена";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Далее";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Отмена";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Отмена";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Отмена";
diff --git a/ui/ru_RU.lproj/RingWizardNewAccount.strings b/ui/ru_RU.lproj/RingWizardNewAccount.strings
index d1d2957..c40968c 100644
--- a/ui/ru_RU.lproj/RingWizardNewAccount.strings
+++ b/ui/ru_RU.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Неизвестный' пуст...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Выберите ваше имя пользователя";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Отмена";
diff --git a/ui/sv.lproj/Localizable.strings b/ui/sv.lproj/Localizable.strings
index 7e0319e..ea4bedf 100644
--- a/ui/sv.lproj/Localizable.strings
+++ b/ui/sv.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Kunde inte utföra uppslagning";
 
-/* Text shown to the user */
-"ID : " = "ID: ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Inkommande samtal från %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revidera indata";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Dela";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "Angivet användarnamn är tillgängligt";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "Användarnamnet är ogiltigt. Det måste vara minst 3 tecken långt och får endast innehålla små bokstäver.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "Lösenordet är inte tillgängligt";
diff --git a/ui/sv.lproj/RingWizardLinkAccount.strings b/ui/sv.lproj/RingWizardLinkAccount.strings
index 0f012b8..854ee18 100644
--- a/ui/sv.lproj/RingWizardLinkAccount.strings
+++ b/ui/sv.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Ange din PIN-kod";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Avbryt";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Nästa";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "Ett fel inträffade, kontrollera PIN-kod och lösenord.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Ett ögonblick...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Avbryt";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Ange Ring-kontots lösenord";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "För att koppla denna enhet till ett annat konto, måste du först ha en PIN-kod.\nFör att generera PIN-koden, går du till kontohanteringen i den andra enheten, väljer det Ring-konto du vill koppla, och sedan \"Koppla en annan enhet till detta konto\".\nDu får då den nödvändiga PIN-koden för att slutföra denna guide.\nPIN-koden är giltig endast 10 minuter.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Avbryt";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Avbryt";
diff --git a/ui/sv.lproj/RingWizardNewAccount.strings b/ui/sv.lproj/RingWizardNewAccount.strings
index e8f03d4..44ac80b 100644
--- a/ui/sv.lproj/RingWizardNewAccount.strings
+++ b/ui/sv.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Genom att aktivera det här, registrerar du ett unikt namn på Ring-nätverket. Andra mäniskor kan använda det för att kontakta dig.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoriskt*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Registrera namn offentligt (experimentellt)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Välj ditt lösenord";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Okänd' om tom...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Välj användarnamn";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Avbryt";
diff --git a/ui/tr.lproj/AccRing.strings b/ui/tr.lproj/AccRing.strings
index d7a88a3..17d3321 100644
--- a/ui/tr.lproj/AccRing.strings
+++ b/ui/tr.lproj/AccRing.strings
@@ -3,7 +3,7 @@
 "1Sx-Et-CDM.title" = "Hesap";
 
 /* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
-"8WI-fC-Due.title" = "RingID";
+"8WI-fC-Due.title" = "Ring Kimliği";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
 "B6b-iB-REZ.title" = "Önyükleme sunucusu";
@@ -12,7 +12,7 @@
 "EDd-FX-wcz.title" = "İzinler";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Adı kaydet";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "İsim ya da takma isim...";
@@ -30,7 +30,7 @@
 "ddk-1G-0jU.title" = "Ayarlanmış kullanıcı temsilcisini kullanın.";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
-"fSU-Pc-Y5a.title" = "Blockchain server";
+"fSU-Pc-Y5a.title" = "Blockchain sunucusu";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
 "fX7-9W-XFl.title" = "Kişi listenizdeki eşlerden aramalara izin ver";
@@ -42,4 +42,4 @@
 "lHI-bz-ddQ.title" = "Upnp etkin";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Kayıtlı Ad";
diff --git a/ui/tr.lproj/BackupAccountWindow.strings b/ui/tr.lproj/BackupAccountWindow.strings
index c6949d4..405e293 100644
--- a/ui/tr.lproj/BackupAccountWindow.strings
+++ b/ui/tr.lproj/BackupAccountWindow.strings
@@ -42,7 +42,7 @@
 "ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Parola...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Yedekleme esnasında bir hata oluştu";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "TAMAM";
diff --git a/ui/tr.lproj/ExportPasswordWindow.strings b/ui/tr.lproj/ExportPasswordWindow.strings
index 5b48b96..c4f8dfb 100644
--- a/ui/tr.lproj/ExportPasswordWindow.strings
+++ b/ui/tr.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Parola...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+"859-10-HEb.title" = "Başlarken bir Ring hesabı parolası edinin lütfen";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Pencere";
@@ -27,7 +27,7 @@
 "dfD-AK-f3R.title" = "TAMAM";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "etiket hatası";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "TAMAM";
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Parola";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Başka aygıtı bu hesaba bağla";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Parola...";
diff --git a/ui/tr.lproj/GeneralPrefs.strings b/ui/tr.lproj/GeneralPrefs.strings
index 4487178..656019c 100644
--- a/ui/tr.lproj/GeneralPrefs.strings
+++ b/ui/tr.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Güncelle";
 
 /* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+"uCL-ye-tsv.title" = "Masaüstü Bildirimlerini Etkinleştir";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Gelen aramalarda Ring'i ön plana çıkar";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+"vbU-2S-O58.title" = "Bu, kişileriniz ile paylaşıldı";
diff --git a/ui/tr.lproj/Localizable.strings b/ui/tr.lproj/Localizable.strings
index 31eefaf..f4d9b52 100644
--- a/ui/tr.lproj/Localizable.strings
+++ b/ui/tr.lproj/Localizable.strings
@@ -1,11 +1,11 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Dışa aktarma esnasında bir ağ hatası oluştu";
 
 /* Contextual menu action */
 "Add to contacts" = "Kişilere ekle";
 
 /* Text shown to the user */
-"Alias : " = "Alias : ";
+"Alias : " = "Takma Ad :";
 
 /* Error shown to the user */
 "An error occured during the export" = "Dışa aktarma esnasında bir hata oluştu";
@@ -41,28 +41,25 @@
 "Copy" = "Kopyala";
 
 /* Contextual menu action */
-"Copy name" = "Copy name";
+"Copy name" = "Adı kopyala";
 
 /* Contextual menu action */
 "Copy number" = "Numarayı kopyala";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create RING Account" = "Ring Hesabı Oluştur";
 
 /* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+"Create SIP Account" = "SİP Hesabı Oluştur";
 
 /* Alert dialog title */
-"Entered name not found" = "Entered name not found";
+"Entered name not found" = "Girilen ad bulunamadı";
 
 /* Error message shown to user when it is impossible to migrate account */
-"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Hesabınız taşınırken hata oluştu. Tekrar tamamı tıklayabilir veya hesabınızı silebilirsiniz.";
 
 /* Text shown to user when an error occur at registration */
-"Failed to perform lookup" = "Failed to perform lookup";
-
-/* Text shown to the user */
-"ID : " = "ID : ";
+"Failed to perform lookup" = "Bakma başarısız";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "%@'den gelen arama";
@@ -74,16 +71,16 @@
 "Message from %@" = "%@'den ileti";
 
 /* User label */
-"New SIP account" = "New SIP account";
+"New SIP account" = "Yeni SİP hesabı";
 
 /* Alert dialog title */
 "No valid account available" = "No valid account available";
 
 /* Text show to the user when password didn't match */
-"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+"Password and confirmation mismatch." = "Parola ve doğrulama uyuşmuyor";
 
 /* Indication for user */
-"Password is too short" = "Password is too short";
+"Password is too short" = "Parola çok kısa";
 
 /* Indication for user */
 "Passwords don't match" = "Parolalar uyuşmuyor";
@@ -104,10 +101,13 @@
 "Reopen account to see your hash" = "Karıştırdığınız yerlere bakıp hesabı yeniden açın";
 
 /* Contextual menu entry */
-"Restore account" = "Restore account";
+"Restore account" = "Hesabı geri yükle";
 
 /* Button title */
-"Revise Input" = "Revise Input";
+"Revise Input" = "Girdiyi Gözden Geçirin";
+
+/* Text shown to the user */
+"RingID : " = "RingID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Paylaş";
@@ -116,19 +116,19 @@
 "Text Actions" = "Metin Eylemleri";
 
 /* Text shown to user when his username is available to be registered */
-"The entered username is available" = "The entered username is available";
+"The entered username is available" = "Girilen kullanıcı adı uygun";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
-"The entered username is not available" = "The entered username is not available";
+"The entered username is not available" = "Girilen kullanıcı adı uygun değil";
 
 /* Text shown to the user */
 "The following account needs to be migrated to the new Ring account format:" = "Aşağıdaki hesabın yeni Ring hesabı biçimine göç ettirilmesi gerekir:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "Girdiğiniz parola bu hesabı açmaz";
 
 /* Alert dialog title */
 "The username you entered do not match a RingID on the network" = "The username you entered do not match a RingID on the network";
@@ -143,5 +143,5 @@
 "Unknown" = "Bilinmeyen";
 
 /* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
+"You have to migrate your account before exporting" = "Hesabı dışa aktarmadan önce taşımanız gerekir.";
 
diff --git a/ui/tr.lproj/MainMenu.strings b/ui/tr.lproj/MainMenu.strings
index 9843186..ce3372e 100644
--- a/ui/tr.lproj/MainMenu.strings
+++ b/ui/tr.lproj/MainMenu.strings
@@ -162,10 +162,10 @@
 "452.title" = "Büyük Harf Yap";
 
 /* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
-"454.title" = "Yazım hatalarını otomatik olarak düzelt";
+"454.title" = "Yazımları Kendiliğinden Düzelt";
 
 /* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
-"457.title" = "İkame edilenleri göster";
+"457.title" = "Yerine Koyulanları Göster";
 
 /* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
 "460.title" = "Akıllı Çizgiler";
@@ -177,7 +177,7 @@
 "465.title" = "Küçük Harf Yap";
 
 /* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
-"466.title" = "Sermaye sağlamak";
+"466.title" = "Büyük Harfle Yaz";
 
 /* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
 "485.title" = "Yapıştır ve Biçimi Koru";
diff --git a/ui/tr.lproj/MigrateRingAccountsWindow.strings b/ui/tr.lproj/MigrateRingAccountsWindow.strings
index ca70084..ec0fcc7 100644
--- a/ui/tr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/tr.lproj/MigrateRingAccountsWindow.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Hesap taşıma tamamlandı";
 
 /* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "RingID";
+"859-10-HEb.placeholderString" = "Ring Kimliği";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
 "859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
-"8K3-9Z-MKH.title" = "Account migration error";
+"8K3-9Z-MKH.title" = "Hesap taşıma hatası";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
 "C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Bu hesabi sil";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
 "KuO-oT-zhY.placeholderString" = "Confirm your new password...";
@@ -30,19 +30,19 @@
 "VN1-A3-RIh.title" = "TAMAM";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Doğrulama";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "etiket hatası";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Taşıma";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
 "vwh-K9-3O9.title" = "Parola";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Hesap göçü gerekli";
+"wmv-sA-Mlh.title" = "Hesap taşıma gerekli";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Parola...";
diff --git a/ui/tr.lproj/RegisterNameWindow.strings b/ui/tr.lproj/RegisterNameWindow.strings
index 641a0e6..1b564d4 100644
--- a/ui/tr.lproj/RegisterNameWindow.strings
+++ b/ui/tr.lproj/RegisterNameWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Zorunlu*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+"9gi-0u-67t.title" = "Diğer kullanıcılar Ring Kimliğiniz yerine onu kullanabilir";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
-"Aeh-tK-RjX.title" = "An error occured during your username registration";
+"Aeh-tK-RjX.title" = "Kullanıcı adınızı kaydederken bir hata oluştu";
 
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+"B6x-jj-48R.title" = "Ring hesap parolanızı girin";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Pencere";
@@ -18,7 +18,7 @@
 "YIN-YL-JBs.title" = "Bir saniye...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Kullanıcı adı...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "İptal";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Kaydol";
 
 /* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register username on the blockchain";
+"tje-EZ-ZPI.title" = "Kullanıcı adını blockchaine kaydet";
diff --git a/ui/tr.lproj/RingWizardChoose.strings b/ui/tr.lproj/RingWizardChoose.strings
index 1f2c087..751aa4e 100644
--- a/ui/tr.lproj/RingWizardChoose.strings
+++ b/ui/tr.lproj/RingWizardChoose.strings
@@ -3,7 +3,7 @@
 "YJ3-7G-cU1.title" = "İptal";
 
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Link this device to an account";
+"Z9K-mD-ucr.title" = "Bu aygıtı bir hesaba bağla";
 
 /* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Bir Ring hesabı oluştur";
diff --git a/ui/tr.lproj/RingWizardLinkAccount.strings b/ui/tr.lproj/RingWizardLinkAccount.strings
index 4056801..0692a55 100644
--- a/ui/tr.lproj/RingWizardLinkAccount.strings
+++ b/ui/tr.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "İptal";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "İleri";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Bir saniye...";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "İptal";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ring hesap parolanızı girin";
+
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "İptal";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "İptal";
diff --git a/ui/tr.lproj/RingWizardNewAccount.strings b/ui/tr.lproj/RingWizardNewAccount.strings
index 4cc12f6..7eea383 100644
--- a/ui/tr.lproj/RingWizardNewAccount.strings
+++ b/ui/tr.lproj/RingWizardNewAccount.strings
@@ -1,36 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Zorunlu*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Kullanıcı parolanızı seçin";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Zorunlu*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Bir saniye...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Parolanı tekrarla";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "Eğer yoksa 'Bilinmiyor'...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Kullanıcı adınızı seçin";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "İptal";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "Parolanız en az 6 karakterli olmalıdır. Hesap verinizi şifrelemek ve yeni aygıtları hesabınıza bağlamak için kullanılacak.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "Oluştur";
diff --git a/ui/uk.lproj/Localizable.strings b/ui/uk.lproj/Localizable.strings
index ed3ef3a..add0db3 100644
--- a/ui/uk.lproj/Localizable.strings
+++ b/ui/uk.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Вхідний виклик від %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Поділитися";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/uk.lproj/RingWizardLinkAccount.strings b/ui/uk.lproj/RingWizardLinkAccount.strings
index 29a3f91..ba0c81f 100644
--- a/ui/uk.lproj/RingWizardLinkAccount.strings
+++ b/ui/uk.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Відміна";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Наступний";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Зачекайте трохи...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Відміна";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Відміна";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Відміна";
diff --git a/ui/uk.lproj/RingWizardNewAccount.strings b/ui/uk.lproj/RingWizardNewAccount.strings
index f0b74f5..5924e55 100644
--- a/ui/uk.lproj/RingWizardNewAccount.strings
+++ b/ui/uk.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Невідомо' якщо пусто";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Оберіть ваше ім'я користувача";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Відміна";
diff --git a/ui/zh.lproj/Localizable.strings b/ui/zh.lproj/Localizable.strings
index 5f013df..9dfdcda 100644
--- a/ui/zh.lproj/Localizable.strings
+++ b/ui/zh.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "分享";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/zh.lproj/RingWizardLinkAccount.strings b/ui/zh.lproj/RingWizardLinkAccount.strings
index fe37ed4..3cc7979 100644
--- a/ui/zh.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "取消";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "下一步";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "請稍待片刻...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "取消";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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."; ObjectID = "dJ0-Rk-Rqr"; */
-"dJ0-Rk-Rqr.title" = "To link this device to another account, you first need to obtain a pin code. 
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and 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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "取消";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "取消";
diff --git a/ui/zh.lproj/RingWizardNewAccount.strings b/ui/zh.lproj/RingWizardNewAccount.strings
index 097348b..542760c 100644
--- a/ui/zh.lproj/RingWizardNewAccount.strings
+++ b/ui/zh.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "選擇你的使用者名稱";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "取消";
diff --git a/ui/zh_TW.lproj/Localizable.strings b/ui/zh_TW.lproj/Localizable.strings
index 18b9d6b..888c6fc 100644
--- a/ui/zh_TW.lproj/Localizable.strings
+++ b/ui/zh_TW.lproj/Localizable.strings
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Share";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";