diff --git a/ui/da.lproj/AccAdvancedRing.strings b/ui/da.lproj/AccAdvancedRing.strings
index ccacea3be4e11941c4c306c2c302bc54239a1a1d..5efb424bb350c90ad11ce13409679dee2721b542 100644
--- a/ui/da.lproj/AccAdvancedRing.strings
+++ b/ui/da.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Tillad opkald fra partere som der ikke er tillid til";
+"1Xr-BO-Pu3.title" = "Tillad opkald fra partnere som der ikke er tillid til";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/da.lproj/AccRingGeneral.strings b/ui/da.lproj/AccRingGeneral.strings
index 692fad5b58c8b13f4a1efd1183c9be54fbd0f39e..98947855955e0001cc8a639064434f45d6c0ea45 100644
--- a/ui/da.lproj/AccRingGeneral.strings
+++ b/ui/da.lproj/AccRingGeneral.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Eksport konto";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
 "6fI-98-VvQ.title" = "Blokerede kontakter";
@@ -9,7 +9,7 @@
 "Hbq-nL-BhK.title" = "Avanceret";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Tillad";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
 "TYk-QK-iaT.title" = "Adgangskode:";
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "Rediger navn";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "Slet konto";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Tekst celle";
@@ -27,7 +27,7 @@
 "bOY-mY-1Yo.ibShadowedToolTip" = "Ubloker";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Brugernavn:";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Registrér";
@@ -39,13 +39,13 @@
 "kt0-P6-fdQ.placeholderString" = "Indtast navn";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Tilbagekald";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Sammenkædede enheder";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
 "qx7-i1-3Na.title" = "Identifier:";
diff --git a/ui/da.lproj/AccSipGeneral.strings b/ui/da.lproj/AccSipGeneral.strings
index 0cb125d7ef1e5e81e9532f8611b64d1f7d33e372..51a6021d837be6e90616242c233267cd8e8e9165 100644
--- a/ui/da.lproj/AccSipGeneral.strings
+++ b/ui/da.lproj/AccSipGeneral.strings
@@ -36,4 +36,4 @@
 "oE8-tN-SfC.title" = "Profil";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "Slet konto";
diff --git a/ui/da.lproj/Conversation.strings b/ui/da.lproj/Conversation.strings
index eca4a3244074073a1439479408fbbd181dabfc3f..f36d04e01aed929e9607651dd649fbbec66f9176 100644
--- a/ui/da.lproj/Conversation.strings
+++ b/ui/da.lproj/Conversation.strings
@@ -3,7 +3,7 @@
 "8sX-aI-9OG.title" = "🙂";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
-"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
+"B6d-Sc-UTp.ibShadowedToolTip" = "Optag en video meddelelse";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
 "FgV-iF-gGQ.title" = "Tekst celle";
@@ -12,13 +12,13 @@
 "Ilz-7v-2fr.placeholderString" = "Send en besked";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
-"RuH-fO-poy.ibShadowedToolTip" = "Start audio call";
+"RuH-fO-poy.ibShadowedToolTip" = "Start et audio opkald";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
 "UJf-cF-RAo.ibShadowedToolTip" = "Send";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
-"cFH-d7-Erh.ibShadowedToolTip" = "Start video call";
+"cFH-d7-Erh.ibShadowedToolTip" = "Start et video opkald";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
 "ciI-CA-tly.title" = "Box";
@@ -27,7 +27,7 @@
 "fh9-Uo-8R1.title" = "Box";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
-"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+"gwx-eT-PcN.ibShadowedToolTip" = "Send en fil";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
 "hrX-ac-Quk.title" = "Box";
@@ -36,13 +36,13 @@
 "ooq-vs-Xt1.ibShadowedToolTip" = "Tilbage";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
-"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+"pGK-hO-X1Y.ibShadowedToolTip" = "Tilføj en kontakt";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "pRL-vb-me9"; */
 "pRL-vb-me9.title" = "Box";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record an audio message"; ObjectID = "wYE-S3-AzD"; */
-"wYE-S3-AzD.ibShadowedToolTip" = "Record an audio message";
+"wYE-S3-AzD.ibShadowedToolTip" = "Optag en audio samtale";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
 "zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "Send en besked";
diff --git a/ui/da.lproj/CurrentCall.strings b/ui/da.lproj/CurrentCall.strings
index fd76de7015bacaa524cfe25a403a3292c60f0c3d..9264dc4ae7e80a4222cdf7822be4a0c0c1ada00e 100644
--- a/ui/da.lproj/CurrentCall.strings
+++ b/ui/da.lproj/CurrentCall.strings
@@ -57,7 +57,7 @@
 "hfc-s5-yWK.title" = "Box";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
-"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+"ngO-WV-cXD.ibShadowedToolTip" = "Send en fil";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
 "qgD-3D-nD5.ibShadowedToolTip" = "Besvar";
diff --git a/ui/da.lproj/LeaveMessageVC.strings b/ui/da.lproj/LeaveMessageVC.strings
index c035169600f92528a84ec4a0ed23ffa46387ea87..31bd74dba0aa2fb0d0a6821a1e7bfac1a788ced0 100644
--- a/ui/da.lproj/LeaveMessageVC.strings
+++ b/ui/da.lproj/LeaveMessageVC.strings
@@ -6,22 +6,22 @@
 "Bjm-hd-lQU.title" = "Send besked";
 
 /* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
-"M07-cf-bjZ.title" = "Go back to conversations";
+"M07-cf-bjZ.title" = "Gå tilbage til konversationer";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
 "TwL-yO-BXI.title" = "Box";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
-"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
+"dEq-nq-Ae8.ibShadowedToolTip" = "Optag meddelelse";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Optagelse";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
-"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+"oFb-RQ-trc.ibShadowedToolTip" = "Optag meddelelse";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
-"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+"tf8-hV-8xd.ibShadowedToolTip" = "Skift til konversationer";
 
 /* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
-"zTC-Gf-lAV.title" = "Record a message";
+"zTC-Gf-lAV.title" = "Optag meddelelse";
diff --git a/ui/da.lproj/Localizable.strings b/ui/da.lproj/Localizable.strings
index ac181f222cb3ce5cf645800952bb1836c410c3cc..44b47fcac1a650e7535144911aa41a5b469662fc 100644
--- a/ui/da.lproj/Localizable.strings
+++ b/ui/da.lproj/Localizable.strings
@@ -5,7 +5,7 @@
 "Accept" = "Accepter";
 
 /* Welcome title */
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "Tilføj en SIP-konto";
 
 /* Contextual menu action */
 "Add to contacts" = "Tilføj til kontakt";
@@ -17,10 +17,10 @@
 "An error occured during the export" = "Der opstod en fejl under eksport";
 
 /* Peer busy message */
-"appears to be busy." = "appears to be busy.";
+"appears to be busy." = "ser ud til at være optaget.";
 
 /* Error audio permission */
-"Audio permission not granted" = "Audio permission not granted";
+"Audio permission not granted" = "Lydtilladelse er ikke givet";
 
 /* Backup account */
 "Backup your account" = "Backup your account";
@@ -29,34 +29,34 @@
 "Block contact" = "Bloker kontakt";
 
 /* 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.";
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "Ved at klikke på \"OK\" fjerner du denne konto på denne enhed! Denne handling kan ikke fortrydes. Dit registrerede navn kan også gå tabt.";
 
 /* File transfer canceled label */
 "Canceled" = "Annulleret";
 
 /* Contextual menu entry */
-"Choose file" = "Choose file";
+"Choose file" = "Vælg fil";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "Ryd samtale";
 
 /* No comment provided by engineer. */
 "Copy" = "Kopiér";
 
 /* Recording view explanation label */
-"Could not record message during call" = "Could not record message during call";
+"Could not record message during call" = "Kunne ikke optage beskeden under opkald";
 
 /* Welcome title */
 "Create a new account" = "Opret en ny konto";
 
 /* Backup enter password */
-"Enter account password" = "Enter account password";
+"Enter account password" = "Indtast password til kontoen";
 
 /* File transfer failed label */
 "Failed" = "Fejlede";
 
 /* 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." = "Kunne ikke migrere din konto. Du kan prøve igen ved at trykke på Ok eller slette din konto.";
 
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
@@ -107,7 +107,7 @@
 "Press to start recording" = "Press to start recording";
 
 /* Record message title */
-"Record a message" = "Record a message";
+"Record a message" = "Optag meddelelse";
 
 /* Button Action */
 "Refuse" = "Afvis";
diff --git a/ui/da.lproj/MainMenu.strings b/ui/da.lproj/MainMenu.strings
index 296ce9f107857365c9650645c39de9e87ee3cb5f..89b3c2c9d3ecfe1740b7e22df4b6e28a043fa162 100644
--- a/ui/da.lproj/MainMenu.strings
+++ b/ui/da.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "Om Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Præferencer...";
@@ -33,10 +33,10 @@
 "131.title" = "Tjenester";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Skjul Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Forlad Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Skjul andre";
@@ -189,7 +189,7 @@
 "491.title" = "Hjælp";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Hjælp til Jami";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Find og Erstat...";
diff --git a/ui/da.lproj/RingWindow.strings b/ui/da.lproj/RingWindow.strings
index 6bfbcdf1f7deeb6552881eaf44bd9e612d43176d..5b0b94b628de61de684b658042b4bcd7bc8eb47f 100644
--- a/ui/da.lproj/RingWindow.strings
+++ b/ui/da.lproj/RingWindow.strings
@@ -18,10 +18,10 @@
 "F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
-"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+"Fc5-KS-cim.ibShadowedToolTip" = "Accepter invitation";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
-"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+"Oac-o7-2Ge.ibShadowedToolTip" = "Del konto information";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
 "Oe5-Nj-cP3.title" = "Item 3";
@@ -39,10 +39,10 @@
 "eVv-lu-T1Y.title" = "Box";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
-"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+"eXV-BT-B6J.ibShadowedToolTip" = "Vis QRkode";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
-"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignorer 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. (Näcken)";
diff --git a/ui/fa_IR.lproj/AccRingGeneral.strings b/ui/fa_IR.lproj/AccRingGeneral.strings
index 33d9031be1731854b89d87705b49e8729bc79026..242bc9bd07e8d3b6cf74d37264e46d4259be7ca9 100644
--- a/ui/fa_IR.lproj/AccRingGeneral.strings
+++ b/ui/fa_IR.lproj/AccRingGeneral.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "برون‌برد (ذخیره) حساب";
+"1aj-MG-mHp.title" = "برون‌برد حساب";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
 "6fI-98-VvQ.title" = "مخاطبان مسدود شده";
diff --git a/ui/fa_IR.lproj/AccountBackupVC.strings b/ui/fa_IR.lproj/AccountBackupVC.strings
index 279314fd6d8678ad760dfbb113cec090964605ec..83d5da2c11040031722ef853525813467d9e23f7 100644
--- a/ui/fa_IR.lproj/AccountBackupVC.strings
+++ b/ui/fa_IR.lproj/AccountBackupVC.strings
@@ -3,16 +3,16 @@
 "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.";
+"7lU-Qy-WOb.title" = "خطایی هنگام پشتیبان‌گیری رخ داد. لطفا اعتبارنامه‌های خود را چک کنید.";
 
 /* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
 "PVF-bb-Yoi.title" = "هرگز این را دوباره به من نشان نده";
 
 /* 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" = "این حساب فقط در این دستگاه موجود است. اگر دستگاه خود را گم کرده یا برنامه را حذف کنید ، حساب شما حذف خواهد شد. هم‌اکنون یا  در آینده می‌توانید از حساب خود نسخه پشتیبان تهیه کنید.";
+"SUG-lC-TDL.title" = "این حساب فقط در این دستگاه موجود است. اگر دستگاه خود را گم کرده یا برنامه را حذف کنید، حساب شما حذف خواهد شد. هم‌اکنون یا در آینده می‌توانید از حساب خود نسخه پشتیبان تهیه کنید.";
 
 /* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
-"cod-s7-SPd.title" = "برون‌ریزی حساب";
+"cod-s7-SPd.title" = "برون‌برد حساب";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "ruw-Kp-tCz"; */
 "ruw-Kp-tCz.title" = "خب";
diff --git a/ui/fa_IR.lproj/AccountMenuItemView.strings b/ui/fa_IR.lproj/AccountMenuItemView.strings
index 27b9b9d9260ecad0d45b250e72ad45f4c4395676..36025810920674ee0c5a27a3fce76dbe86885277 100644
--- a/ui/fa_IR.lproj/AccountMenuItemView.strings
+++ b/ui/fa_IR.lproj/AccountMenuItemView.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "برچسب";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
 "BkF-b3-tzE.ibShadowedToolTip" = "ایجاد یک حساب جدید";
@@ -9,7 +9,7 @@
 "ZIZ-jd-eLK.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "برچسب";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "برچسب";
diff --git a/ui/fa_IR.lproj/Conversation.strings b/ui/fa_IR.lproj/Conversation.strings
index c6ee7a35f6b8cea7e22df88f3d0789a63a01db95..354dcff6c040c949a86eddbda4617a5165d49eda 100644
--- a/ui/fa_IR.lproj/Conversation.strings
+++ b/ui/fa_IR.lproj/Conversation.strings
@@ -3,7 +3,7 @@
 "8sX-aI-9OG.title" = "🙂";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
-"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
+"B6d-Sc-UTp.ibShadowedToolTip" = "ضبط یک پیام تصویری";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
 "FgV-iF-gGQ.title" = "سلول متنی";
@@ -12,7 +12,7 @@
 "Ilz-7v-2fr.placeholderString" = "ارسال پیام";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
-"RuH-fO-poy.ibShadowedToolTip" = "شروع مکالمه صوتی";
+"RuH-fO-poy.ibShadowedToolTip" = "شروع تماس صوتی";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
 "UJf-cF-RAo.ibShadowedToolTip" = "ارسال";
@@ -27,7 +27,7 @@
 "fh9-Uo-8R1.title" = "صندوق";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
-"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+"gwx-eT-PcN.ibShadowedToolTip" = "ارسال یک فایل";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
 "hrX-ac-Quk.title" = "صندوق";
@@ -36,13 +36,13 @@
 "ooq-vs-Xt1.ibShadowedToolTip" = "بازگشت";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
-"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+"pGK-hO-X1Y.ibShadowedToolTip" = "افزودن مخاطب";
 
 /* 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";
+"wYE-S3-AzD.ibShadowedToolTip" = "ضبط یک پیام صوتی";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
 "zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "ارسال پیام";
diff --git a/ui/fa_IR.lproj/CurrentCall.strings b/ui/fa_IR.lproj/CurrentCall.strings
index bc8de32ac86c749a2bb9fce19a596a0da2c106a6..7485b1133b0d8fd1e70ec558868d5caa97aaa3da 100644
--- a/ui/fa_IR.lproj/CurrentCall.strings
+++ b/ui/fa_IR.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "صندوق";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "برچسب";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "صندوق";
@@ -33,7 +33,7 @@
 "QYT-0n-4sw.ibShadowedToolTip" = "ضبط";
 
 /* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
-"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+"Vhk-fx-6RW.ibShadowedToolTip" = "افزودن مخاطب به تماس";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
 "YGj-SP-ikj.title" = "سلول متنی";
@@ -51,13 +51,13 @@
 "fmp-x4-Pef.ibShadowedToolTip" = "تغییر وضعیت گفتگو";
 
 /* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
-"hKi-Ay-ex5.title" = "person Id";
+"hKi-Ay-ex5.title" = "شناسه شخص";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
 "hfc-s5-yWK.title" = "صندوق";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
-"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+"ngO-WV-cXD.ibShadowedToolTip" = "ارسال یک فایل";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
 "qgD-3D-nD5.ibShadowedToolTip" = "پاسخ دادن";
diff --git a/ui/fa_IR.lproj/GeneralPrefs.strings b/ui/fa_IR.lproj/GeneralPrefs.strings
index 78d74da1008bcbb3bf37e265695eb0ffbd7fc3e6..7a335fa77ad9e0bf395fd5e3e9b10f47f2ed519a 100644
--- a/ui/fa_IR.lproj/GeneralPrefs.strings
+++ b/ui/fa_IR.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
-"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+"0jV-Q4-232.title" = "فعال‌سازی اعلان‌ها برای پیام‌های دریافتی";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "ماهانه";
@@ -15,13 +15,13 @@
 "8xm-Tc-NMN.title" = "سیستم";
 
 /* Class = "NSTextFieldCell"; title = "  0"; ObjectID = "9sg-PF-ffw"; */
-"9sg-PF-ffw.title" = "  0";
+"9sg-PF-ffw.title" = "0";
 
 /* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
 "AId-am-73Q.title" = "هفتگی";
 
 /* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
-"AOr-Cq-w57.title" = "Quality(Kbps)";
+"AOr-Cq-w57.title" = "کیفیت(کیلوبیت بر ثانیه)";
 
 /* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
 "I0d-mx-KhT.title" = "آگاهی‌ها";
@@ -30,13 +30,13 @@
 "JGj-TS-Hxl.title" = "6000";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
-"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+"Lww-Wb-yrf.title" = "فعال‌سازی اعلان‌ها برای دعوت‌ها";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
 "O2C-xR-mHF.title" = "اجرا پس روشن شدن";
 
 /* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
-"Qb8-tb-vJd.title" = "Call recording";
+"Qb8-tb-vJd.title" = "ضبط تماس";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "بررسی خودکار وجود بروزرسانی ";
diff --git a/ui/fa_IR.lproj/LeaveMessageVC.strings b/ui/fa_IR.lproj/LeaveMessageVC.strings
index 0d09f9f9a6c0f3426f9c35575271fa1d0bc47279..950dc235088e59d13aa4f9beae1503f7649de0fb 100644
--- a/ui/fa_IR.lproj/LeaveMessageVC.strings
+++ b/ui/fa_IR.lproj/LeaveMessageVC.strings
@@ -6,22 +6,22 @@
 "Bjm-hd-lQU.title" = "ارسال پیام";
 
 /* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
-"M07-cf-bjZ.title" = "Go back to conversations";
+"M07-cf-bjZ.title" = "بازگشت به گفتگو‌ها";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
 "TwL-yO-BXI.title" = "صندوق";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
-"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
+"dEq-nq-Ae8.ibShadowedToolTip" = "ضبط پیام";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "در حال ضبط";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
-"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+"oFb-RQ-trc.ibShadowedToolTip" = "ضبط پیام";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
-"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+"tf8-hV-8xd.ibShadowedToolTip" = "بازگشت به گفتگوها";
 
 /* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
-"zTC-Gf-lAV.title" = "Record a message";
+"zTC-Gf-lAV.title" = "پیامی ضبط کنید";
diff --git a/ui/fa_IR.lproj/Localizable.strings b/ui/fa_IR.lproj/Localizable.strings
index 18517f51a6f50dad60bbdbcfc5f6e0214e07e192..7beac27216b5a26153006433f4c0539721b76412 100644
--- a/ui/fa_IR.lproj/Localizable.strings
+++ b/ui/fa_IR.lproj/Localizable.strings
@@ -5,7 +5,7 @@
 "Accept" = "پذیرش";
 
 /* Welcome title */
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "افزودن یک حساب SIP";
 
 /* Contextual menu action */
 "Add to contacts" = "افزودن به مخاطبان";
@@ -17,19 +17,19 @@
 "An error occured during the export" = "یک خطا  در زمان برون ریزی رخ داد.";
 
 /* Peer busy message */
-"appears to be busy." = "appears to be busy.";
+"appears to be busy." = "به نظر مشغول است.";
 
 /* Error audio permission */
-"Audio permission not granted" = "Audio permission not granted";
+"Audio permission not granted" = "مجوز دسترسی صوتی داده نشده است";
 
 /* Backup account */
-"Backup your account" = "Backup your account";
+"Backup your account" = "پشتیبان‌گیری از حساب شما";
 
 /* Contextual menu action */
 "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.";
+"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" = "لغو شده";
@@ -38,19 +38,19 @@
 "Choose file" = "انتخاب فایل";
 
 /* Contextual menu action */
-"Clear conversation" = "پاک کردن مکالمه";
+"Clear conversation" = "پاک کردن گفتگو";
 
 /* No comment provided by engineer. */
 "Copy" = "کپی";
 
 /* Recording view explanation label */
-"Could not record message during call" = "Could not record message during call";
+"Could not record message during call" = "ضبط پیام هنگام تماس ممکن نیست";
 
 /* Welcome title */
 "Create a new account" = "ایجاد یک حساب جدید";
 
 /* Backup enter password */
-"Enter account password" = "Enter account password";
+"Enter account password" = "گذرواژه حساب را وارد کنید";
 
 /* File transfer failed label */
 "Failed" = "انجام نشد";
@@ -59,34 +59,34 @@
 "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";
+"Failed to perform lookup" = "جستجو ناموفق بود";
 
 /* Text shown to the user */
-"ID: " = "ID: ";
+"ID: " = "شناسه:";
 
 /* link account title */
 "Import from backup" = "وارد کردن از پشتیبان";
 
 /* link account title */
-"Import from other device" = "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 %@";
+"Incoming message from %@" = "تماس ورودی از %@";
 
 /* Text shown to user when his username is invalid to be registered */
 "Invalid username" = "نام کاربری نامعتبر";
 
 /* Text shown to user when his username is invalid to be registered */
-"Invalid username." = "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";
+"Navigate to preferences to create a new account" = "هدایت به سمت تنظیمات جهت ساخت حساب جدید";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "حسابی موجود نیست";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "گذرواژه و تاییدیه‌اش همتا نیستند.";
@@ -107,34 +107,34 @@
 "Press to start recording" = "برای شروع ضبط فشار دهید";
 
 /* Record message title */
-"Record a message" = "Record a message";
+"Record a message" = "پیامی ضبط کنید";
 
 /* Button Action */
 "Refuse" = "رد کردن";
 
 /* Text shown to the user */
-"Registered name: " = "Registered name: ";
+"Registered name: " = "نام ثبت شده:";
 
 /* Remove account alert title */
 "Remove account" = "حذف حساب";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "انتخاب بایگانی";
 
 /* Send button title */
 "Send" = "ارسال";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "به شما درخواست ارتباط داده است";
 
 /* No comment provided by engineer. */
 "Share" = "هم‌رسانی";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "همرسانی صفحه";
 
 /* Sign In */
-"Sign In" = "Sign In";
+"Sign In" = "ورود";
 
 /* Record message title */
 "Stop recording" = "توقف ضبط";
@@ -143,7 +143,7 @@
 "Success" = "موفق";
 
 /* No comment provided by engineer. */
-"Text Actions" = "Text Actions";
+"Text Actions" = "عمل‌های نوشتاری";
 
 /* Text shown to user when his username is available to be registered */
 "The entered username is available" = "نام کاربری وارد شده دردسترس است";
@@ -155,29 +155,29 @@
 "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";
+"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!";
+"This is your ID. \nCopy and share it with your friends!" = "این شناسه شماست\n کپی کنید و آن را با دوستان خود به اشتراک بگذارید!";
 
 /* 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!";
+"This is your Jami username. \nCopy and share it with your friends!" = "این نام کاربری Jami شماست.\nآن را کپی کنید و با دوستان خود به اشتراک بگذارید!";
 
 /* 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.";
+"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." = "برای کامل کردن فرایند، باید جمی را روی دستگاه جدید باز کرده و  \"پیوند این دستگاه به یک حساب\" را انتخاب کنید. پین شما برای 10 دقیقه اعتبار دارد.";
 
 /* Text shown to the user */
-"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.";
+"To proceed with the migration, you need to enter a password that was used for this account." = "برای پیشبرد انتقال، باید گذرواژه‌ای را که برای این حساب استفاده شده، وارد کنید.";
 
 /* File transfer peer unjoinable label */
-"Unjoinable" = "Unjoinable";
+"Unjoinable" = "غیر‌قابل‌اتصال";
 
 /* Error video permission */
-"Video permission not granted" = "Video permission not granted";
+"Video permission not granted" = "مجوز دسترسی تصویری داده نشده است";
 
 /* Welcome title */
 "Welcome to Jami" = "به جمی خوش آمدید";
 
 /* Peer busy message */
-"Would you like to leave a message?" = "Would you like to leave a message?";
+"Would you like to leave a message?" = "مایلید که پیامی بگذارید؟";
 
diff --git a/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings b/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
index 9deb406d2d1ed961e5088f27d65e9dfc8b0b7da7..ddf511b3df0cbcaeb1f05ef1d8a29b071d4dd702 100644
--- a/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "RingID";
 
 /* 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.";
+"859-10-HEb.title" = "برای پیشبرد انتقال، باید گذرواژه‌ای را که برای این حساب استفاده شده، وارد کنید.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "خطای انتقال حساب کاربری";
diff --git a/ui/fa_IR.lproj/PasswordChange.strings b/ui/fa_IR.lproj/PasswordChange.strings
index da12b7e4aaf1115f83c8e16e90d55790ffb8010d..daadef2133d728cb9097f7bd95382e2cfa69121a 100644
--- a/ui/fa_IR.lproj/PasswordChange.strings
+++ b/ui/fa_IR.lproj/PasswordChange.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
-"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+"1Bs-Te-34p.placeholderString" = "گذرواژه جدید را تکرار کنید";
 
 /* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
 "4Uf-yO-9X8.title" = "تغییر گذرواژه";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
-"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+"4aD-Xd-zHS.placeholderString" = "گذرواژه جدید را وارد کنید";
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
 "8KO-IO-ykP.title" = "تکرار";
@@ -15,7 +15,7 @@
 "Ggu-EQ-cqC.title" = "پذیرش";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
-"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+"Kwp-mD-Y94.placeholderString" = "گذرواژه قدیمی خود را وارد کنید";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
 "MZw-ep-8aW.title" = "لغو";
diff --git a/ui/fa_IR.lproj/RegisterNameWindow.strings b/ui/fa_IR.lproj/RegisterNameWindow.strings
index 2db04cb6782d26d57bcf927a221bf2ddcdb2d435..5ace2bb828dac79822645730baf81339cf939900 100644
--- a/ui/fa_IR.lproj/RegisterNameWindow.strings
+++ b/ui/fa_IR.lproj/RegisterNameWindow.strings
@@ -9,22 +9,22 @@
 "JWw-7m-ywL.title" = "پنجره";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "ورود گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "ورود گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "ورود گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "ورود گذرواژه...";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "چند لحظه...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+"bdC-Uc-Qhs.placeholderString" = "ورود نام کاربری...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "لغو";
@@ -45,7 +45,7 @@
 "lo5-ei-wHM.title" = "نام کاربری";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
-"nFA-uz-WjI.placeholderString" = "Enter password...";
+"nFA-uz-WjI.placeholderString" = "ورود گذرواژه...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username ";
+"tje-EZ-ZPI.title" = "ثبت نام‌کاربری عمومی";
diff --git a/ui/fa_IR.lproj/RingWindow.strings b/ui/fa_IR.lproj/RingWindow.strings
index f2cfdb3531adae9ecdc1b0c1eadc92699e26e6bd..392990f39ec859f4315f2af964dd4e9d735e4b55 100644
--- a/ui/fa_IR.lproj/RingWindow.strings
+++ b/ui/fa_IR.lproj/RingWindow.strings
@@ -18,19 +18,19 @@
 "F0z-JX-Cv5.title" = "جمی";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
-"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+"Fc5-KS-cim.ibShadowedToolTip" = "پذیرش دعوت";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
-"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+"Oac-o7-2Ge.ibShadowedToolTip" = "اشتراک اطلاعات حساب";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
 "Oe5-Nj-cP3.title" = "مورد 3";
 
 /* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.label" = "Toolbar Item";
+"XSp-w5-Fes.label" = "مورد نوار‌ابزار";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+"XSp-w5-Fes.paletteLabel" = "مورد نوار‌ابزار";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
 "Xb9-UT-M2F.title" = "این شناسه شما می باشد.\nآن را کپی کرده و با دوستان خود به اشتراک بگذارید!";
@@ -39,13 +39,13 @@
 "eVv-lu-T1Y.title" = "صندوق";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
-"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+"eXV-BT-B6J.ibShadowedToolTip" = "نمایش کد QR";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
-"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+"ejM-H2-aJX.ibShadowedToolTip" = "رد دعوت";
 
 /* 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" = "جمی نرم‌افزار آزاد برای ارتباط جهانی است که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد.";
+"eln-Vm-t0d.title" = "جمی نرم‌افزاری آزاد برای ارتباط جهانی است، که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
 "j0J-Xd-uth.placeholderString" = "نام تماس";
diff --git a/ui/fa_IR.lproj/RingWizardChoose.strings b/ui/fa_IR.lproj/RingWizardChoose.strings
index af82f4b9306aaefd7e18ba394d37d96427a039e0..08bfce41ba1a24425d423020106c80bbd2c0d386 100644
--- a/ui/fa_IR.lproj/RingWizardChoose.strings
+++ b/ui/fa_IR.lproj/RingWizardChoose.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
-"HGQ-Kd-WIw.title" = "اتصال به مدیر حساب";
+"HGQ-Kd-WIw.title" = "اتصال به مدیریت حساب";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "لغو";
 
 /* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Import from other device";
+"Z9K-mD-ucr.title" = "وارد کردن از دستگاه دیگر";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "ایجاد یک حساب جمی";
@@ -15,7 +15,7 @@
 "rtw-Db-BWL.title" = "وارد کردن از پشتیبان بایگانی‌شده";
 
 /* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
-"vCj-67-PGK.title" = "Advanced...";
+"vCj-67-PGK.title" = "پیشرفته...";
 
 /* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
 "yBt-Bv-fi2.title" = "افزودن یک حساب کاربری جدید SIP";
diff --git a/ui/fa_IR.lproj/RingWizardNewAccount.strings b/ui/fa_IR.lproj/RingWizardNewAccount.strings
index fd9fc6f9e5a03ed7e8f0afd5de9e308f4fdc3294..c3d7f075d802007912ff096b7ea9d111600424be 100644
--- a/ui/fa_IR.lproj/RingWizardNewAccount.strings
+++ b/ui/fa_IR.lproj/RingWizardNewAccount.strings
@@ -1,21 +1,21 @@
 
 /* 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.";
+"0qE-Sz-hdc.title" = "با علامت‌زدن این، یک نام‌کاربری منحصر به فرد در شبکه جامی ثبت می‌کنید. افراد می‌توانند از آن به جای شناسه شما که دارای 40 کاراکتر است، برای تماس با شما استفاده کنند.";
 
 /* 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...";
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "تکرار گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "تکرار گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "تکرار گذرواژه...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "تکرار گذرواژه...";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
 "AG5-GR-bii.title" = "ثبت نام‌کاربری عمومی";
@@ -24,7 +24,7 @@
 "BCg-5V-Ek4.placeholderString" = "گذرواژه را تکرار کنید";
 
 /* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
-"Cnw-4p-3Uc.title" = "Choose password for enhance security";
+"Cnw-4p-3Uc.title" = "برای ارتقای امنیت گذرواژه انتخاب کنید";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
 "JCg-IP-8cg.ibShadowedIsNilPlaceholder" = "گذرواژه...";
@@ -69,7 +69,7 @@
 "v7f-52-GJA.title" = "لغو";
 
 /* 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.";
+"zUH-kc-cik.title" = "از این گذرواژه برای رمز‌گذاری داده‌های حساب شما و پیوند دستگاه‌های جدید به حساب شما استفاده خواهد شد. این اجباری نیست ولی تعیین آن توصیه می‌شود.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "ایجاد";
diff --git a/ui/fa_IR.lproj/VideoPrefs.strings b/ui/fa_IR.lproj/VideoPrefs.strings
index 096d5dcffd8ae2f02c9c388b35e631c67bbac6cb..5da486c962581a3849087d49505bad90da756372 100644
--- a/ui/fa_IR.lproj/VideoPrefs.strings
+++ b/ui/fa_IR.lproj/VideoPrefs.strings
@@ -9,4 +9,4 @@
 "5Im-df-jdd.title" = "نرخ";
 
 /* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
-"e7y-eV-Gsz.title" = "Enable hardware acceleration";
+"e7y-eV-Gsz.title" = "فعال‌سازی شتاب‌دهی سخت‌افزاری";
diff --git a/ui/fi.lproj/AccAdvancedRing.strings b/ui/fi.lproj/AccAdvancedRing.strings
index 220ea73211f2f6d205383be6f6bb2ebd35e89b5d..064f8d4333749abb4f25c5a8fe25b3c60c802659 100644
--- a/ui/fi.lproj/AccAdvancedRing.strings
+++ b/ui/fi.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
 /* 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" = "Salli puhelut tuntemattomilta";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
@@ -15,10 +15,10 @@
 "8mv-Ia-GM4.title" = "TURN address";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
-"BIS-Ft-yJn.title" = "Call settings";
+"BIS-Ft-yJn.title" = "Puheluasetukset";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "Vastaa puheluihin automaattisesti";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "Tekstilaatikko";
@@ -69,7 +69,7 @@
 "eGX-gk-Zxp.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
-"eMG-uY-bpH.title" = "TURN username";
+"eMG-uY-bpH.title" = "TURN käyttäjänimi";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
 "g8T-u3-MS3.title" = "Tekstilaatikko";
@@ -84,7 +84,7 @@
 "nqX-Vu-UuA.title" = "Käytä STUNia";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Oma soittoääni";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
 "sVe-iG-OCw.title" = "Yhteydet";
@@ -99,7 +99,7 @@
 "vYi-gW-MrY.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
-"xJT-ij-69q.title" = "OpenDHT configuration";
+"xJT-ij-69q.title" = "OpenDHT-määritykset";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
-"zPJ-cO-neQ.title" = "Use TURN";
+"zPJ-cO-neQ.title" = "Käytä TURNia";
diff --git a/ui/fi.lproj/AccAdvancedSip.strings b/ui/fi.lproj/AccAdvancedSip.strings
index 6e06d1c99bcbd2435a02c24f1a32922ef2d8f0a0..a88c4e01cde871f4e392b2caae770339ca05402c 100644
--- a/ui/fi.lproj/AccAdvancedSip.strings
+++ b/ui/fi.lproj/AccAdvancedSip.strings
@@ -9,16 +9,16 @@
 "24s-we-pkD.title" = "Turvallisuus";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire timeout (seconds)"; ObjectID = "2rB-Bv-c9U"; */
-"2rB-Bv-c9U.title" = "Registration expire timeout (seconds)";
+"2rB-Bv-c9U.title" = "Rekistöröinnin aikakatkaisu (sekunneissa)";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "3Uq-Nb-J1A"; */
-"3Uq-Nb-J1A.title" = "Call settings";
+"3Uq-Nb-J1A.title" = "Puheluasetukset";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
-"3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
+"3rM-KT-bNf.title" = "Varavalinta RTP:n salausvirheestä";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "Vastaa puheluihin automaattisesti";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
 "6eH-la-JbF.title" = "TURN realm";
@@ -27,7 +27,7 @@
 "72p-GY-gu6.title" = "Henkilökohtaisen salausavaimen salasana";
 
 /* Class = "NSTextFieldCell"; title = "Outgoing TLS server name"; ObjectID = "8JD-11-wHZ"; */
-"8JD-11-wHZ.title" = "Outgoing TLS server name";
+"8JD-11-wHZ.title" = "Lähtevän TLS-palvelimen nimi";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
 "8bw-iH-XGl.title" = "Item 1";
@@ -39,10 +39,10 @@
 "A31-3Y-z4R.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
-"ELr-A7-mGE.title" = "Published address";
+"ELr-A7-mGE.title" = "Julkinen osoite";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
-"Gwi-Mp-NpZ.title" = "Use TURN";
+"Gwi-Mp-NpZ.title" = "Käytä TURNia";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "HRM-FR-1sH"; */
 "HRM-FR-1sH.title" = "Käytä STUNia";
@@ -54,7 +54,7 @@
 "JV8-cY-6vR.title" = "Vaadi saapuvilta TLS-yhteyksiltä sertifikaatti";
 
 /* Class = "NSTextFieldCell"; title = "SDP Session Negotiation (ICE Fallback)"; ObjectID = "Jfp-NE-ODd"; */
-"Jfp-NE-ODd.title" = "SDP Session Negotiation (ICE Fallback)";
+"Jfp-NE-ODd.title" = "SDP-istunnon neuvottelut (ICE Fallback)";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "MBR-AC-HFq"; */
 "MBR-AC-HFq.title" = "Laatikko";
@@ -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" = "Oma soittoääni";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -75,7 +75,7 @@
 "Ppa-zn-w1X.title" = "Laatikko";
 
 /* Class = "NSButtonCell"; title = "Enable SDES for key exchange protocol"; ObjectID = "Qk8-tH-a0l"; */
-"Qk8-tH-a0l.title" = "Enable SDES for key exchange protocol";
+"Qk8-tH-a0l.title" = "Ota SDES-protokolla käyttöön avaimien vaihdossa";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RIj-rT-gSd"; */
 "RIj-rT-gSd.title" = "Tekstilaatikko";
@@ -87,7 +87,7 @@
 "W9F-Nf-ehp.title" = "Henkilökohtainen salausavain";
 
 /* Class = "NSButtonCell"; title = "Verify answer certificates (client side)"; ObjectID = "WsS-1e-Epm"; */
-"WsS-1e-Epm.title" = "Verify answer certificates (client side)";
+"WsS-1e-Epm.title" = "Vahvista varmenteet (asiakaspuoli)";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "Xp3-bL-3Cs"; */
 "Xp3-bL-3Cs.title" = "Käyttäjäsertifikaatti";
@@ -117,7 +117,7 @@
 "ekM-Cg-DEo.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
-"fjH-ej-gEr.title" = "Network interface";
+"fjH-ej-gEr.title" = "Verkkoliitäntä";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
@@ -138,10 +138,10 @@
 "nq0-Js-9Cr.title" = "Minimi";
 
 /* 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" = "Käytä mukautettua osoitetta ja porttia";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
-"rMN-Wf-tmp.title" = "TURN username";
+"rMN-Wf-tmp.title" = "TURN käyttäjänimi";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
 "vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
@@ -165,4 +165,4 @@
 "xjL-Wb-7VN.title" = "TURN salasana";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
-"zBy-cW-KY3.title" = "TLS protocol method";
+"zBy-cW-KY3.title" = "Menetelmä TLS-protokolla";
diff --git a/ui/fi.lproj/AccRingGeneral.strings b/ui/fi.lproj/AccRingGeneral.strings
index ecfecb22d7fcdcaa8562cc70899c5d354f033992..c408224b6cf90e86aa1c075e21157c2608bdcfc0 100644
--- a/ui/fi.lproj/AccRingGeneral.strings
+++ b/ui/fi.lproj/AccRingGeneral.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Vie tunnus";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
-"6fI-98-VvQ.title" = "Banned Contacts";
+"6fI-98-VvQ.title" = "Estetyt yhteystiedot";
 
 /* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
 "Hbq-nL-BhK.title" = "Edistyneet asetukset";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Päällä";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
 "TYk-QK-iaT.title" = "Salasana:";
@@ -24,7 +24,7 @@
 "aQL-hX-CfA.title" = "Tekstilaatikko";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
-"bOY-mY-1Yo.ibShadowedToolTip" = "Unblock";
+"bOY-mY-1Yo.ibShadowedToolTip" = "Poista esto";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
 "fPK-Zv-Uom.title" = "Username:";
@@ -51,7 +51,7 @@
 "qx7-i1-3Na.title" = "Identifier:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
-"tWk-Od-BEQ.title" = "Link another device";
+"tWk-Od-BEQ.title" = "Linkitä toinen laite";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "Tunnus";
diff --git a/ui/fi.lproj/AccSipGeneral.strings b/ui/fi.lproj/AccSipGeneral.strings
index 3716b1dc6940eabd8638b3616134a7c857c4525a..db59dd86e91d7d074a583bb4bb55bba151042e75 100644
--- a/ui/fi.lproj/AccSipGeneral.strings
+++ b/ui/fi.lproj/AccSipGeneral.strings
@@ -9,7 +9,7 @@
 "NlM-R9-ola.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
-"R7s-DE-PiP.title" = "Voicemail";
+"R7s-DE-PiP.title" = "Ääniviesti";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YAG-qB-4wH"; */
 "YAG-qB-4wH.placeholderString" = "Syötä nimesi";
diff --git a/ui/fi.lproj/AccountBackupVC.strings b/ui/fi.lproj/AccountBackupVC.strings
index d4e138dbb265e7fb1f7bd6da2a8dd656aecc6b76..bf73bc2935b3db34838d22a29867fb5bf691c16f 100644
--- a/ui/fi.lproj/AccountBackupVC.strings
+++ b/ui/fi.lproj/AccountBackupVC.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSButtonCell"; title = "Skip"; ObjectID = "73h-fa-4yX"; */
-"73h-fa-4yX.title" = "Skip";
+"73h-fa-4yX.title" = "Ohita";
 
 /* 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.";
+"7lU-Qy-WOb.title" = "Varmuuskopion aikana tapahtui virhe. Tarkista käyttäjätiedot.";
 
 /* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
-"PVF-bb-Yoi.title" = "Never show me this again";
+"PVF-bb-Yoi.title" = "Älä näytä tätä uudestaan";
 
 /* 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.";
+"SUG-lC-TDL.title" = "Tämä tili on olemassa vain tässä laitteessa. Jos kadotat laitteen tai poistat sovelluksen, tilisi myös poistuu. Voit varmuuskopioida tilisi nyt tai myöhemmin.";
 
 /* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
 "cod-s7-SPd.title" = "Vie tunnus";
diff --git a/ui/fi.lproj/AccountMenuItemView.strings b/ui/fi.lproj/AccountMenuItemView.strings
index 6f53001fd22d393e5c57fe6bf209a90676c62990..d52a5801504c494c66ad2554d97aa23fdb280f57 100644
--- a/ui/fi.lproj/AccountMenuItemView.strings
+++ b/ui/fi.lproj/AccountMenuItemView.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "Nimike";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
-"BkF-b3-tzE.ibShadowedToolTip" = "Create New Account";
+"BkF-b3-tzE.ibShadowedToolTip" = "Luo uusi tunnus";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ZIZ-jd-eLK"; */
 "ZIZ-jd-eLK.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "Nimike";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "Nimike";
diff --git a/ui/fi.lproj/AccountSettings.strings b/ui/fi.lproj/AccountSettings.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ca8ab08ff0570e4ec85c711a1ef7e20f06d181db
--- /dev/null
+++ b/ui/fi.lproj/AccountSettings.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "cyq-zN-98i"; */
+"cyq-zN-98i.ibShadowedToolTip" = "Takaisin";
diff --git a/ui/fi.lproj/Conversation.strings b/ui/fi.lproj/Conversation.strings
index a08618e78e460677feff2c833c17c866bd92a5da..2c1a49bfb13794aaeb0d0ca036bb5d7113ad8d3b 100644
--- a/ui/fi.lproj/Conversation.strings
+++ b/ui/fi.lproj/Conversation.strings
@@ -12,13 +12,13 @@
 "Ilz-7v-2fr.placeholderString" = "Lähetä viesti";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
-"RuH-fO-poy.ibShadowedToolTip" = "Start audio call";
+"RuH-fO-poy.ibShadowedToolTip" = "Aloita äänipuhelu";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
 "UJf-cF-RAo.ibShadowedToolTip" = "Lähetä";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
-"cFH-d7-Erh.ibShadowedToolTip" = "Start video call";
+"cFH-d7-Erh.ibShadowedToolTip" = "Aloita videopuhelu";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
 "ciI-CA-tly.title" = "Laatikko";
@@ -33,7 +33,7 @@
 "hrX-ac-Quk.title" = "Laatikko";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
-"ooq-vs-Xt1.ibShadowedToolTip" = "Back";
+"ooq-vs-Xt1.ibShadowedToolTip" = "Takaisin";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
 "pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
diff --git a/ui/fi.lproj/CurrentCall.strings b/ui/fi.lproj/CurrentCall.strings
index b5fb4cd8904068834ec85ce9bf90fa3643a7a2d2..afeefe102d14dc28fb8f1056ecdf014f4bf3a6cc 100644
--- a/ui/fi.lproj/CurrentCall.strings
+++ b/ui/fi.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "Laatikko";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "Nimike";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "Laatikko";
diff --git a/ui/fi.lproj/ExportPasswordWindow.strings b/ui/fi.lproj/ExportPasswordWindow.strings
index 2466bd012fac1e82849fb0a7ba9e5751811d477a..67ea4c6cd06356a7a482af4b093214650b86c5a9 100644
--- a/ui/fi.lproj/ExportPasswordWindow.strings
+++ b/ui/fi.lproj/ExportPasswordWindow.strings
@@ -36,7 +36,7 @@
 "vwh-K9-3O9.title" = "Salasana";
 
 /* 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" = "Linkitä toinen laite tähän tiliin";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
 "xqz-Uz-hqU.placeholderString" = "Salasana...";
diff --git a/ui/fi.lproj/GeneralPrefs.strings b/ui/fi.lproj/GeneralPrefs.strings
index 662b13a76f3a97dc58e35e02f49346b454d12d8e..6eedfaad986cc726d30da0a83eedc823e560bc83 100644
--- a/ui/fi.lproj/GeneralPrefs.strings
+++ b/ui/fi.lproj/GeneralPrefs.strings
@@ -6,10 +6,10 @@
 "42E-UY-qlP.title" = "Monthly";
 
 /* Class = "NSTextFieldCell"; title = "Download folder"; ObjectID = "6Ye-pe-9WV"; */
-"6Ye-pe-9WV.title" = "Download folder";
+"6Ye-pe-9WV.title" = "Ladatut kansio";
 
 /* Class = "NSButtonCell"; title = "Always record calls"; ObjectID = "6zp-rh-brb"; */
-"6zp-rh-brb.title" = "Always record calls";
+"6zp-rh-brb.title" = "Tallenna puhelut aina";
 
 /* Class = "NSTextFieldCell"; title = "System"; ObjectID = "8xm-Tc-NMN"; */
 "8xm-Tc-NMN.title" = "Järjestelmä";
@@ -48,7 +48,7 @@
 "cB6-4m-9MU.title" = "Päivittäinen";
 
 /* Class = "NSTextFieldCell"; title = "Record folder"; ObjectID = "ep4-QU-rGl"; */
-"ep4-QU-rGl.title" = "Record folder";
+"ep4-QU-rGl.title" = "Tallenna kansioon";
 
 /* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
 "mbu-TH-bs8.title" = "Tunneittain";
@@ -57,10 +57,10 @@
 "r4u-t3-gBc.title" = "Päivitä";
 
 /* 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" = "Ota ilmoitukset käyttöön saapuville puheluille";
 
 /* 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";
 
 /* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
-"y5x-4d-E26.title" = "Record local video";
+"y5x-4d-E26.title" = "Tallenna paikallinen video";
diff --git a/ui/fi.lproj/Localizable.strings b/ui/fi.lproj/Localizable.strings
index e6738c5f1c7b9bcf757c9312ea975eeb3d658aee..3173caf915797f78766d6e26f18e0ce8815eccdd 100644
--- a/ui/fi.lproj/Localizable.strings
+++ b/ui/fi.lproj/Localizable.strings
@@ -38,7 +38,7 @@
 "Choose file" = "Valitse tiedosto";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "Tyhjennä keskustelu";
 
 /* No comment provided by engineer. */
 "Copy" = "Kopioi";
@@ -65,7 +65,7 @@
 "ID: " = "ID: ";
 
 /* link account title */
-"Import from backup" = "Import from backup";
+"Import from backup" = "Tuo varmuuskopiosta";
 
 /* link account title */
 "Import from other device" = "Import from other device";
@@ -116,7 +116,7 @@
 "Registered name: " = "Registered name: ";
 
 /* Remove account alert title */
-"Remove account" = "Remove account";
+"Remove account" = "Poista tili";
 
 /* export account button title */
 "Select archive" = "Select archive";
@@ -137,10 +137,10 @@
 "Sign In" = "Sign In";
 
 /* Record message title */
-"Stop recording" = "Stop recording";
+"Stop recording" = "Lopeta tallennus";
 
 /* File transfer successful label */
-"Success" = "Success";
+"Success" = "Onnistui";
 
 /* No comment provided by engineer. */
 "Text Actions" = "Tekstitoiminnot";
diff --git a/ui/fi.lproj/PasswordChange.strings b/ui/fi.lproj/PasswordChange.strings
index 1b5d22d5615713bccc9a5b18a663f2b093abc1c8..4b51f31ec7b4a15c3c6ed21c3973fd886953292f 100644
--- a/ui/fi.lproj/PasswordChange.strings
+++ b/ui/fi.lproj/PasswordChange.strings
@@ -3,7 +3,7 @@
 "1Bs-Te-34p.placeholderString" = "Repeat a new password";
 
 /* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
-"4Uf-yO-9X8.title" = "Change Password";
+"4Uf-yO-9X8.title" = "Vaihda salasana";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
 "4aD-Xd-zHS.placeholderString" = "Enter a new password";
diff --git a/ui/fi.lproj/RingWindow.strings b/ui/fi.lproj/RingWindow.strings
index ec40abb64d56e7decde3be780bb4556416176e14..f77f9106a897821b56c9669ade881a3b2fa46310 100644
--- a/ui/fi.lproj/RingWindow.strings
+++ b/ui/fi.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "XSp-w5-Fes.paletteLabel" = "Toolbar Item";
 
 /* 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!";
+"Xb9-UT-M2F.title" = "Tämä on sinun ID-tunnus.\nKopioi ja jaa se ystäviesi kanssa!";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
 "eVv-lu-T1Y.title" = "Laatikko";
diff --git a/ui/fi.lproj/RingWizardChoose.strings b/ui/fi.lproj/RingWizardChoose.strings
index c621f0c3e1d9a930f54280253f8ab816dd922107..debe14eb3c662417ebdcd284edcd37d107fe618b 100644
--- a/ui/fi.lproj/RingWizardChoose.strings
+++ b/ui/fi.lproj/RingWizardChoose.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
-"HGQ-Kd-WIw.title" = "Connect to account manager";
+"HGQ-Kd-WIw.title" = "Yhteyden muodostaminen tilinhallintaan";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "Peru";
@@ -12,10 +12,10 @@
 "k1T-a7-yZD.title" = "Tee Jami-tili";
 
 /* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
-"rtw-Db-BWL.title" = "Import from archive backup";
+"rtw-Db-BWL.title" = "Tuo varmuuskopiosta";
 
 /* 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";
+"yBt-Bv-fi2.title" = "Lisää uusi SIP tunnus";
diff --git a/ui/it_IT.lproj/AccountMenuItemView.strings b/ui/it_IT.lproj/AccountMenuItemView.strings
index 56b7a187499315f5627999bcdfc1ac69fed96b34..410797d5cb8546a0579255a01a59df467da93ba2 100644
--- a/ui/it_IT.lproj/AccountMenuItemView.strings
+++ b/ui/it_IT.lproj/AccountMenuItemView.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "Etichetta";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
 "BkF-b3-tzE.ibShadowedToolTip" = "Crea un nuovo account";
@@ -9,7 +9,7 @@
 "ZIZ-jd-eLK.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "Etichetta";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "Etichetta";
diff --git a/ui/it_IT.lproj/CurrentCall.strings b/ui/it_IT.lproj/CurrentCall.strings
index c8f7a6d46c6ad0490f926936ffc538903ef613a3..a0f0cf2cf21bc16d3179b75b14c8ccffed74a0b4 100644
--- a/ui/it_IT.lproj/CurrentCall.strings
+++ b/ui/it_IT.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "Etichetta";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "Box";
diff --git a/ui/it_IT.lproj/GeneralPrefs.strings b/ui/it_IT.lproj/GeneralPrefs.strings
index 777341c0b35760a387eafa448cba0563bd950778..3308e34810397c44c473560121e9c50651d77ca7 100644
--- a/ui/it_IT.lproj/GeneralPrefs.strings
+++ b/ui/it_IT.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
-"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+"0jV-Q4-232.title" = "Abilita le notifiche per i messaggi in arrivo";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Mensile";
@@ -21,7 +21,7 @@
 "AId-am-73Q.title" = "Settimanale";
 
 /* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
-"AOr-Cq-w57.title" = "Quality(Kbps)";
+"AOr-Cq-w57.title" = "Qualità(Kbps)";
 
 /* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
 "I0d-mx-KhT.title" = "Notifiche";
@@ -30,13 +30,13 @@
 "JGj-TS-Hxl.title" = "6000";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
-"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+"Lww-Wb-yrf.title" = "Abilita le notifiche per gli inviti";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
 "O2C-xR-mHF.title" = "Esegui Ring all'avvio";
 
 /* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
-"Qb8-tb-vJd.title" = "Call recording";
+"Qb8-tb-vJd.title" = "Registrazione chiamata";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Controlla aggiornamenti automaticamente";
diff --git a/ui/it_IT.lproj/Localizable.strings b/ui/it_IT.lproj/Localizable.strings
index 5da700f9ecc847fd80548fce87890e30abc27be8..819fd6eb5f9714d83d63a9be87ea660c4e708f07 100644
--- a/ui/it_IT.lproj/Localizable.strings
+++ b/ui/it_IT.lproj/Localizable.strings
@@ -5,7 +5,7 @@
 "Accept" = "Accetta";
 
 /* Welcome title */
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "Aggiungi un account SIP";
 
 /* Contextual menu action */
 "Add to contacts" = "Aggiungi alla rubrica";
@@ -17,19 +17,19 @@
 "An error occured during the export" = "Si è verificato un errore durante l'esportazione";
 
 /* Peer busy message */
-"appears to be busy." = "appears to be busy.";
+"appears to be busy." = "sembra essere occupato.";
 
 /* Error audio permission */
-"Audio permission not granted" = "Audio permission not granted";
+"Audio permission not granted" = "Permesso audio non consentito";
 
 /* Backup account */
-"Backup your account" = "Backup your account";
+"Backup your account" = "Backup il tuo account";
 
 /* Contextual menu action */
 "Block contact" = "Blocca contatto";
 
 /* 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.";
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "Facendo clic su \"OK\" rimuoverai questo account su questo dispositivo! Questa azione non può essere annullata. Inoltre, il nome registrato potrebbe andare perso.";
 
 /* File transfer canceled label */
 "Canceled" = "Annullato";
@@ -44,13 +44,13 @@
 "Copy" = "Copia";
 
 /* Recording view explanation label */
-"Could not record message during call" = "Could not record message during call";
+"Could not record message during call" = "Impossibile registrare il messaggio durante la chiamata";
 
 /* Welcome title */
 "Create a new account" = "Crea un nuovo account";
 
 /* Backup enter password */
-"Enter account password" = "Enter account password";
+"Enter account password" = "Inserisci la password dell'account";
 
 /* File transfer failed label */
 "Failed" = "Errore";
@@ -74,19 +74,19 @@
 "Incoming call from %@" = "Chiamati in arrivo da %@";
 
 /* Incoming message from {Name} */
-"Incoming message from %@" = "Incoming message from %@";
+"Incoming message from %@" = "Messaggio in arrivo da %@";
 
 /* Text shown to user when his username is invalid to be registered */
 "Invalid username" = "Nome utente non valido";
 
 /* Text shown to user when his username is invalid to be registered */
-"Invalid username." = "Invalid username.";
+"Invalid username." = "Nome utente non valido.";
 
 /* Allert message when no accounts are available */
-"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+"Navigate to preferences to create a new account" = "Passa alle preferenze per creare un nuovo account";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "Nessun account disponibile";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "Password e conferma non corrispondono";
@@ -113,25 +113,25 @@
 "Refuse" = "Rifiuto";
 
 /* Text shown to the user */
-"Registered name: " = "Registered name: ";
+"Registered name: " = "Nome registrato:";
 
 /* Remove account alert title */
 "Remove account" = "Rimuovi l'account";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "Seleziona l'archivio";
 
 /* Send button title */
 "Send" = "Invia";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "Invia una richiesta di contatto";
 
 /* No comment provided by engineer. */
 "Share" = "Condividi";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "Condividi schermo";
 
 /* Sign In */
 "Sign In" = "Registrati";
@@ -155,29 +155,29 @@
 "The password you entered does not unlock this account" = "La password che hai inserito non sblocca questo account";
 
 /* Text shown to the user */
-"This account needs to be migrated" = "This account needs to be migrated";
+"This account needs to be migrated" = "Questo account deve essere migrato";
 
 /* 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!";
+"This is your ID. \nCopy and share it with your friends!" = "Questo è il tuo ID\nCopialo e condividilo con i tuoi amici!";
 
 /* 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!";
+"This is your Jami username. \nCopy and share it with your friends!" = "Questo è il tuo nome utente Jami. \nCopia e condividi con i tuoi amici!";
 
 /* 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.";
+"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." = "Per completare il processo, devi aprire Jami sul nuovo dispositivo e scegliere l'opzione \"Collega questo dispositivo a un account\". Il tuo pin è valido per 10 minuti.";
 
 /* Text shown to the user */
 "To proceed with the migration, you need to enter a password that was used for this account." = "Per procedere con la migrazione, è necessario inserire una password utilizzata per questo account.";
 
 /* File transfer peer unjoinable label */
-"Unjoinable" = "Unjoinable";
+"Unjoinable" = "Peer non raggiungibile";
 
 /* Error video permission */
-"Video permission not granted" = "Video permission not granted";
+"Video permission not granted" = "Autorizzazione video non concessa";
 
 /* Welcome title */
 "Welcome to Jami" = "Benvenuto in Jami";
 
 /* Peer busy message */
-"Would you like to leave a message?" = "Would you like to leave a message?";
+"Would you like to leave a message?" = "Vuoi lasciare un messaggio?";
 
diff --git a/ui/it_IT.lproj/RegisterNameWindow.strings b/ui/it_IT.lproj/RegisterNameWindow.strings
index d33036d93302ba8c87ad4326f61ad90001974b28..18127d38317901799d68035c3859e06e921d4a09 100644
--- a/ui/it_IT.lproj/RegisterNameWindow.strings
+++ b/ui/it_IT.lproj/RegisterNameWindow.strings
@@ -9,22 +9,22 @@
 "JWw-7m-ywL.title" = "Finestra";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Inserisci la password...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Inserisci la password...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Inserisci la password...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Inserisci la password...";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Solo un attimo...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+"bdC-Uc-Qhs.placeholderString" = "Inserisci il nome utente...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Annulla";
@@ -45,7 +45,7 @@
 "lo5-ei-wHM.title" = "Utente";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
-"nFA-uz-WjI.placeholderString" = "Enter password...";
+"nFA-uz-WjI.placeholderString" = "Inserisci la password...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username ";
+"tje-EZ-ZPI.title" = "Registra un nome utente pubblico";
diff --git a/ui/ja.lproj/AccAdvancedRing.strings b/ui/ja.lproj/AccAdvancedRing.strings
index fe9701861e7c844801471edbff4047ea0cf12403..a7b69e919995c7fd85ad9eb5e64e1616520f6fbc 100644
--- a/ui/ja.lproj/AccAdvancedRing.strings
+++ b/ui/ja.lproj/AccAdvancedRing.strings
@@ -6,10 +6,10 @@
 "25Q-c1-ld3.title" = "UPnP";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "538-we-FTp"; */
-"538-we-FTp.title" = "Box";
+"538-we-FTp.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "7eU-EP-4br"; */
-"7eU-EP-4br.title" = "Box";
+"7eU-EP-4br.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
 "8mv-Ia-GM4.title" = "TURN address";
@@ -27,7 +27,7 @@
 "ID3-Sv-gYY.title" = "Name server";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
-"K0z-NH-3Cq.title" = "Box";
+"K0z-NH-3Cq.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "LWs-a2-E7f"; */
 "LWs-a2-E7f.title" = "ユーザー証明書";
@@ -57,16 +57,16 @@
 "YcX-lE-8ug.title" = "秘密鍵のパスワード";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ywo-5x-8kh"; */
-"Ywo-5x-8kh.title" = "Box";
+"Ywo-5x-8kh.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ZNe-H0-dJk"; */
-"ZNe-H0-dJk.title" = "Box";
+"ZNe-H0-dJk.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "ZqB-gt-yFt"; */
 "ZqB-gt-yFt.title" = "アドレス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eGX-gk-Zxp"; */
-"eGX-gk-Zxp.title" = "Box";
+"eGX-gk-Zxp.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
 "eMG-uY-bpH.title" = "TURNのユーザー名";
@@ -93,10 +93,10 @@
 "soR-nF-ybe.title" = "秘密鍵";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
-"sy5-OH-wyB.title" = "Box";
+"sy5-OH-wyB.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "vYi-gW-MrY"; */
-"vYi-gW-MrY.title" = "Box";
+"vYi-gW-MrY.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
 "xJT-ij-69q.title" = "OpenDHT configuration";
diff --git a/ui/ja.lproj/AccAdvancedSip.strings b/ui/ja.lproj/AccAdvancedSip.strings
index 9f96ad91830069051dc4f8ea375a08245dc61160..a35be14f34186b26c2a3a1b7b68e2f397b0c7b92 100644
--- a/ui/ja.lproj/AccAdvancedSip.strings
+++ b/ui/ja.lproj/AccAdvancedSip.strings
@@ -36,7 +36,7 @@
 "9p9-GR-XKU.title" = "ポート番号";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "A31-3Y-z4R"; */
-"A31-3Y-z4R.title" = "Box";
+"A31-3Y-z4R.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
 "ELr-A7-mGE.title" = "Published address";
@@ -57,7 +57,7 @@
 "Jfp-NE-ODd.title" = "SDP Session Negotiation (ICE Fallback)";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "MBR-AC-HFq"; */
-"MBR-AC-HFq.title" = "Box";
+"MBR-AC-HFq.title" = "ボックス";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
 "Mho-w1-ZPJ.title" = "Item 3";
@@ -72,7 +72,7 @@
 "Ogj-NW-fZ9.title" = "Audio RTPポートの範囲";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ppa-zn-w1X"; */
-"Ppa-zn-w1X.title" = "Box";
+"Ppa-zn-w1X.title" = "ボックス";
 
 /* Class = "NSButtonCell"; title = "Enable SDES for key exchange protocol"; ObjectID = "Qk8-tH-a0l"; */
 "Qk8-tH-a0l.title" = "Enable SDES for key exchange protocol";
@@ -96,7 +96,7 @@
 "Xxr-gl-ukE.title" = "アドレス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Zuz-jy-rLn"; */
-"Zuz-jy-rLn.title" = "Box";
+"Zuz-jy-rLn.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
 "aYs-wh-Hpr.title" = "TURN address";
@@ -108,13 +108,13 @@
 "cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
-"cwV-lc-jju.title" = "Box";
+"cwV-lc-jju.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Negotiation timeout (seconds)"; ObjectID = "dtf-uk-n1B"; */
 "dtf-uk-n1B.title" = "Negotiation timeout (seconds)";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ekM-Cg-DEo"; */
-"ekM-Cg-DEo.title" = "Box";
+"ekM-Cg-DEo.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
 "fjH-ej-gEr.title" = "Network interface";
@@ -129,7 +129,7 @@
 "jgX-tQ-dIA.title" = "テキストセル";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "l86-cH-pp8"; */
-"l86-cH-pp8.title" = "Box";
+"l86-cH-pp8.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "nh9-3y-CEI"; */
 "nh9-3y-CEI.title" = "最大";
@@ -156,7 +156,7 @@
 "wq6-KV-8X3.title" = "最大";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "wyZ-Hb-BNf"; */
-"wyZ-Hb-BNf.title" = "Box";
+"wyZ-Hb-BNf.title" = "ボックス";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "x93-zk-hAW"; */
 "x93-zk-hAW.title" = "UPnP";
diff --git a/ui/ja.lproj/AccRingGeneral.strings b/ui/ja.lproj/AccRingGeneral.strings
index 3e53ae6ae7dc0abe01e3c036d8f466497263eaae..ac2e5250a579416f1b801953bdc5ed83e7f33ce2 100644
--- a/ui/ja.lproj/AccRingGeneral.strings
+++ b/ui/ja.lproj/AccRingGeneral.strings
@@ -33,7 +33,7 @@
 "gLp-qz-XYs.title" = "登録";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "gTn-6p-Gtk"; */
-"gTn-6p-Gtk.title" = "Box";
+"gTn-6p-Gtk.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "kt0-P6-fdQ"; */
 "kt0-P6-fdQ.placeholderString" = "名前を入力";
@@ -42,7 +42,7 @@
 "lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
-"oVO-wj-fwQ.title" = "Box";
+"oVO-wj-fwQ.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
 "oga-WC-4gb.title" = "リンクされたデバイス";
diff --git a/ui/ja.lproj/AccSipGeneral.strings b/ui/ja.lproj/AccSipGeneral.strings
index 3fa4588cc09a917e52eaaba7eae9f2d7ccdcc7d9..653f51f3ab0967c7425843ebd8cb5231a7927108 100644
--- a/ui/ja.lproj/AccSipGeneral.strings
+++ b/ui/ja.lproj/AccSipGeneral.strings
@@ -6,7 +6,7 @@
 "Fj6-Q3-Gz3.title" = "ユーザー名";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
-"NlM-R9-ola.title" = "Box";
+"NlM-R9-ola.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
 "R7s-DE-PiP.title" = "Voicemail";
diff --git a/ui/ja.lproj/AccountMenuItemView.strings b/ui/ja.lproj/AccountMenuItemView.strings
new file mode 100644
index 0000000000000000000000000000000000000000..a442248f721bdd70e79dd1340d024d9016bf8674
--- /dev/null
+++ b/ui/ja.lproj/AccountMenuItemView.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
+"7sc-IE-yuO.title" = "ラベル";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
+"BkF-b3-tzE.ibShadowedToolTip" = "新規アカウント作成";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ZIZ-jd-eLK"; */
+"ZIZ-jd-eLK.title" = "ボックス";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
+"gOS-aC-TGo.title" = "ラベル";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
+"uPR-fc-nOP.title" = "ラベル";
diff --git a/ui/ja.lproj/Conversation.strings b/ui/ja.lproj/Conversation.strings
index 934b6500d5cc95c0813bd9fc4a1cd614f6ffa3b6..6dcbe0c73da6770e457e09ae2e8fb8c3ed146a4e 100644
--- a/ui/ja.lproj/Conversation.strings
+++ b/ui/ja.lproj/Conversation.strings
@@ -21,16 +21,16 @@
 "cFH-d7-Erh.ibShadowedToolTip" = "ビデオ通話を開始";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
-"ciI-CA-tly.title" = "Box";
+"ciI-CA-tly.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "fh9-Uo-8R1"; */
-"fh9-Uo-8R1.title" = "Box";
+"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" = "Box";
+"hrX-ac-Quk.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
 "ooq-vs-Xt1.ibShadowedToolTip" = "戻る";
@@ -39,7 +39,7 @@
 "pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "pRL-vb-me9"; */
-"pRL-vb-me9.title" = "Box";
+"pRL-vb-me9.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record an audio message"; ObjectID = "wYE-S3-AzD"; */
 "wYE-S3-AzD.ibShadowedToolTip" = "Record an audio message";
diff --git a/ui/ja.lproj/CurrentCall.strings b/ui/ja.lproj/CurrentCall.strings
index 1fff34502e6a5ae42cd97a41a9e05a254d50d691..8195df0c0fd652127477dc5218e32c6b5ffd8d95 100644
--- a/ui/ja.lproj/CurrentCall.strings
+++ b/ui/ja.lproj/CurrentCall.strings
@@ -3,16 +3,16 @@
 "2cB-dz-KYg.ibShadowedToolTip" = "通話終了";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
-"4xt-xs-LVn.title" = "Box";
+"4xt-xs-LVn.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
-"DSf-SJ-l6k.title" = "Box";
+"DSf-SJ-l6k.title" = "ボックス";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "ラベル";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
-"KCp-bZ-69S.title" = "Box";
+"KCp-bZ-69S.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
 "Kjq-iM-NBL.ibShadowedToolTip" = "通話終了";
@@ -54,7 +54,7 @@
 "hKi-Ay-ex5.title" = "person Id";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
-"hfc-s5-yWK.title" = "Box";
+"hfc-s5-yWK.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
 "ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
diff --git a/ui/ja.lproj/LeaveMessageVC.strings b/ui/ja.lproj/LeaveMessageVC.strings
index ed806a924a79651ebd0849a32204f58a423a33da..7673936abdb974ea983c754d9a2167de78054ee9 100644
--- a/ui/ja.lproj/LeaveMessageVC.strings
+++ b/ui/ja.lproj/LeaveMessageVC.strings
@@ -9,7 +9,7 @@
 "M07-cf-bjZ.title" = "Go back to conversations";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
-"TwL-yO-BXI.title" = "Box";
+"TwL-yO-BXI.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
 "dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
diff --git a/ui/ja.lproj/MessageCells.strings b/ui/ja.lproj/MessageCells.strings
index 3b426128c7a38908a91561abf14679f1a931d5b6..3c62cce4fe6fd66835af35db1131906cf3938d5c 100644
--- a/ui/ja.lproj/MessageCells.strings
+++ b/ui/ja.lproj/MessageCells.strings
@@ -15,10 +15,10 @@
 "DmW-13-1QZ.title" = "Round Rect";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "EAm-7Z-ubs"; */
-"EAm-7Z-ubs.title" = "Box";
+"EAm-7Z-ubs.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ko5-2g-foK"; */
-"Ko5-2g-foK.title" = "Box";
+"Ko5-2g-foK.title" = "ボックス";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "Oo1-gq-aPY"; */
 "Oo1-gq-aPY.title" = "Round Rect";
@@ -27,10 +27,10 @@
 "QGs-MO-mVi.title" = "拒否";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "dDX-sZ-ylI"; */
-"dDX-sZ-ylI.title" = "Box";
+"dDX-sZ-ylI.title" = "ボックス";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "e0e-TK-qch"; */
-"e0e-TK-qch.title" = "Box";
+"e0e-TK-qch.title" = "ボックス";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "fu2-X7-GW8"; */
 "fu2-X7-GW8.title" = "Round Rect";
@@ -39,4 +39,4 @@
 "tBq-Qe-bEm.title" = "受け入れ";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "x2B-gu-YBe"; */
-"x2B-gu-YBe.title" = "Box";
+"x2B-gu-YBe.title" = "ボックス";
diff --git a/ui/ja.lproj/RingWindow.strings b/ui/ja.lproj/RingWindow.strings
index fa697b8e112f49f78455e399503547f4a33ecb48..0d36065c742a45ee34240bf4f3001ea77f257a26 100644
--- a/ui/ja.lproj/RingWindow.strings
+++ b/ui/ja.lproj/RingWindow.strings
@@ -36,7 +36,7 @@
 "Xb9-UT-M2F.title" = "これがあなたのIDです。\nコピーして友達とシェアしましょう!";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
-"eVv-lu-T1Y.title" = "Box";
+"eVv-lu-T1Y.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
 "eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
diff --git a/ui/nb.lproj/AccountBackupVC.strings b/ui/nb.lproj/AccountBackupVC.strings
index 32841aa7abc87ea1dc2957765c8854ca5a1359a6..50f02c5cd17c117e45bb0d6b4541a014ae59ce93 100644
--- a/ui/nb.lproj/AccountBackupVC.strings
+++ b/ui/nb.lproj/AccountBackupVC.strings
@@ -3,13 +3,13 @@
 "73h-fa-4yX.title" = "Hopp over";
 
 /* 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.";
+"7lU-Qy-WOb.title" = "Det oppstod en feil under sikkerhetskopien. Vennligst sjekk påloggingsinformasjonen.";
 
 /* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
-"PVF-bb-Yoi.title" = "Never show me this again";
+"PVF-bb-Yoi.title" = "Ikke vis meg dette igjen";
 
 /* 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.";
+"SUG-lC-TDL.title" = "Denne kontoen eksisterer kun på denne enheten. Hvis du mister enheten din eller avinstallerer applikasjonen, vil kontoen bli slettet. Du kan sikkerhetskopiere kontoen din nå eller senere.";
 
 /* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
 "cod-s7-SPd.title" = "Eksporter konto";
diff --git a/ui/nb.lproj/AccountMenuItemView.strings b/ui/nb.lproj/AccountMenuItemView.strings
index b04a24ccb916f63d39bb8b85a46648124fe9e750..33b045cc4098d4bef3e41cf5dc9d3938997aafd2 100644
--- a/ui/nb.lproj/AccountMenuItemView.strings
+++ b/ui/nb.lproj/AccountMenuItemView.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "Merkelapp";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
 "BkF-b3-tzE.ibShadowedToolTip" = "Opprett ny konto";
@@ -9,7 +9,7 @@
 "ZIZ-jd-eLK.title" = "Boks";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "Merkelapp";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "Merkelapp";
diff --git a/ui/nb.lproj/Conversation.strings b/ui/nb.lproj/Conversation.strings
index 325e85e31bac0353fd87a6533c5ad8fdf7e9eda3..98da1861de0b2502cc42030404fb87e49401b17f 100644
--- a/ui/nb.lproj/Conversation.strings
+++ b/ui/nb.lproj/Conversation.strings
@@ -27,7 +27,7 @@
 "fh9-Uo-8R1.title" = "Boks";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
-"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+"gwx-eT-PcN.ibShadowedToolTip" = "Send en fil";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
 "hrX-ac-Quk.title" = "Boks";
diff --git a/ui/nb.lproj/CurrentCall.strings b/ui/nb.lproj/CurrentCall.strings
index c7b984fb6fd3ef017765045b33fb296fe31c4698..efa121ad774c3148678d9ebf2edabceb379aea9d 100644
--- a/ui/nb.lproj/CurrentCall.strings
+++ b/ui/nb.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "Boks";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "Merkelapp";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "Boks";
@@ -33,7 +33,7 @@
 "QYT-0n-4sw.ibShadowedToolTip" = "Ta opp";
 
 /* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
-"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+"Vhk-fx-6RW.ibShadowedToolTip" = "legg til kontakt for å ringe";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
 "YGj-SP-ikj.title" = "Tekstcelle";
@@ -51,13 +51,13 @@
 "fmp-x4-Pef.ibShadowedToolTip" = "Veksle sludring";
 
 /* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
-"hKi-Ay-ex5.title" = "person Id";
+"hKi-Ay-ex5.title" = "person-id";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
 "hfc-s5-yWK.title" = "Boks";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
-"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+"ngO-WV-cXD.ibShadowedToolTip" = "Send en fil";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
 "qgD-3D-nD5.ibShadowedToolTip" = "Besvar";
diff --git a/ui/nb.lproj/Localizable.strings b/ui/nb.lproj/Localizable.strings
index ac412a4828e6bfb88fdf4520074917476cf2acfe..7457cd11d9affd4a7ef6a28646b4afb3a71385f3 100644
--- a/ui/nb.lproj/Localizable.strings
+++ b/ui/nb.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Import from backup" = "Import from backup";
 
 /* link account title */
-"Import from other device" = "Import from other device";
+"Import from other device" = "Importer fra andre enheter";
 
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Innkommende samtale fra %@";
diff --git a/ui/nb.lproj/RingWizardChoose.strings b/ui/nb.lproj/RingWizardChoose.strings
index 3db178aba0962f8f3920ac2aa2f2d6b44ed7074c..7ec2595778b93b93880013d435b10e8b57cfd2df 100644
--- a/ui/nb.lproj/RingWizardChoose.strings
+++ b/ui/nb.lproj/RingWizardChoose.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
-"HGQ-Kd-WIw.title" = "Connect to account manager";
+"HGQ-Kd-WIw.title" = "Koble til kontoansvarlig";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "Avbryt";
 
 /* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Import from other device";
+"Z9K-mD-ucr.title" = "Importer fra annen enhet";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Opprett en Jami-konto";
 
 /* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
-"rtw-Db-BWL.title" = "Import from archive backup";
+"rtw-Db-BWL.title" = "Importer fra sikkerhetskopi";
 
 /* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
-"vCj-67-PGK.title" = "Advanced...";
+"vCj-67-PGK.title" = "Avansert...";
 
 /* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
 "yBt-Bv-fi2.title" = "Legg til ny SIP-konto";
diff --git a/ui/nb.lproj/RingWizardLinkAccount.strings b/ui/nb.lproj/RingWizardLinkAccount.strings
index c0c56e35fbe263ca1264d3231ad546cec5b7f85a..c3d873abeb006f960981f641196adf04e414ae5a 100644
--- a/ui/nb.lproj/RingWizardLinkAccount.strings
+++ b/ui/nb.lproj/RingWizardLinkAccount.strings
@@ -1,6 +1,6 @@
 
 /* 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" = "\tDu kan importere kontoen din fra den andre enheten, men først må du skaffe en PIN-kode. \n\tFor å generere PIN-koden, gå til kontoinnstillinger på en tidligere enhet, velg Jami-kontoen du vil bruke og velg \"Koble en annen enhet til denne kontoen\". Du vil få den nødvendige PIN-koden for å fylle ut dette skjemaet. PIN-koden er kun gyldig i 10 minutter.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Skriv inn din PIN";
@@ -30,13 +30,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Passord…";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Velg fil";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Importer arkivfil";
 
 /* 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" = "\tDu kan importere kontoen din direkte fra en arkivfil på enheten din.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
@@ -54,4 +54,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Kobler...";
diff --git a/ui/nb.lproj/VideoPrefs.strings b/ui/nb.lproj/VideoPrefs.strings
index 72e1e577e1ba954fa60c5f482818f43ea295690f..7d6135c0b06a1180aef6f89a11ec3c9dd28c28f5 100644
--- a/ui/nb.lproj/VideoPrefs.strings
+++ b/ui/nb.lproj/VideoPrefs.strings
@@ -9,4 +9,4 @@
 "5Im-df-jdd.title" = "Takt";
 
 /* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
-"e7y-eV-Gsz.title" = "Enable hardware acceleration";
+"e7y-eV-Gsz.title" = "Aktiver maskinvareakselerasjon";
diff --git a/ui/tr.lproj/AccountMenuItemView.strings b/ui/tr.lproj/AccountMenuItemView.strings
index 58834d610a5f27cbf752fe22d4224732aa446ea7..54e9039c7127dfeb6c8fc1abf7163a1f18528a3a 100644
--- a/ui/tr.lproj/AccountMenuItemView.strings
+++ b/ui/tr.lproj/AccountMenuItemView.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "Etiket";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
 "BkF-b3-tzE.ibShadowedToolTip" = "Yeni Hesap Oluştur";
@@ -9,7 +9,7 @@
 "ZIZ-jd-eLK.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "Etiket";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "Etiket";
diff --git a/ui/tr.lproj/CurrentCall.strings b/ui/tr.lproj/CurrentCall.strings
index 06064d87b3a80d961fc54daf6e034ce21941fed2..f71f598f2ec59500d94cbb6860a734277ab238a1 100644
--- a/ui/tr.lproj/CurrentCall.strings
+++ b/ui/tr.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "Etiket";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "Kutu";
@@ -33,7 +33,7 @@
 "QYT-0n-4sw.ibShadowedToolTip" = "Kaydet";
 
 /* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
-"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+"Vhk-fx-6RW.ibShadowedToolTip" = "çağrıya kişi ekle";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
 "YGj-SP-ikj.title" = "İleti Hücresi";
@@ -51,7 +51,7 @@
 "fmp-x4-Pef.ibShadowedToolTip" = "Sohbete al";
 
 /* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
-"hKi-Ay-ex5.title" = "person Id";
+"hKi-Ay-ex5.title" = "kişi kimliği";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
 "hfc-s5-yWK.title" = "Kutu";
diff --git a/ui/tr.lproj/GeneralPrefs.strings b/ui/tr.lproj/GeneralPrefs.strings
index eae9bf09d9d6a91d99fac9f46b2e692b7076bccf..0f69098951f838639167f24a8f5a9cc0bcaf4c9c 100644
--- a/ui/tr.lproj/GeneralPrefs.strings
+++ b/ui/tr.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
-"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+"0jV-Q4-232.title" = "Gelen iletiler için bildirimleri etkinleştir";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Aylık";
@@ -21,7 +21,7 @@
 "AId-am-73Q.title" = "Haftalık";
 
 /* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
-"AOr-Cq-w57.title" = "Quality(Kbps)";
+"AOr-Cq-w57.title" = "Kalite(Kbps)";
 
 /* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
 "I0d-mx-KhT.title" = "Bildirimler";
@@ -30,13 +30,13 @@
 "JGj-TS-Hxl.title" = "6000";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
-"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+"Lww-Wb-yrf.title" = "Davetler için bildirimleri etkinleştir";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
 "O2C-xR-mHF.title" = "Başlangıçta Çalıştır";
 
 /* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
-"Qb8-tb-vJd.title" = "Call recording";
+"Qb8-tb-vJd.title" = "Arama kaydı";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Güncellemeleri kendiliğinden denetle";
diff --git a/ui/tr.lproj/Localizable.strings b/ui/tr.lproj/Localizable.strings
index 6f31998e5853141dcade43e579ef5e7341625fae..2a535225a24053f9f0515b35eb879edb3de62e95 100644
--- a/ui/tr.lproj/Localizable.strings
+++ b/ui/tr.lproj/Localizable.strings
@@ -29,7 +29,7 @@
 "Block contact" = "Kişiyi engelle";
 
 /* 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.";
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "\"Tamam\" ı tıklayarak bu hesabı bu cihazdan kaldıracaksınız! Bu işlem geri alınamaz. Ayrıca, kayıtlı adınız kaybolabilir.";
 
 /* File transfer canceled label */
 "Canceled" = "İptal edildi";
@@ -38,7 +38,7 @@
 "Choose file" = "Dosya seç";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "Konuşmayı temizle";
 
 /* No comment provided by engineer. */
 "Copy" = "Kopyala";
@@ -83,10 +83,10 @@
 "Invalid username." = "Geçersiz kullanıcı adı.";
 
 /* Allert message when no accounts are available */
-"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+"Navigate to preferences to create a new account" = "Yeni bir hesap oluşturmak için tercihlere gidin";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "Hesap yok";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "Parola ve doğrulama uyuşmuyor";
@@ -125,7 +125,7 @@
 "Send" = "Gönder";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "İletişim isteği gönderin";
 
 /* No comment provided by engineer. */
 "Share" = "Paylaş";
@@ -164,10 +164,10 @@
 "This is your Jami username. \nCopy and share it with your friends!" = "Bu sizin Jami kullanıcı adınız.\nKopyalayın ve arkadaşlarınızla paylaşın!";
 
 /* 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.";
+"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." = "İşlemleri tamamlamak için yeni cihazda Jami'yi açmanız ve \"Bu cihazı bir hesaba bağla\" seçeneğini belirtmeniz gerekir. PIN kodunuz 10 dakika geçerlidir.";
 
 /* Text shown to the user */
-"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.";
+"To proceed with the migration, you need to enter a password that was used for this account." = "Taşıma işlemine devam etmek için bu hesap için kullanılan bir şifre girmeniz gerekiyor.";
 
 /* File transfer peer unjoinable label */
 "Unjoinable" = "Katılımı olanaksız";
diff --git a/ui/tr.lproj/MigrateRingAccountsWindow.strings b/ui/tr.lproj/MigrateRingAccountsWindow.strings
index 8a128a930e3d98379d61bd256b049c3e4dc61d63..fed34d2d9d7e3ab6a12ad78532a2bdd911243bee 100644
--- a/ui/tr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/tr.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "Ring Kimliği";
 
 /* 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.";
+"859-10-HEb.title" = "Taşıma işlemine devam etmek için bu hesap için kullanılan bir şifre girmeniz gerekiyor.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Hesap taşıma hatası";
diff --git a/ui/tr.lproj/RegisterNameWindow.strings b/ui/tr.lproj/RegisterNameWindow.strings
index b097fd8c0c332d47cd13582a5e80cfddf6be0169..39520fdef79f6fc79613405f86375b54b26f8f38 100644
--- a/ui/tr.lproj/RegisterNameWindow.strings
+++ b/ui/tr.lproj/RegisterNameWindow.strings
@@ -48,4 +48,4 @@
 "nFA-uz-WjI.placeholderString" = "Parola girin...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username ";
+"tje-EZ-ZPI.title" = "Kamuya açık bir kullanıcı adı kaydedin";
diff --git a/ui/tr.lproj/RingWindow.strings b/ui/tr.lproj/RingWindow.strings
index 74f73de9e28908e82673a25e86548a99db01c554..a0b13ca4c03a12a2a46998764a1b9457e5476e19 100644
--- a/ui/tr.lproj/RingWindow.strings
+++ b/ui/tr.lproj/RingWindow.strings
@@ -18,19 +18,19 @@
 "F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
-"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+"Fc5-KS-cim.ibShadowedToolTip" = "Daveti Kabul Et";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
-"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+"Oac-o7-2Ge.ibShadowedToolTip" = "Hesap bilgisini paylaş";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
 "Oe5-Nj-cP3.title" = "Öğe 3";
 
 /* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.label" = "Toolbar Item";
+"XSp-w5-Fes.label" = "Araç Çubuğu Öğesi";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+"XSp-w5-Fes.paletteLabel" = "Araç Çubuğu Öğesi";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
 "Xb9-UT-M2F.title" = "Kopyalayın ve arkadaşlarınızla paylaşın!";
@@ -39,10 +39,10 @@
 "eVv-lu-T1Y.title" = "Kutu";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
-"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+"eXV-BT-B6J.ibShadowedToolTip" = "QR kodu Göster";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
-"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+"ejM-H2-aJX.ibShadowedToolTip" = "Daveti görmezden gel";
 
 /* 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, kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.";
diff --git a/ui/tr.lproj/RingWizardChoose.strings b/ui/tr.lproj/RingWizardChoose.strings
index 263b94df3984d281826f46c0efb936612e5f315c..17b590b82e845a7b797a99b70b399c7bb6491880 100644
--- a/ui/tr.lproj/RingWizardChoose.strings
+++ b/ui/tr.lproj/RingWizardChoose.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
-"HGQ-Kd-WIw.title" = "Connect to account manager";
+"HGQ-Kd-WIw.title" = "Hesap yöneticisine bağlan";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "İptal";
@@ -12,10 +12,10 @@
 "k1T-a7-yZD.title" = "Bir Jami hesabı oluştur";
 
 /* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
-"rtw-Db-BWL.title" = "Import from archive backup";
+"rtw-Db-BWL.title" = "Arşiv yedeklemesinden içe aktar";
 
 /* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
-"vCj-67-PGK.title" = "Advanced...";
+"vCj-67-PGK.title" = "Gelişmiş...";
 
 /* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
 "yBt-Bv-fi2.title" = "Yeni bir SIP hesabı ekle";
diff --git a/ui/tr.lproj/RingWizardLinkAccount.strings b/ui/tr.lproj/RingWizardLinkAccount.strings
index 318bf14dea7f3d82814d126290431bc9028dcbe5..3ba8f8d778484fc0e932248d865e192ac9eefdf5 100644
--- a/ui/tr.lproj/RingWizardLinkAccount.strings
+++ b/ui/tr.lproj/RingWizardLinkAccount.strings
@@ -36,7 +36,7 @@
 "kXa-FL-Enf.title" = "Arşiv dosyasını içe aktar";
 
 /* 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" = "Hesabınızı aygıtınızdaki bir arşiv dosyasından doğrudan içe aktarabilirsiniz.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "TAMAM";
diff --git a/ui/tr.lproj/VideoPrefs.strings b/ui/tr.lproj/VideoPrefs.strings
index e4ac3b6d730a92f1b11589e8a3e4768462d51495..7a3a79cb573b2339a36233bdae96032d465ece37 100644
--- a/ui/tr.lproj/VideoPrefs.strings
+++ b/ui/tr.lproj/VideoPrefs.strings
@@ -9,4 +9,4 @@
 "5Im-df-jdd.title" = "Oran";
 
 /* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
-"e7y-eV-Gsz.title" = "Enable hardware acceleration";
+"e7y-eV-Gsz.title" = "Donanım hızlandırmayı etkinleştir";
diff --git a/ui/zh_CN.lproj/AccAdvancedSip.strings b/ui/zh_CN.lproj/AccAdvancedSip.strings
index 1eb6c3d4b7e6437bb66f51af045f81fb3a80e5f7..129a550bac7df75e76b0ebb257dd91396c2a6388 100644
--- a/ui/zh_CN.lproj/AccAdvancedSip.strings
+++ b/ui/zh_CN.lproj/AccAdvancedSip.strings
@@ -30,7 +30,7 @@
 "8JD-11-wHZ.title" = "TLS发送服务器地址";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
-"8bw-iH-XGl.title" = "Item 1";
+"8bw-iH-XGl.title" = "项目1";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
 "9p9-GR-XKU.title" = "端口";
@@ -60,13 +60,13 @@
 "MBR-AC-HFq.title" = "盒子";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
-"Mho-w1-ZPJ.title" = "Item 3";
+"Mho-w1-ZPJ.title" = "项目 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
 "Nqr-gj-dOH.title" = "自定义铃声";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
-"OEo-C7-vEh.title" = "Item 2";
+"OEo-C7-vEh.title" = "项目 2";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
 "Ogj-NW-fZ9.title" = "音频RTP端口范围";
@@ -75,7 +75,7 @@
 "Ppa-zn-w1X.title" = "盒子";
 
 /* Class = "NSButtonCell"; title = "Enable SDES for key exchange protocol"; ObjectID = "Qk8-tH-a0l"; */
-"Qk8-tH-a0l.title" = "Enable SDES for key exchange protocol";
+"Qk8-tH-a0l.title" = "对密钥交换协议启用SDES";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RIj-rT-gSd"; */
 "RIj-rT-gSd.title" = "Text Cell";
@@ -105,7 +105,7 @@
 "b2y-85-ZHK.title" = "颁发机构证书";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "仅当SDP协商期间在不支持ICE的情况下使用";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "盒子";
diff --git a/ui/zh_CN.lproj/AccountBackupVC.strings b/ui/zh_CN.lproj/AccountBackupVC.strings
index 2407c872ddd1e9ea5086cadcd9c59311347e8d39..a57d0b6fae0c323405d0d8cb8d1bfccbea8f7c4a 100644
--- a/ui/zh_CN.lproj/AccountBackupVC.strings
+++ b/ui/zh_CN.lproj/AccountBackupVC.strings
@@ -3,13 +3,13 @@
 "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.";
+"7lU-Qy-WOb.title" = "备份期间发生错误。 请检查您的凭据。";
 
 /* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
 "PVF-bb-Yoi.title" = "不再向我显示这个";
 
 /* 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.";
+"SUG-lC-TDL.title" = "本账户仅存在于此设备上。如果您丢失了该设备或卸载了本应用,那么您的账户也会被删除。您可现在或稍后备份您的账户。";
 
 /* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
 "cod-s7-SPd.title" = "导出帐户";
diff --git a/ui/zh_CN.lproj/AccountMenuItemView.strings b/ui/zh_CN.lproj/AccountMenuItemView.strings
index 4ea99029a89e47d3e64d213b404eec6ff1cde7da..feea342f687482a8906ac6486bc224a2d32cbd39 100644
--- a/ui/zh_CN.lproj/AccountMenuItemView.strings
+++ b/ui/zh_CN.lproj/AccountMenuItemView.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
-"7sc-IE-yuO.title" = "Label";
+"7sc-IE-yuO.title" = "标签";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
 "BkF-b3-tzE.ibShadowedToolTip" = "创建新帐户";
@@ -9,7 +9,7 @@
 "ZIZ-jd-eLK.title" = "盒子";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
-"gOS-aC-TGo.title" = "Label";
+"gOS-aC-TGo.title" = "标签";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
-"uPR-fc-nOP.title" = "Label";
+"uPR-fc-nOP.title" = "标签";
diff --git a/ui/zh_CN.lproj/Conversation.strings b/ui/zh_CN.lproj/Conversation.strings
index e8f6647b260a80039cbf5001711d22d4a117d19f..d069de245ca8b158a515b42354e6de99c9f21eff 100644
--- a/ui/zh_CN.lproj/Conversation.strings
+++ b/ui/zh_CN.lproj/Conversation.strings
@@ -3,7 +3,7 @@
 "8sX-aI-9OG.title" = "🙂";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
-"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
+"B6d-Sc-UTp.ibShadowedToolTip" = "录制视频信息";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
 "FgV-iF-gGQ.title" = "Text Cell";
@@ -27,7 +27,7 @@
 "fh9-Uo-8R1.title" = "盒子";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
-"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+"gwx-eT-PcN.ibShadowedToolTip" = "发送文件";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
 "hrX-ac-Quk.title" = "盒子";
@@ -36,13 +36,13 @@
 "ooq-vs-Xt1.ibShadowedToolTip" = "上一步";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
-"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+"pGK-hO-X1Y.ibShadowedToolTip" = "添加联系人";
 
 /* 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";
+"wYE-S3-AzD.ibShadowedToolTip" = "录制语音信息";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
 "zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "发送消息";
diff --git a/ui/zh_CN.lproj/CurrentCall.strings b/ui/zh_CN.lproj/CurrentCall.strings
index 28f4f1b797248b648e35b0c1b2652e67ba2d01d8..fe3ba3472d9a751fb09df6599eeab7015c70427b 100644
--- a/ui/zh_CN.lproj/CurrentCall.strings
+++ b/ui/zh_CN.lproj/CurrentCall.strings
@@ -9,7 +9,7 @@
 "DSf-SJ-l6k.title" = "盒子";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
-"GBy-HF-JeP.title" = "Label";
+"GBy-HF-JeP.title" = "标签";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
 "KCp-bZ-69S.title" = "盒子";
@@ -33,7 +33,7 @@
 "QYT-0n-4sw.ibShadowedToolTip" = "录制";
 
 /* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
-"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+"Vhk-fx-6RW.ibShadowedToolTip" = "将联系人加到通话中";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
 "YGj-SP-ikj.title" = "Text Cell";
@@ -51,13 +51,13 @@
 "fmp-x4-Pef.ibShadowedToolTip" = "切换聊天栏";
 
 /* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
-"hKi-Ay-ex5.title" = "person Id";
+"hKi-Ay-ex5.title" = "个人 ID";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
 "hfc-s5-yWK.title" = "盒子";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
-"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+"ngO-WV-cXD.ibShadowedToolTip" = "发送文件";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
 "qgD-3D-nD5.ibShadowedToolTip" = "接听";
diff --git a/ui/zh_CN.lproj/GeneralPrefs.strings b/ui/zh_CN.lproj/GeneralPrefs.strings
index 8e897fc4584dbf1e94fc98ab01e04666ac13d0a5..c87f29e0a5f8411d221ea264b906d05851dc2a6f 100644
--- a/ui/zh_CN.lproj/GeneralPrefs.strings
+++ b/ui/zh_CN.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
-"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+"0jV-Q4-232.title" = "启用传入消息的通知";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "每月";
@@ -21,7 +21,7 @@
 "AId-am-73Q.title" = "每周";
 
 /* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
-"AOr-Cq-w57.title" = "Quality(Kbps)";
+"AOr-Cq-w57.title" = "质量(Kbps)";
 
 /* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
 "I0d-mx-KhT.title" = "通知";
@@ -30,13 +30,13 @@
 "JGj-TS-Hxl.title" = "6000";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
-"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+"Lww-Wb-yrf.title" = "启用邀请通知";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
 "O2C-xR-mHF.title" = "启动时运行";
 
 /* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
-"Qb8-tb-vJd.title" = "Call recording";
+"Qb8-tb-vJd.title" = "通话录音";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "自动检查更新";
@@ -60,7 +60,7 @@
 "uCL-ye-tsv.title" = "启用来电通知";
 
 /* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "来电时将Jami切换到前台";
+"uYI-hA-JHk.title" = "来电时将 Jami 切换到前台";
 
 /* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
 "y5x-4d-E26.title" = "录制本地视频";
diff --git a/ui/zh_CN.lproj/LeaveMessageVC.strings b/ui/zh_CN.lproj/LeaveMessageVC.strings
index 822fecf6c33cc9734aaac4fbe31f8611aa050db0..2971311dd4506afb093145fb8699fe33bb71c396 100644
--- a/ui/zh_CN.lproj/LeaveMessageVC.strings
+++ b/ui/zh_CN.lproj/LeaveMessageVC.strings
@@ -6,22 +6,22 @@
 "Bjm-hd-lQU.title" = "发消息";
 
 /* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
-"M07-cf-bjZ.title" = "Go back to conversations";
+"M07-cf-bjZ.title" = "返回到会话";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
 "TwL-yO-BXI.title" = "盒子";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
-"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
+"dEq-nq-Ae8.ibShadowedToolTip" = "录制信息";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "录音";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
-"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+"oFb-RQ-trc.ibShadowedToolTip" = "录制信息";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
-"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+"tf8-hV-8xd.ibShadowedToolTip" = "前往会话";
 
 /* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
-"zTC-Gf-lAV.title" = "Record a message";
+"zTC-Gf-lAV.title" = "录制信息";
diff --git a/ui/zh_CN.lproj/Localizable.strings b/ui/zh_CN.lproj/Localizable.strings
index 1ff3197ac98734abf8347bddc245c6111345dd26..531634a04677456151a4fc0f1c4565ec99639f53 100644
--- a/ui/zh_CN.lproj/Localizable.strings
+++ b/ui/zh_CN.lproj/Localizable.strings
@@ -5,7 +5,7 @@
 "Accept" = "接听";
 
 /* Welcome title */
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "添加 SIP 账户";
 
 /* Contextual menu action */
 "Add to contacts" = "加入通讯录";
@@ -17,22 +17,22 @@
 "An error occured during the export" = "导出时发生错误";
 
 /* Peer busy message */
-"appears to be busy." = "appears to be busy.";
+"appears to be busy." = "好像繁忙中。";
 
 /* Error audio permission */
-"Audio permission not granted" = "Audio permission not granted";
+"Audio permission not granted" = "未取得音频权限";
 
 /* Backup account */
-"Backup your account" = "Backup your account";
+"Backup your account" = "备份您的账户";
 
 /* Contextual menu action */
 "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.";
+"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";
+"Canceled" = "已取消";
 
 /* Contextual menu entry */
 "Choose file" = "选择文件";
@@ -44,13 +44,13 @@
 "Copy" = "复制";
 
 /* Recording view explanation label */
-"Could not record message during call" = "Could not record message during call";
+"Could not record message during call" = "通话中无法录制信息";
 
 /* Welcome title */
 "Create a new account" = "新建帐户";
 
 /* Backup enter password */
-"Enter account password" = "Enter account password";
+"Enter account password" = "输入账户密码";
 
 /* File transfer failed label */
 "Failed" = "失败";
@@ -68,25 +68,25 @@
 "Import from backup" = "从备份文件导入";
 
 /* link account title */
-"Import from other device" = "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 %@";
+"Incoming message from %@" = "来自 %@ 的新信息";
 
 /* Text shown to user when his username is invalid to be registered */
 "Invalid username" = "非法用户名";
 
 /* Text shown to user when his username is invalid to be registered */
-"Invalid username." = "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";
+"Navigate to preferences to create a new account" = "前往偏好设置以创建新账户";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "没有可用账户";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "密码与确认密码不匹配。";
@@ -104,37 +104,37 @@
 "Place video call" = "发起视频通话";
 
 /* Recording view explanation label */
-"Press to start recording" = "Press to start recording";
+"Press to start recording" = "按下开始录音";
 
 /* Record message title */
-"Record a message" = "Record a message";
+"Record a message" = "录制信息";
 
 /* Button Action */
 "Refuse" = "拒接";
 
 /* Text shown to the user */
-"Registered name: " = "Registered name: ";
+"Registered name: " = "已注册名称:";
 
 /* Remove account alert title */
 "Remove account" = "移除账户";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "选择归档";
 
 /* Send button title */
 "Send" = "发送";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "向您发送了添加联系人请求";
 
 /* No comment provided by engineer. */
 "Share" = "共享";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "共享屏幕";
 
 /* Sign In */
-"Sign In" = "Sign In";
+"Sign In" = "注册";
 
 /* Record message title */
 "Stop recording" = "停止录制";
@@ -155,29 +155,29 @@
 "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";
+"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!";
+"This is your ID. \nCopy and share it with your friends!" = "这是您的ID。\n复制并分享给您的朋友吧!";
 
 /* 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!";
+"This is your Jami username. \nCopy and share it with your friends!" = "这是您的Jami用户名。\n复制并分享给您的朋友吧!";
 
 /* 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.";
+"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." = "要完成该操作,您需在新设备上打开 Jami,在选项中选择“关联此设备到账户”进行设置。您的 PIN 码有效期为 10 分钟。";
 
 /* Text shown to the user */
-"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.";
+"To proceed with the migration, you need to enter a password that was used for this account." = "若要进行迁移,您需要输入此账户的密码。";
 
 /* File transfer peer unjoinable label */
-"Unjoinable" = "Unjoinable";
+"Unjoinable" = "无法加入";
 
 /* Error video permission */
-"Video permission not granted" = "Video permission not granted";
+"Video permission not granted" = "未取得视频权限";
 
 /* Welcome title */
 "Welcome to Jami" = "欢迎来到Jami";
 
 /* Peer busy message */
-"Would you like to leave a message?" = "Would you like to leave a message?";
+"Would you like to leave a message?" = "您想要留言吗?";
 
diff --git a/ui/zh_CN.lproj/MainMenu.strings b/ui/zh_CN.lproj/MainMenu.strings
index 989adeb88a8ebed3887a13efecf15e5d4acc2e20..4ee6e804b551aacbb83b4785c25333ffc7422d4d 100644
--- a/ui/zh_CN.lproj/MainMenu.strings
+++ b/ui/zh_CN.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "关于Jami";
+"58.title" = "关于 Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "偏好设置…";
@@ -33,10 +33,10 @@
 "131.title" = "服务";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "隐藏Jami";
+"134.title" = "隐藏 Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "退出Jami";
+"136.title" = "退出 Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "隱藏其他";
diff --git a/ui/zh_CN.lproj/MessageCells.strings b/ui/zh_CN.lproj/MessageCells.strings
index df22dc6eb803c0defb79f442bbac26e408ad4b65..8b46436c19f03d76c8269bb729fe95aab7702ad5 100644
--- a/ui/zh_CN.lproj/MessageCells.strings
+++ b/ui/zh_CN.lproj/MessageCells.strings
@@ -3,16 +3,16 @@
 "1c6-BK-hfV.title" = "取消";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "3i8-bi-EQN"; */
-"3i8-bi-EQN.title" = "Round Rect";
+"3i8-bi-EQN.title" = "圆角矩形";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "8CE-a4-Ayu"; */
-"8CE-a4-Ayu.title" = "Round Rect";
+"8CE-a4-Ayu.title" = "圆角矩形";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "9Oq-TB-quZ"; */
 "9Oq-TB-quZ.title" = "取消";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "DmW-13-1QZ"; */
-"DmW-13-1QZ.title" = "Round Rect";
+"DmW-13-1QZ.title" = "圆角矩形";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "EAm-7Z-ubs"; */
 "EAm-7Z-ubs.title" = "盒子";
@@ -21,7 +21,7 @@
 "Ko5-2g-foK.title" = "盒子";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "Oo1-gq-aPY"; */
-"Oo1-gq-aPY.title" = "Round Rect";
+"Oo1-gq-aPY.title" = "圆角矩形";
 
 /* Class = "NSButtonCell"; title = "Refuse"; ObjectID = "QGs-MO-mVi"; */
 "QGs-MO-mVi.title" = "拒接";
@@ -33,7 +33,7 @@
 "e0e-TK-qch.title" = "盒子";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "fu2-X7-GW8"; */
-"fu2-X7-GW8.title" = "Round Rect";
+"fu2-X7-GW8.title" = "圆角矩形";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "tBq-Qe-bEm"; */
 "tBq-Qe-bEm.title" = "接听";
diff --git a/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings b/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
index fbb1cd52325527f5c453c8dcb7d1c26fb9a4e670..56c6497412452dffd5b5465420b8d36a046274cf 100644
--- a/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "RingID";
 
 /* 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.";
+"859-10-HEb.title" = "若要进行迁移,您需要输入此账户的密码。";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "帐户迁移发生错误";
diff --git a/ui/zh_CN.lproj/PasswordChange.strings b/ui/zh_CN.lproj/PasswordChange.strings
index 12454092344d7aa04a2da898c6df7dddae184ed5..0641f16fcafcbb6abd5005db82cfe3b0eb2aaa06 100644
--- a/ui/zh_CN.lproj/PasswordChange.strings
+++ b/ui/zh_CN.lproj/PasswordChange.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
-"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+"1Bs-Te-34p.placeholderString" = "再次输入新密码";
 
 /* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
 "4Uf-yO-9X8.title" = "更改用户名";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
-"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+"4aD-Xd-zHS.placeholderString" = "输入新密码";
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
 "8KO-IO-ykP.title" = "重复";
@@ -15,7 +15,7 @@
 "Ggu-EQ-cqC.title" = "接听";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
-"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+"Kwp-mD-Y94.placeholderString" = "输入您的旧密码";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
 "MZw-ep-8aW.title" = "取消";
diff --git a/ui/zh_CN.lproj/PreferencesWindow.strings b/ui/zh_CN.lproj/PreferencesWindow.strings
index dbc036a22e3a615d7c104601776477155fba2649..8dc789abd76c600c51adda91705953f6f66478e4 100644
--- a/ui/zh_CN.lproj/PreferencesWindow.strings
+++ b/ui/zh_CN.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Jami偏好设置";
+"C1T-wE-wxb.title" = "Jami 偏好设置";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "通用";
diff --git a/ui/zh_CN.lproj/RegisterNameWindow.strings b/ui/zh_CN.lproj/RegisterNameWindow.strings
index 26a4ed8652eb8667ae52cbd628f637f1cc3ef65a..d4e33707f876d52e590d4b4291cd9f1968034717 100644
--- a/ui/zh_CN.lproj/RegisterNameWindow.strings
+++ b/ui/zh_CN.lproj/RegisterNameWindow.strings
@@ -9,22 +9,22 @@
 "JWw-7m-ywL.title" = "窗口";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "输入密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "输入密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "输入密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "输入密码...";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "请稍等…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+"bdC-Uc-Qhs.placeholderString" = "输入用户名...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "取消";
@@ -45,7 +45,7 @@
 "lo5-ei-wHM.title" = "用户名";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
-"nFA-uz-WjI.placeholderString" = "Enter password...";
+"nFA-uz-WjI.placeholderString" = "输入密码...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username ";
+"tje-EZ-ZPI.title" = "注册公开用户名";
diff --git a/ui/zh_CN.lproj/RingWindow.strings b/ui/zh_CN.lproj/RingWindow.strings
index 2f07a69448e09d7f43cc4d55ad0f2f95020c7f5a..96e6d4879dfa78ece5d6907b8abb905ad0e1a068 100644
--- a/ui/zh_CN.lproj/RingWindow.strings
+++ b/ui/zh_CN.lproj/RingWindow.strings
@@ -12,40 +12,40 @@
 "Ap7-26-S6b.title" = "Text Cell";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
-"DPK-hh-Aq5.title" = "Item 2";
+"DPK-hh-Aq5.title" = "项目 2";
 
 /* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
 "F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
-"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+"Fc5-KS-cim.ibShadowedToolTip" = "接受邀请";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
-"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+"Oac-o7-2Ge.ibShadowedToolTip" = "分享账户信息";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
-"Oe5-Nj-cP3.title" = "Item 3";
+"Oe5-Nj-cP3.title" = "项目 3";
 
 /* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.label" = "Toolbar Item";
+"XSp-w5-Fes.label" = "工具栏项目";
 
 /* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
-"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+"XSp-w5-Fes.paletteLabel" = "工具栏项目";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "这是您的ID。\n复制并发送给您的朋友!";
+"Xb9-UT-M2F.title" = "这是您的 ID。\n复制并分享给您的朋友吧!";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
 "eVv-lu-T1Y.title" = "盒子";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
-"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+"eXV-BT-B6J.ibShadowedToolTip" = "显示二维码";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
-"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+"ejM-H2-aJX.ibShadowedToolTip" = "忽略邀请";
 
 /* 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是一种自由通信软件,它尊重用户的自由和隐私。";
+"eln-Vm-t0d.title" = "Jami 是一个自由、通用的通信软件,它尊重用户的自由和隐私。";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
 "j0J-Xd-uth.placeholderString" = "呼叫者名称";
diff --git a/ui/zh_CN.lproj/RingWizard.strings b/ui/zh_CN.lproj/RingWizard.strings
index e51bce8afc1299039110772ac8f8cd97dabd2e1f..730844933fd06f7d1ddd8da2d953e2580342ea0d 100644
--- a/ui/zh_CN.lproj/RingWizard.strings
+++ b/ui/zh_CN.lproj/RingWizard.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "欢迎来到Jami";
+"2mM-yx-BfM.title" = "欢迎来到 Jami";
 
 /* Class = "NSWindow"; title = "Ring"; ObjectID = "4LP-GX-BkH"; */
 "4LP-GX-BkH.title" = "Ring";
diff --git a/ui/zh_CN.lproj/RingWizardChoose.strings b/ui/zh_CN.lproj/RingWizardChoose.strings
index da6225fbadc90d66588ba7fb8b9fd54310c3a91a..19dad485dbe989e9a6be2ea48db3db1f6e4579a9 100644
--- a/ui/zh_CN.lproj/RingWizardChoose.strings
+++ b/ui/zh_CN.lproj/RingWizardChoose.strings
@@ -6,16 +6,16 @@
 "YJ3-7G-cU1.title" = "取消";
 
 /* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Import from other device";
+"Z9K-mD-ucr.title" = "从其他设备导入";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "创建一个Jami账户";
 
 /* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
-"rtw-Db-BWL.title" = "Import from archive backup";
+"rtw-Db-BWL.title" = "从归档备份中导入";
 
 /* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
-"vCj-67-PGK.title" = "Advanced...";
+"vCj-67-PGK.title" = "高级…";
 
 /* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
 "yBt-Bv-fi2.title" = "添加SIP帐户";
diff --git a/ui/zh_CN.lproj/RingWizardLinkAccount.strings b/ui/zh_CN.lproj/RingWizardLinkAccount.strings
index 720366552b6650a0ebf6525179d51b4afddd0849..33797267048e9a62a52828d45f2f21ce0790199b 100644
--- a/ui/zh_CN.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh_CN.lproj/RingWizardLinkAccount.strings
@@ -1,6 +1,6 @@
 
 /* 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您可从另一个设备导入您的账户,但首先您需要获取 PIN 码。\n\t要生成 PIN 码:需前往先前设备的账户管理设置中选择您要使用的 Jami 账户,然后选择“关联另一个设备到此账户”。您会得到填写本栏所需的 PIN 码。PIN 码有效期为 10 分钟。";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "输入您的PIN";
@@ -33,10 +33,10 @@
 "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" = "确定";
@@ -54,4 +54,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "关联中...";
diff --git a/ui/zh_CN.lproj/RingWizardNewAccount.strings b/ui/zh_CN.lproj/RingWizardNewAccount.strings
index 09c1f59837409f452b8c1b96eaeda19682b70371..11d3ffa1cdc5952cde96fd0a37b8d2a41bda6ad3 100644
--- a/ui/zh_CN.lproj/RingWizardNewAccount.strings
+++ b/ui/zh_CN.lproj/RingWizardNewAccount.strings
@@ -1,21 +1,21 @@
 
 /* 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.";
+"0qE-Sz-hdc.title" = "通过选中此选项,您将在 Jami 网络上注册唯一的用户名。 人们可以使用它来替代 40 个字符长的 ID 与您联系。";
 
 /* 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...";
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "重复密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "重复密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "重复密码...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "再输入密码...";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
 "AG5-GR-bii.title" = "注册公共用户名";
@@ -24,7 +24,7 @@
 "BCg-5V-Ek4.placeholderString" = "确认密码";
 
 /* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
-"Cnw-4p-3Uc.title" = "Choose password for enhance security";
+"Cnw-4p-3Uc.title" = "创建密码来增强安全性";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
 "JCg-IP-8cg.ibShadowedIsNilPlaceholder" = "密码…";
@@ -69,7 +69,7 @@
 "v7f-52-GJA.title" = "取消";
 
 /* 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.";
+"zUH-kc-cik.title" = "该密码用于加密您的帐户数据,以及将其他设备关联到您的帐户下。此步骤虽不是必须的,但还是建议您设置密码。";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
 "zfA-n9-V4X.title" = "创建";
diff --git a/ui/zh_CN.lproj/VideoPrefs.strings b/ui/zh_CN.lproj/VideoPrefs.strings
index f1986caac1ad5d5979f157d158e91bccbdd721f1..f7cf91715cc52227ac8603b402ed1dbf3b71dc28 100644
--- a/ui/zh_CN.lproj/VideoPrefs.strings
+++ b/ui/zh_CN.lproj/VideoPrefs.strings
@@ -9,4 +9,4 @@
 "5Im-df-jdd.title" = "码率";
 
 /* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
-"e7y-eV-Gsz.title" = "Enable hardware acceleration";
+"e7y-eV-Gsz.title" = "启用硬件加速";