diff --git a/ui/ms.lproj/AccAdvanced.strings b/ui/ms.lproj/AccAdvanced.strings
index 4cd9053..6b5d17b 100644
--- a/ui/ms.lproj/AccAdvanced.strings
+++ b/ui/ms.lproj/AccAdvanced.strings
@@ -69,4 +69,4 @@
 "xGw-j0-4ID.title" = "seconds";
 
 /* Class = "NSTextFieldCell"; title = "Registration"; ObjectID = "yB5-ET-gBL"; */
-"yB5-ET-gBL.title" = "Registration";
+"yB5-ET-gBL.title" = "Pendaftaran";
diff --git a/ui/ms.lproj/AccGeneral.strings b/ui/ms.lproj/AccGeneral.strings
index 3bec01b..00f0a9f 100644
--- a/ui/ms.lproj/AccGeneral.strings
+++ b/ui/ms.lproj/AccGeneral.strings
@@ -21,7 +21,7 @@
 "N5h-tI-ZLz.title" = "Upnp enabled";
 
 /* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
-"Rg8-qR-h1X.title" = "DTMF tone type";
+"Rg8-qR-h1X.title" = "Jenis bunyi DTMF";
 
 /* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
 "UXm-73-BNy.title" = "Show password";
@@ -30,13 +30,13 @@
 "WCR-30-BX0.title" = "Password:";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
-"YMy-QE-7A3.title" = "Auto-answer calls";
+"YMy-QE-7A3.title" = "Jawab panggilan automatik";
 
 /* 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";
+"mlN-YG-fLS.title" = "Butiran";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
 "upU-sL-9i3.title" = "Akaun";
diff --git a/ui/ms.lproj/AccRing.strings b/ui/ms.lproj/AccRing.strings
index b3612ea..24a14fd 100644
--- a/ui/ms.lproj/AccRing.strings
+++ b/ui/ms.lproj/AccRing.strings
@@ -18,7 +18,7 @@
 "HN3-i9-zmw.placeholderString" = "Name or nickname...";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "OeY-na-0YT"; */
-"OeY-na-0YT.title" = "Auto-answer calls";
+"OeY-na-0YT.title" = "Jawab panggilan automatik";
 
 /* 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";
diff --git a/ui/ms.lproj/BackupAccountWindow.strings b/ui/ms.lproj/BackupAccountWindow.strings
index fdb47b6..152dbc6 100644
--- a/ui/ms.lproj/BackupAccountWindow.strings
+++ b/ui/ms.lproj/BackupAccountWindow.strings
@@ -27,7 +27,7 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
-"cSU-aD-OwX.title" = "Cancel";
+"cSU-aD-OwX.title" = "Batal";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
 "ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
diff --git a/ui/ms.lproj/Conversation.strings b/ui/ms.lproj/Conversation.strings
new file mode 100644
index 0000000..3c15c6d
--- /dev/null
+++ b/ui/ms.lproj/Conversation.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
+"FgV-iF-gGQ.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
+"HnC-1N-RmR.placeholderString" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
+"Ilz-7v-2fr.placeholderString" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
+
+/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
+"bsl-nv-Wqq.title" = "Start the conversation!";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "Rakam";
diff --git a/ui/ms.lproj/CurrentCall.strings b/ui/ms.lproj/CurrentCall.strings
index 9fb962d..90291d5 100644
--- a/ui/ms.lproj/CurrentCall.strings
+++ b/ui/ms.lproj/CurrentCall.strings
@@ -18,7 +18,7 @@
 "EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
-"G0w-c3-9pJ.ibShadowedToolTip" = "Record";
+"G0w-c3-9pJ.ibShadowedToolTip" = "Rakam";
 
 /* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
 "KPG-pB-gPm.title" = "Answer";
@@ -30,10 +30,10 @@
 "LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
 
 /* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
-"TlL-HO-5Ey.title" = "Cancel";
+"TlL-HO-5Ey.title" = "Batal";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
-"VVL-A4-r7n.ibShadowedToolTip" = "Record";
+"VVL-A4-r7n.ibShadowedToolTip" = "Rakam";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
 "X0W-vv-xua.title" = "wants to talk to you!";
@@ -54,7 +54,7 @@
 "mc3-HV-hek.ibShadowedToolTip" = "Putuskan";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
-"oRa-pS-HN2.ibShadowedToolTip" = "Record";
+"oRa-pS-HN2.ibShadowedToolTip" = "Rakam";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
 "osk-LS-0Qg.placeholderString" = "Person name";
diff --git a/ui/ms.lproj/ExportPasswordWindow.strings b/ui/ms.lproj/ExportPasswordWindow.strings
index 0ef91a8..59731ac 100644
--- a/ui/ms.lproj/ExportPasswordWindow.strings
+++ b/ui/ms.lproj/ExportPasswordWindow.strings
@@ -21,7 +21,7 @@
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
-"cSU-aD-OwX.title" = "Cancel";
+"cSU-aD-OwX.title" = "Batal";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
 "dfD-AK-f3R.title" = "OK";
diff --git a/ui/ms.lproj/RegisterNameWindow.strings b/ui/ms.lproj/RegisterNameWindow.strings
index 3b1ff9e..3857724 100644
--- a/ui/ms.lproj/RegisterNameWindow.strings
+++ b/ui/ms.lproj/RegisterNameWindow.strings
@@ -21,10 +21,10 @@
 "bdC-Uc-Qhs.placeholderString" = "Username...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
-"cbA-c2-LlV.title" = "Cancel";
+"cbA-c2-LlV.title" = "Batal";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
-"eoS-s7-b3w.title" = "Cancel";
+"eoS-s7-b3w.title" = "Batal";
 
 /* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
 "fOn-FV-2x8.title" = "Ok";
diff --git a/ui/ms.lproj/RingWindow.strings b/ui/ms.lproj/RingWindow.strings
index 591450e..d90a54f 100644
--- a/ui/ms.lproj/RingWindow.strings
+++ b/ui/ms.lproj/RingWindow.strings
@@ -44,8 +44,8 @@
 /* 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"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/ms.lproj/RingWizardChoose.strings b/ui/ms.lproj/RingWizardChoose.strings
index b71a670..2206e6b 100644
--- a/ui/ms.lproj/RingWizardChoose.strings
+++ b/ui/ms.lproj/RingWizardChoose.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
-"YJ3-7G-cU1.title" = "Cancel";
+"YJ3-7G-cU1.title" = "Batal";
 
 /* 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";
diff --git a/ui/ms.lproj/RingWizardLinkAccount.strings b/ui/ms.lproj/RingWizardLinkAccount.strings
new file mode 100644
index 0000000..27a628b
--- /dev/null
+++ b/ui/ms.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" = "Batal";
+
+/* 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" = "Batal";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter your Ring account password";
+
+/* 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" = "Batal";
diff --git a/ui/ms.lproj/RingWizardNewAccount.strings b/ui/ms.lproj/RingWizardNewAccount.strings
new file mode 100644
index 0000000..53af4ec
--- /dev/null
+++ b/ui/ms.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" = "Just a moment...";
+
+/* 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" = "Batal";
+
+/* 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";