diff --git a/ui/ar.lproj/AccAdvancedRing.strings b/ui/ar.lproj/AccAdvancedRing.strings
index a940fcc..25725a6 100644
--- a/ui/ar.lproj/AccAdvancedRing.strings
+++ b/ui/ar.lproj/AccAdvancedRing.strings
@@ -1,9 +1,9 @@
 
 /* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+"1Xr-BO-Pu3.title" = "السماح لأطراف غير موثوقة بالاتصال";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
-"25Q-c1-ld3.title" = "UPnP";
+"25Q-c1-ld3.title" = "بروتوكول UPnP";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "538-we-FTp"; */
 "538-we-FTp.title" = "صندوق";
@@ -12,13 +12,13 @@
 "7eU-EP-4br.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "عنوان بروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
-"BIS-Ft-yJn.title" = "Call settings";
+"BIS-Ft-yJn.title" = "إعدادات الاتصال";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "الرد الآلي على المكالمات ";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "خلية نص";
@@ -39,16 +39,16 @@
 "Qxp-I4-A7W.title" = "تأمين";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "تفعيل البروكسي";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "مرمّزات الفيديو";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
-"XU0-bl-lDD.title" = "TURN realm";
+"XU0-bl-lDD.title" = "حقل بروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "عنوان STUN";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "تشغيل ذاتي";
@@ -69,13 +69,13 @@
 "eGX-gk-Zxp.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
-"eMG-uY-bpH.title" = "TURN username";
+"eMG-uY-bpH.title" = "اسم المستخدم لبروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
 "g8T-u3-MS3.title" = "خلية نص";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "gUl-Px-cIJ"; */
-"gUl-Px-cIJ.title" = "TURN password";
+"gUl-Px-cIJ.title" = "كلمة المرور لبروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
 "k7i-pK-JXp.title" = "شهادة CA";
@@ -84,10 +84,10 @@
 "nqX-Vu-UuA.title" = "إستعمل STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "نغمة مخصصة";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "الاتصال";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
 "soR-nF-ybe.title" = "المفتاح الخاص";
@@ -99,7 +99,7 @@
 "vYi-gW-MrY.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
-"xJT-ij-69q.title" = "OpenDHT configuration";
+"xJT-ij-69q.title" = "تهيئة OpenDHT";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
 "zPJ-cO-neQ.title" = "إستعمل TURN";
diff --git a/ui/ar.lproj/AccAdvancedSip.strings b/ui/ar.lproj/AccAdvancedSip.strings
index d18362c..51b8e09 100644
--- a/ui/ar.lproj/AccAdvancedSip.strings
+++ b/ui/ar.lproj/AccAdvancedSip.strings
@@ -12,16 +12,16 @@
 "2rB-Bv-c9U.title" = "Registration expire timeout (seconds)";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "3Uq-Nb-J1A"; */
-"3Uq-Nb-J1A.title" = "Call settings";
+"3Uq-Nb-J1A.title" = "إعدادات الاتصال";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "إلجأ إلى RTP عند فشل التشفير";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "الرد الآلي على المكالمات ";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
-"6eH-la-JbF.title" = "TURN realm";
+"6eH-la-JbF.title" = "حقل بروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
 "72p-GY-gu6.title" = "كلمة سر المفتاح الخاص";
@@ -39,7 +39,7 @@
 "A31-3Y-z4R.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
-"ELr-A7-mGE.title" = "Published address";
+"ELr-A7-mGE.title" = "العنوان المنشور";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
 "Gwi-Mp-NpZ.title" = "إستعمل TURN";
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "إستعمل STUN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "عنوان STUN";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "استلزم شهادة للإتصالات TLS الواردة";
@@ -63,7 +63,7 @@
 "Mho-w1-ZPJ.title" = "Item 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
-"Nqr-gj-dOH.title" = "Custom ringtone";
+"Nqr-gj-dOH.title" = "نغمة مخصصة";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -99,7 +99,7 @@
 "Zuz-jy-rLn.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "عنوان بروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "شهادة CA";
@@ -117,10 +117,10 @@
 "ekM-Cg-DEo.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
-"fjH-ej-gEr.title" = "Network interface";
+"fjH-ej-gEr.title" = "واجهة الشبكة";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "التحقق من الشهادات الواردة (من طرف الخادم)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "مرمّزات الفيديو";
@@ -138,19 +138,19 @@
 "nq0-Js-9Cr.title" = "الحد الأدنى";
 
 /* Class = "NSButtonCell"; title = "Use custom address and port"; ObjectID = "nuq-Wl-sfd"; */
-"nuq-Wl-sfd.title" = "Use custom address and port";
+"nuq-Wl-sfd.title" = "استخدام عنوان ونقطة عبور مخصصين";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
-"rMN-Wf-tmp.title" = "TURN username";
+"rMN-Wf-tmp.title" = "اسم المستخدم لبروتوكول TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "تشفير تدفقات وسائط الميديا(SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "تشفير التفاوض (TLS)";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "vpo-fl-9TS"; */
-"vpo-fl-9TS.title" = "Connectivity";
+"vpo-fl-9TS.title" = "الاتصال";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "الحد الاقصى";
@@ -159,10 +159,10 @@
 "wyZ-Hb-BNf.title" = "صندوق";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "x93-zk-hAW"; */
-"x93-zk-hAW.title" = "UPnP";
+"x93-zk-hAW.title" = "بروتوكول UPnP";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "xjL-Wb-7VN"; */
-"xjL-Wb-7VN.title" = "TURN password";
+"xjL-Wb-7VN.title" = "كلمة المرور لبروتوكول TURN";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
 "zBy-cW-KY3.title" = "أسلوب بروتوكول TLS";
diff --git a/ui/ar.lproj/AccRingGeneral.strings b/ui/ar.lproj/AccRingGeneral.strings
index a9f0c40..84e4f12 100644
--- a/ui/ar.lproj/AccRingGeneral.strings
+++ b/ui/ar.lproj/AccRingGeneral.strings
@@ -1,33 +1,33 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "تصدير الحساب";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
-"6fI-98-VvQ.title" = "Banned Contacts";
+"6fI-98-VvQ.title" = "جهات الاتصال المحظورة";
 
 /* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
 "Hbq-nL-BhK.title" = "إعدادات متقدمة";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "تفعيل";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
 "TYk-QK-iaT.title" = "كلمة السر:";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
-"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+"WEo-a0-wVL.ibShadowedToolTip" = "تعديل الاسم";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "حذف الحساب";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "خلية نص";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
-"bOY-mY-1Yo.ibShadowedToolTip" = "Unblock";
+"bOY-mY-1Yo.ibShadowedToolTip" = "إزالة الحظر";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "اسم المستخدم:";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "سجل";
@@ -36,7 +36,7 @@
 "gTn-6p-Gtk.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "kt0-P6-fdQ"; */
-"kt0-P6-fdQ.placeholderString" = "Enter name";
+"kt0-P6-fdQ.placeholderString" = "أدخِل اسم";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
 "lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
@@ -45,13 +45,13 @@
 "oVO-wj-fwQ.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "الأجهزة المتصلة";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "المُعرّف:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
-"tWk-Od-BEQ.title" = "Link another device";
+"tWk-Od-BEQ.title" = "اربط جهازاً آخر";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "حساب";
diff --git a/ui/ar.lproj/AccSipGeneral.strings b/ui/ar.lproj/AccSipGeneral.strings
index 952633f..d1ab10b 100644
--- a/ui/ar.lproj/AccSipGeneral.strings
+++ b/ui/ar.lproj/AccSipGeneral.strings
@@ -3,22 +3,22 @@
 "688-Sx-Gvr.title" = "الوكيل";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "اسم المستخدم";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
-"R7s-DE-PiP.title" = "Voicemail";
+"R7s-DE-PiP.title" = "البريد الصوتي";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YAG-qB-4wH"; */
-"YAG-qB-4wH.placeholderString" = "Enter name";
+"YAG-qB-4wH.placeholderString" = "أدخِل اسم";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Yof-e7-IBF"; */
 "Yof-e7-IBF.title" = "كلمة السر";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "خادم SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "حساب";
@@ -27,13 +27,13 @@
 "iEr-fN-5vD.title" = "إعدادات متقدمة";
 
 /* Class = "NSButtonCell"; title = "Edit Account"; ObjectID = "jdU-uZ-Rfy"; */
-"jdU-uZ-Rfy.title" = "Edit Account";
+"jdU-uZ-Rfy.title" = "تعديل الحساب";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "تفعيل";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "خذ لمحة";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "حذف الحساب";
diff --git a/ui/ar.lproj/AccountBackupVC.strings b/ui/ar.lproj/AccountBackupVC.strings
new file mode 100644
index 0000000..cc73d09
--- /dev/null
+++ b/ui/ar.lproj/AccountBackupVC.strings
@@ -0,0 +1,18 @@
+
+/* Class = "NSButtonCell"; title = "Skip"; ObjectID = "73h-fa-4yX"; */
+"73h-fa-4yX.title" = "تخطي";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup. Please check your credentials."; ObjectID = "7lU-Qy-WOb"; */
+"7lU-Qy-WOb.title" = "An error occured during the backup. Please check your credentials.";
+
+/* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
+"PVF-bb-Yoi.title" = "Never show me this again";
+
+/* Class = "NSTextFieldCell"; title = "This account only exists on this device. If you lost your device or uninstall the application, your account will be deleted. You can backup your account now or later."; ObjectID = "SUG-lC-TDL"; */
+"SUG-lC-TDL.title" = "This account only exists on this device. If you lost your device or uninstall the application, your account will be deleted. You can backup your account now or later.";
+
+/* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
+"cod-s7-SPd.title" = "Export account";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "ruw-Kp-tCz"; */
+"ruw-Kp-tCz.title" = "موافق";
diff --git a/ui/ar.lproj/AccountMenuItemView.strings b/ui/ar.lproj/AccountMenuItemView.strings
new file mode 100644
index 0000000..4ca4d3a
--- /dev/null
+++ b/ui/ar.lproj/AccountMenuItemView.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
+"7sc-IE-yuO.title" = "Label";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
+"BkF-b3-tzE.ibShadowedToolTip" = "Create New Account";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ZIZ-jd-eLK"; */
+"ZIZ-jd-eLK.title" = "صندوق";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
+"gOS-aC-TGo.title" = "Label";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
+"uPR-fc-nOP.title" = "Label";
diff --git a/ui/ar.lproj/AccountSettings.strings b/ui/ar.lproj/AccountSettings.strings
new file mode 100644
index 0000000..aa25d4d
--- /dev/null
+++ b/ui/ar.lproj/AccountSettings.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "cyq-zN-98i"; */
+"cyq-zN-98i.ibShadowedToolTip" = "السابق";
diff --git a/ui/ar.lproj/AddSIPAccountVC.strings b/ui/ar.lproj/AddSIPAccountVC.strings
index 1a4ab01..453f814 100644
--- a/ui/ar.lproj/AddSIPAccountVC.strings
+++ b/ui/ar.lproj/AddSIPAccountVC.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "أدخِل عنوان بروتوكول SIP";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "كلمة السر";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter password"; ObjectID = "DBU-zJ-vj6"; */
-"DBU-zJ-vj6.placeholderString" = "Enter password";
+"DBU-zJ-vj6.placeholderString" = "أدخِل كلمة المرور";
 
 /* Class = "NSButtonCell"; title = "Done"; ObjectID = "DJz-do-CJo"; */
 "DJz-do-CJo.title" = "منجز";
@@ -15,19 +15,19 @@
 "O1S-KI-2LG.title" = "ألغِ";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter username"; ObjectID = "Rej-Yd-PDb"; */
-"Rej-Yd-PDb.placeholderString" = "Enter username";
+"Rej-Yd-PDb.placeholderString" = "أدخِل اسم المستخدم";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "اسم المستخدم";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
-"YeS-R8-ZLT.placeholderString" = "Enter name";
+"YeS-R8-ZLT.placeholderString" = "أدخِل اسم";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "fgN-nq-QdO"; */
 "fgN-nq-QdO.title" = "خذ لمحة";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "خادم SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "حساب";
diff --git a/ui/ar.lproj/AudioPrefs.strings b/ui/ar.lproj/AudioPrefs.strings
index 77116da..e9e4e5c 100644
--- a/ui/ar.lproj/AudioPrefs.strings
+++ b/ui/ar.lproj/AudioPrefs.strings
@@ -2,20 +2,5 @@
 /* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
 "2gZ-Ab-XHf.title" = "الانتاج";
 
-/* 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" = "الأجهزة الصوتية";
-
-/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
-"jeD-Nk-KHA.title" = "التسجيل دائما";
-
-/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
-"ksV-r2-EVJ.title" = "سجل في";
-
-/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
-"pAA-Iv-EmI.title" = "أخرس DTMF";
-
 /* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
 "x1o-rT-jy6.title" = "المدخلات";
diff --git a/ui/ar.lproj/Conversation.strings b/ui/ar.lproj/Conversation.strings
index 32b96f2..e128b15 100644
--- a/ui/ar.lproj/Conversation.strings
+++ b/ui/ar.lproj/Conversation.strings
@@ -1,24 +1,54 @@
 
+/* Class = "NSButtonCell"; title = "🙂"; ObjectID = "8sX-aI-9OG"; */
+"8sX-aI-9OG.title" = "🙂";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
+"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
+
 /* 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 = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
+"RuH-fO-poy.ibShadowedToolTip" = "Start audio call";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "إرسال رسالة";
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
+"UJf-cF-RAo.ibShadowedToolTip" = "أرسل";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "إرسال رسالة";
+/* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
+"cFH-d7-Erh.ibShadowedToolTip" = "Start video call";
 
-/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "ابدأ المحادثة!";
+/* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
+"ciI-CA-tly.title" = "صندوق";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
-"ooq-vs-Xt1.ibShadowedToolTip" = "تسجيل";
+/* Class = "NSBox"; title = "Box"; ObjectID = "fh9-Uo-8R1"; */
+"fh9-Uo-8R1.title" = "صندوق";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
+"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
+"hrX-ac-Quk.title" = "صندوق";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "السابق";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
+"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "pRL-vb-me9"; */
+"pRL-vb-me9.title" = "صندوق";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record an audio message"; ObjectID = "wYE-S3-AzD"; */
+"wYE-S3-AzD.ibShadowedToolTip" = "Record an audio message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "إرسال رسالة";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedMultipleValuesPlaceholder" = "إرسال رسالة";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedNoSelectionPlaceholder" = "إرسال رسالة";
diff --git a/ui/ar.lproj/CurrentCall.strings b/ui/ar.lproj/CurrentCall.strings
index 983c70d..4207c05 100644
--- a/ui/ar.lproj/CurrentCall.strings
+++ b/ui/ar.lproj/CurrentCall.strings
@@ -2,26 +2,17 @@
 /* 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 = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
+"4xt-xs-LVn.title" = "صندوق";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
-"ChW-kg-Sja.ibShadowedToolTip" = "نقل";
+/* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
+"DSf-SJ-l6k.title" = "صندوق";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
-"D0G-XT-lhI.ibShadowedToolTip" = "أنهي المكالمة";
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
+"GBy-HF-JeP.title" = "Label";
 
-/* 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 = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
+"KCp-bZ-69S.title" = "صندوق";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
 "Kjq-iM-NBL.ibShadowedToolTip" = "أنهي المكالمة";
@@ -29,53 +20,53 @@
 /* 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 = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedMultipleValuesPlaceholder" = "إرسال رسالة";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
-"VVL-A4-r7n.ibShadowedToolTip" = "تسجيل";
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNoSelectionPlaceholder" = "إرسال رسالة";
 
-/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "wants to talk to you!";
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNotApplicablePlaceholder" = "إرسال رسالة";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "QYT-0n-4sw"; */
+"QYT-0n-4sw.ibShadowedToolTip" = "تسجيل";
+
+/* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
+"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
+"YGj-SP-ikj.title" = "خلية نص";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
 "anb-Y8-JQi.ibShadowedToolTip" = "توقف مؤقت";
 
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "d4g-hS-EMn"; */
+"d4g-hS-EMn.placeholderString" = "إرسال رسالة";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "dPt-JY-yxV"; */
+"dPt-JY-yxV.placeholderString" = "حالة";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
 "fmp-x4-Pef.ibShadowedToolTip" = "غير حالة الدردشة ";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "أضف مشارك";
+/* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
+"hKi-Ay-ex5.title" = "person Id";
 
-/* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
-"kxH-yM-TLd.title" = "زر";
+/* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
+"hfc-s5-yWK.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 = "Send a file"; ObjectID = "ngO-WV-cXD"; */
+"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
 "qgD-3D-nD5.ibShadowedToolTip" = "التقط الهاتف";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "rqa-be-VIB"; */
+"rqa-be-VIB.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" = "يريد أن يكلمك!";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
-"zsO-T7-9yi.placeholderString" = "الوقت";
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "ues-20-34k"; */
+"ues-20-34k.placeholderString" = "اسم الشخص";
diff --git a/ui/ar.lproj/ExportPasswordWindow.strings b/ui/ar.lproj/ExportPasswordWindow.strings
index 2e8f768..05b818b 100644
--- a/ui/ar.lproj/ExportPasswordWindow.strings
+++ b/ui/ar.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "كلمة السر...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your password to start";
+"859-10-HEb.title" = "من فضلك أدخل كلمة المرور للبدء";
 
 /* 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/ar.lproj/GeneralPrefs.strings b/ui/ar.lproj/GeneralPrefs.strings
index ac0ad39..7174f7a 100644
--- a/ui/ar.lproj/GeneralPrefs.strings
+++ b/ui/ar.lproj/GeneralPrefs.strings
@@ -1,42 +1,54 @@
 
-/* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "أبقي على تاريخي ل";
+/* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
+"0jV-Q4-232.title" = "Enable notifications for incoming messages";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "كل شهر";
 
+/* Class = "NSTextFieldCell"; title = "Download folder"; ObjectID = "6Ye-pe-9WV"; */
+"6Ye-pe-9WV.title" = "Download folder";
+
+/* Class = "NSButtonCell"; title = "Always record calls"; ObjectID = "6zp-rh-brb"; */
+"6zp-rh-brb.title" = "Always record calls";
+
+/* Class = "NSTextFieldCell"; title = "System"; ObjectID = "8xm-Tc-NMN"; */
+"8xm-Tc-NMN.title" = "النظام";
+
+/* Class = "NSTextFieldCell"; title = "  0"; ObjectID = "9sg-PF-ffw"; */
+"9sg-PF-ffw.title" = "  0";
+
 /* 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 = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
+"AOr-Cq-w57.title" = "Quality(Kbps)";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Profile"; ObjectID = "MV1-AC-qE7"; */
-"MV1-AC-qE7.ibShadowedToolTip" = "خذ لمحة";
+/* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
+"I0d-mx-KhT.title" = "Notifications";
+
+/* Class = "NSTextFieldCell"; title = "6000"; ObjectID = "JGj-TS-Hxl"; */
+"JGj-TS-Hxl.title" = "6000";
+
+/* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
+"Lww-Wb-yrf.title" = "Enable notifications for invitations";
 
 /* 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" = "Behaviours";
+/* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
+"Qb8-tb-vJd.title" = "Call recording";
 
 /* 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 = "NSTextFieldCell"; title = "Conversations"; ObjectID = "ZCU-sa-SEk"; */
+"ZCU-sa-SEk.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 = "NSTextFieldCell"; title = "Record folder"; ObjectID = "ep4-QU-rGl"; */
+"ep4-QU-rGl.title" = "Record folder";
 
 /* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
 "mbu-TH-bs8.title" = "كل ساعة";
@@ -45,10 +57,10 @@
 "r4u-t3-gBc.title" = "التحديث";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable notifications for incoming calls";
+"uCL-ye-tsv.title" = "تفعيل الإشعارات للمكالمات الواردة";
 
 /* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "Bring Jami to foreground on incoming calls";
+"uYI-hA-JHk.title" = "عرض جامي على واجه الشاشة عند تلقي مكالمة واردة";
 
-/* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "This is shared with your contacts ";
+/* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
+"y5x-4d-E26.title" = "Record local video";
diff --git a/ui/ar.lproj/LeaveMessageVC.strings b/ui/ar.lproj/LeaveMessageVC.strings
index a1a42b0..775c53a 100644
--- a/ui/ar.lproj/LeaveMessageVC.strings
+++ b/ui/ar.lproj/LeaveMessageVC.strings
@@ -2,20 +2,26 @@
 /* Class = "NSTextFieldCell"; title = "00:00"; ObjectID = "78U-cA-2f2"; */
 "78U-cA-2f2.title" = "00:00";
 
-/* Class = "NSBox"; title = "Box"; ObjectID = "MxH-aj-EXO"; */
-"MxH-aj-EXO.title" = "صندوق";
+/* Class = "NSButtonCell"; title = "Send message"; ObjectID = "Bjm-hd-lQU"; */
+"Bjm-hd-lQU.title" = "إبعث رسالة";
+
+/* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
+"M07-cf-bjZ.title" = "Go back to conversations";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
 "TwL-yO-BXI.title" = "صندوق";
 
-/* Class = "NSBox"; title = "Box"; ObjectID = "Zlv-nH-Y9y"; */
-"Zlv-nH-Y9y.title" = "صندوق";
-
-/* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
+"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "تسجيل";
 
-/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "uol-7p-Y2J"; */
-"uol-7p-Y2J.title" = "الاسم";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
+"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
+"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+
+/* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
+"zTC-Gf-lAV.title" = "Record a message";
diff --git a/ui/ar.lproj/Localizable.strings b/ui/ar.lproj/Localizable.strings
index 3b10853..ad96439 100644
--- a/ui/ar.lproj/Localizable.strings
+++ b/ui/ar.lproj/Localizable.strings
@@ -1,77 +1,56 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "حدث خطأ في الشبكة أثناء التصدير";
 
-/* No password on this account text field placeholder */
-"Account has no password" = "Account has no password";
+/* Button Action */
+"Accept" = "اقبل";
+
+/* Welcome title */
+"Add a SIP account" = "Add a SIP account";
 
 /* Contextual menu action */
 "Add to contacts" = "أضف إلى الاتصالات المعروفة";
 
-/* Contextual menu action */
-"Place video call" = "Place video call";
-
-/* Contextual menu action */
-"Place audio call" = "Place audio call";
-
-/* Contextual menu action */
-"Clear conversation" = "Clear conversation";
-
-/* Contextual menu action */
-"Block contact" = "Block contact";
-
-/* Text shown to the user */
-"Alias : " = "Alias : ";
+/* Backup error */
+"An error occured during the backup" = "حدث خطأ أثناء إجراء النسخ الاحتياطي";
 
 /* 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";
+/* Peer busy message */
+"appears to be busy." = "appears to be busy.";
+
+/* Error audio permission */
+"Audio permission not granted" = "Audio permission not granted";
+
+/* Backup account */
+"Backup your account" = "Backup your account";
 
 /* Contextual menu action */
-"Call number" = "Call number";
+"Block contact" = "حظر جهة إتصال";
+
+/* Remove account alert message */
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
 
 /* File transfer canceled label */
 "Canceled" = "Canceled";
 
-/* Open panel title */
-"Choose a CA list" = "أضف إلى قائمة هيئات الشهادة CA";
-
-/* Open panel title */
-"Choose a certificate" = "إختار شهادة";
-
-/* Open panel title */
-"Choose a directory" = "Choose a directory";
-
-/* Open panel title */
-"Choose a private key file" = "إختار ملف مفتاح خاص";
-
-/* Open panel prompt for 'Choose a file' */
-"Choose CA" = "إختار هيئة شهادة CA";
-
-/* Open panel prompt for 'Choose a directory' */
-"Choose directory" = "Choose directory";
-
 /* Contextual menu entry */
 "Choose file" = "إختار ملف";
 
-/* Contextual menu entry */
-"Share screen" = "Share screen";
+/* Contextual menu action */
+"Clear conversation" = "Clear conversation";
 
 /* No comment provided by engineer. */
 "Copy" = "إنسخ";
 
-/* Contextual menu action */
-"Copy name" = "Copy name";
+/* Recording view explanation label */
+"Could not record message during call" = "Could not record message during call";
 
-/* Contextual menu action */
-"Copy number" = "نسخ الرقم";
+/* Welcome title */
+"Create a new account" = "Create a new account";
 
-/* Contextual menu entry */
-"Create Jami Account" = "Create Jami Account";
-
-/* Contextual menu entry */
-"Create SIP Account" = "Create SIP Account";
+/* Backup enter password */
+"Enter account password" = "Enter account password";
 
 /* File transfer failed label */
 "Failed" = "فشل";
@@ -82,24 +61,33 @@
 /* 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: ";
+
+/* link account title */
+"Import from backup" = "Import from backup";
+
+/* link account title */
+"Import from other device" = "Import from other device";
+
 /* Incoming call from {Name} */
 "Incoming call from %@" = "مكالمة قادمة من %@";
 
 /* Incoming message from {Name} */
 "Incoming message from %@" = "Incoming message from %@";
 
-/* Message from {Name} */
-"Message from %@" = "رسالة من %@";
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username" = "Invalid username";
 
-/* User label */
-"New SIP account" = "New SIP account";
-
-/* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username." = "Invalid username.";
 
 /* Allert message when no accounts are available */
 "Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
 
+/* Displayed as RingID when no accounts are available for selection */
+"No account available" = "No account available";
+
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "Password and confirmation mismatch.";
 
@@ -109,34 +97,48 @@
 /* Indication for user */
 "Passwords don't match" = "Passwords don't match";
 
-/* Button label */
-"Pause" = "إيقاف مؤقت";
+/* Contextual menu action */
+"Place audio call" = "Place audio call";
 
-/* Button label */
-"Play" = "تشغيل";
+/* Contextual menu action */
+"Place video call" = "Place video call";
+
+/* Recording view explanation label */
+"Press to start recording" = "Press to start recording";
+
+/* Record message title */
+"Record a message" = "Record a message";
 
 /* Button Action */
 "Refuse" = "أرفض";
-"Accept" = "اقبل";
-
-/* Contextual menu entry */
-"Remove value" = "حذف";
-
-/* Show advice to user */
-"Reopen account to see your hash" = "أعد فتح الحساب لرؤية مزيجك hash";
-
-/* Contextual menu entry */
-"Restore account" = "Restore account";
-
-/* Button title */
-"Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"ID : " = "ID : ";
+"Registered name: " = "Registered name: ";
+
+/* Remove account alert title */
+"Remove account" = "Remove account";
+
+/* export account button title */
+"Select archive" = "Select archive";
+
+/* Send button title */
+"Send" = "أرسل";
+
+/* Notification message */
+"Send you a contact request" = "Send you a contact request";
 
 /* No comment provided by engineer. */
 "Share" = "مشاركة";
 
+/* Contextual menu entry */
+"Share screen" = "Share screen";
+
+/* Sign In */
+"Sign In" = "Sign In";
+
+/* Record message title */
+"Stop recording" = "Stop recording";
+
 /* File transfer successful label */
 "Success" = "Success";
 
@@ -146,55 +148,36 @@
 /* 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 Jami account format:" = "The following account needs to be migrated to the new Jami 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";
+"The password you entered does not unlock this account" = "كلمة المرور التي أدخلتها لا تفتح هذا الحساب";
+
+/* Text shown to the user */
+"This account needs to be migrated" = "This account needs to be migrated";
+
+/* Explanation label when user have just ID */
+"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
+
+/* Explanation label when user have Jami username */
+"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
 
 /* Title shown to user to concat with Pin */
 "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
 
 /* 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 Jami account. If you are not ready to choose a password, you may close Jami 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 Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
+"To proceed with the migration, you need to enter a password that was used for this account." = "To proceed with the migration, you need to enter a password that was used for this account.";
 
-/* Name used when user leave field empty */
-"Unknown" = "مجهول";
+/* File transfer peer unjoinable label */
+"Unjoinable" = "Unjoinable";
 
-/* Error shown to user */
-"You have to migrate your account before exporting" = "You have to migrate your account before exporting";
-
-/* Remove account alert title */
-"Remove account" = "Remove account";
-
-/* Remove account alert message */
-"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
-
-/* export account button title */
-"Select archive" = "Select archive";
-
-/* link account title */
-"Link to an account" = "Link to an account";
+/* Error video permission */
+"Video permission not granted" = "Video permission not granted";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Jami";
-"Create a new account" = "Create a new account";
-"Add a SIP account" = "Add a SIP account";
+"Welcome to Jami" = "مرحبا بك في جامي";
 
-/* Notification message */
-"Send you a contact request" = "Send you a contact request";
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
 
-/* Explanation label when user have Jami username */
-"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
-
-/* Explanation label when user have just ID */
-"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
-
-/* Backup error */
-"An error occured during the backup" = "An error occured during the backup";
diff --git a/ui/ar.lproj/MainMenu.strings b/ui/ar.lproj/MainMenu.strings
index 8bc26db..805ca94 100644
--- a/ui/ar.lproj/MainMenu.strings
+++ b/ui/ar.lproj/MainMenu.strings
@@ -15,13 +15,13 @@
 "29.title" = "القائمة الرئيسية";
 
 /* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
-"56.title" = "Jami";
+"56.title" = "جامي";
 
 /* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
-"57.title" = "Jami";
+"57.title" = "جامي";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "حول جامي";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "تفضيلات Ring";
@@ -33,10 +33,10 @@
 "131.title" = "خدمات";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "إخفاء جامي";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "الخروج من جامي";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "أخفي الآخرين";
@@ -189,25 +189,10 @@
 "491.title" = "مساعدة";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "المساعدة";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "أجد و غير...";
 
 /* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
 "593.title" = "إبحث عن تحديثات";
-
-/* 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" = "إظهار الحديث";
-
-/* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
-"GU3-tt-2de.title" = "إظهار جهات الإتصال";
-
-/* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
-"Oco-m7-LtS.title" = "إظهار سجل المكالمات";
diff --git a/ui/ar.lproj/MigrateRingAccountsWindow.strings b/ui/ar.lproj/MigrateRingAccountsWindow.strings
index 6c2197f..2505c01 100644
--- a/ui/ar.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ar.lproj/MigrateRingAccountsWindow.strings
@@ -1,28 +1,31 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "اكتمل ترحيل الحساب";
 
-/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "ID";
+/* 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 Jami 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 Jami account. If your not ready to choose a password, you may close Jami and resume the migration later.";
+/* Class = "NSTextFieldCell"; title = "To proceed with the migration, you need to enter a password that was used for this account."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "To proceed with the migration, you need to enter a password that was used for this account.";
 
 /* 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" = "موافق";
 
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "QkU-T8-Xi6"; */
+"QkU-T8-Xi6.title" = "حذف هذا الحساب";
+
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "نافذة";
 
@@ -30,19 +33,19 @@
 "VN1-A3-RIh.title" = "موافق";
 
 /* 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/ar.lproj/PasswordChange.strings b/ui/ar.lproj/PasswordChange.strings
index a37fb52..5d7cbca 100644
--- a/ui/ar.lproj/PasswordChange.strings
+++ b/ui/ar.lproj/PasswordChange.strings
@@ -1,18 +1,30 @@
 
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
+"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+
+/* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
+"4Uf-yO-9X8.title" = "Change Password";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
+"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "كرر مرة ثانية";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "اقبل";
 
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
+"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
 "MZw-ep-8aW.title" = "ألغِ";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "كلمة المرور خاطئة";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "كلمة المرور القديمة";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
-"pZe-DO-jWp.title" = "New password";
+"pZe-DO-jWp.title" = "كلمة سر جديدة";
diff --git a/ui/ar.lproj/PreferencesWindow.strings b/ui/ar.lproj/PreferencesWindow.strings
index 2c93f2a..e527067 100644
--- a/ui/ar.lproj/PreferencesWindow.strings
+++ b/ui/ar.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Jami Preferences";
+"C1T-wE-wxb.title" = "تفضيلات جامي";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "عام";
@@ -14,12 +14,6 @@
 /* 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" = "صوت";
 
diff --git a/ui/ar.lproj/RegisterNameWindow.strings b/ui/ar.lproj/RegisterNameWindow.strings
index 5eca5ed..85c7d78 100644
--- a/ui/ar.lproj/RegisterNameWindow.strings
+++ b/ui/ar.lproj/RegisterNameWindow.strings
@@ -1,28 +1,37 @@
 
-/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
-
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your ID"; ObjectID = "9gi-0u-67t"; */
 "9gi-0u-67t.title" = "Other users can use it instead of your 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";
-
-/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your password";
+"Aeh-tK-RjX.title" = "حدث خطأ أثناء تسجيل اسم المستخدم";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "نافذة";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+
 /* 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" = "Username...";
+/* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Enter username...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "ألغِ";
 
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "egF-LJ-khJ"; */
+"egF-LJ-khJ.title" = "كلمة السر";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
 "eoS-s7-b3w.title" = "ألغِ";
 
@@ -32,5 +41,11 @@
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
 "lT3-Bh-MnL.title" = "سجل";
 
-/* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username";
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "lo5-ei-wHM"; */
+"lo5-ei-wHM.title" = "اسم المستخدم";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
+"nFA-uz-WjI.placeholderString" = "Enter password...";
+
+/* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register a public username ";
diff --git a/ui/ar.lproj/RingWindow.strings b/ui/ar.lproj/RingWindow.strings
index 98623f2..c435a83 100644
--- a/ui/ar.lproj/RingWindow.strings
+++ b/ui/ar.lproj/RingWindow.strings
@@ -2,56 +2,50 @@
 /* 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 = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[0] = "Conversations"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[0]" = "محادثات";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[1] = "Requests"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[1]" = "الطلبات";
 
 /* 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 = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
+"DPK-hh-Aq5.title" = "Item 2";
 
 /* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Jami";
+"F0z-JX-Cv5.title" = "جامي";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.placeholderString" = "طريقة الإتصال";
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
 
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
-"GAa-pQ-t4g.title" = "خلية نص";
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
 
-/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "العنوان";
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "عرض الوظيفة";
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
 
-/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "تاريخ";
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
 
-/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
-"Wi9-Zd-O1N.label" = "تاريخ";
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID.\nCopy and share it with your friends!";
 
-/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "صندوق";
 
-/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
-"Zbi-X6-DLT.label" = "الاتصالات";
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
 
-/* 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 = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
 
 /* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Jami 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" = "صنف";
-
-/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.placeholderString" = "التفاصيل";
+"eln-Vm-t0d.title" = "جامي هو برنامج حر للتواصل العالمي الذي يحترم حريات و خصوصيات مستخدميه.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
 "j0J-Xd-uth.placeholderString" = "اسم الإتصال";
@@ -59,11 +53,8 @@
 /* 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" = "عرض الوظيفة";
-
 /* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
-"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+"vvE-nM-kSl.placeholderString" = "البحث عن جهة اتصال جديدة أو موجودة";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "حظر جهة إتصال";
diff --git a/ui/ar.lproj/RingWizard.strings b/ui/ar.lproj/RingWizard.strings
index 2836506..df5ccf3 100644
--- a/ui/ar.lproj/RingWizard.strings
+++ b/ui/ar.lproj/RingWizard.strings
@@ -1,3 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "مرحبا بك في Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "مرحبا بك في جامي";
+
+/* Class = "NSWindow"; title = "Ring"; ObjectID = "4LP-GX-BkH"; */
+"4LP-GX-BkH.title" = "Ring";
diff --git a/ui/ar.lproj/RingWizardChoose.strings b/ui/ar.lproj/RingWizardChoose.strings
index 2e5d48c..8ca103d 100644
--- a/ui/ar.lproj/RingWizardChoose.strings
+++ b/ui/ar.lproj/RingWizardChoose.strings
@@ -1,9 +1,21 @@
 
+/* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
+"HGQ-Kd-WIw.title" = "Connect to account manager";
+
 /* 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 = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Import from other device";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Jami account";
+"k1T-a7-yZD.title" = "كوّن حساب جامي";
+
+/* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
+"rtw-Db-BWL.title" = "Import from archive backup";
+
+/* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
+"vCj-67-PGK.title" = "Advanced...";
+
+/* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
+"yBt-Bv-fi2.title" = "Add a new SIP account";
diff --git a/ui/ar.lproj/RingWizardLinkAccount.strings b/ui/ar.lproj/RingWizardLinkAccount.strings
index 70ebde8..81db231 100644
--- a/ui/ar.lproj/RingWizardLinkAccount.strings
+++ b/ui/ar.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,21 @@
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
-
-/* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "OR";
-
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami 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 = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami 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.";
+"2uK-1s-tk7.title" = "/tيمكنك استيراد حسابك من جهاز آخر, لكن في البداية عليك الحصول على رمز أمان. \n/tلتوليد رمز الأمان اذهب إلى إعدادات إدارة الحساب في أحد أجهزتك السابقة واختر حساب جامي لاستخدام واختيار \"ربط جهاز آخر مع هذا الحساب\". ستحصل عل رمز الأمان اللازم لإكمال العملية. تنتهي صلاحية رمز الأمان بعد 10 دقائق فقط.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your PIN";
+"3ik-rY-Gig.title" = "أدخِل رمز الأمان";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Link";
+"8b8-bt-eAj.title" = "ربط";
 
 /* 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" = "حدث خطأ, يرجى التحقق من كلمة المرور ورمز الأمان.";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "ألغِ";
 
 /* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter password";
+"U2K-fu-INc.title" = "أدخِل كلمة المرور";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
 "WlR-QM-tK4.ibShadowedIsNilPlaceholder" = "كلمة السر...";
@@ -36,28 +30,28 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "كلمة السر...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "اختر ملف";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "استيراد ملف أرشيف";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "/tيمكنك استيراد حسابك مباشرة من ملف أرشيف على جهازك.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "موافق";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
-"vVf-hg-sWk.ibShadowedIsNilPlaceholder" = "PIN";
+"vVf-hg-sWk.ibShadowedIsNilPlaceholder" = "رمز الأمان";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
-"vVf-hg-sWk.ibShadowedMultipleValuesPlaceholder" = "PIN";
+"vVf-hg-sWk.ibShadowedMultipleValuesPlaceholder" = "رمز الأمان";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
-"vVf-hg-sWk.ibShadowedNoSelectionPlaceholder" = "PIN";
+"vVf-hg-sWk.ibShadowedNoSelectionPlaceholder" = "رمز الأمان";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
-"vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
+"vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "رمز الأمان";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "جاري الربط...";
diff --git a/ui/ar.lproj/RingWizardNewAccount.strings b/ui/ar.lproj/RingWizardNewAccount.strings
index 5318c45..b8d32a1 100644
--- a/ui/ar.lproj/RingWizardNewAccount.strings
+++ b/ui/ar.lproj/RingWizardNewAccount.strings
@@ -1,42 +1,75 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your D which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your D which is 40 characters long.";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+/* Class = "NSTextFieldCell"; placeholderString = "Password..."; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "كلمة السر...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register public username";
+"AG5-GR-bii.title" = "سجل اسم المستخدم العام";
 
-/* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+/* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Repeat password";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+/* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
+"Cnw-4p-3Uc.title" = "Choose password for enhance security";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedIsNilPlaceholder" = "كلمة السر...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedMultipleValuesPlaceholder" = "كلمة السر...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNoSelectionPlaceholder" = "كلمة السر...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNotApplicablePlaceholder" = "كلمة السر...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedIsNilPlaceholder" = "اسم المستخدم...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedMultipleValuesPlaceholder" = "اسم المستخدم...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNoSelectionPlaceholder" = "اسم المستخدم...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNotApplicablePlaceholder" = "اسم المستخدم...";
 
 /* 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 = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "اسم المستخدم...";
 
-/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "Enter name";
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "gEy-ak-Cgq"; */
+"gEy-ak-Cgq.placeholderString" = "أدخِل اسم";
 
-/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
-"gki-BR-jc3.title" = "Create your profile";
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "خذ لمحة";
 
-/* 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 = "NSTextFieldCell"; title = "Account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "حساب";
 
 /* 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 = "NSTextFieldCell"; title = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one."; ObjectID = "zUH-kc-cik"; */
+"zUH-kc-cik.title" = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "أحدث";
diff --git a/ui/ar.lproj/VideoPrefs.strings b/ui/ar.lproj/VideoPrefs.strings
index 11a7109..11866da 100644
--- a/ui/ar.lproj/VideoPrefs.strings
+++ b/ui/ar.lproj/VideoPrefs.strings
@@ -8,8 +8,5 @@
 /* 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" = "كاميرا";
+/* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
+"e7y-eV-Gsz.title" = "Enable hardware acceleration";