diff --git a/MacBox/zh-Hans/ChangeMasterPasswordWindowController.strings b/MacBox/zh-Hans/ChangeMasterPasswordWindowController.strings
index 4694a990a..69aeb69a6 100644
--- a/MacBox/zh-Hans/ChangeMasterPasswordWindowController.strings
+++ b/MacBox/zh-Hans/ChangeMasterPasswordWindowController.strings
@@ -1,110 +1,98 @@
-/* Class = "NSButtonCell"; title = "Use a Key File"; ObjectID = "1N3-je-XFQ"; */
-"1N3-je-XFQ.title" = "使用密钥文件";
+/* Class = "NSButtonCell"; title = "Accept Empty Password"; ObjectID = "219-Oz-xqg"; */
+"219-Oz-xqg.title" = "Accept Empty Password";
 
-/* Class = "NSTextFieldCell"; title = "Select Database Format"; ObjectID = "23g-9x-y77"; */
-"23g-9x-y77.title" = "选择数据库格式";
+/* Class = "NSButtonCell"; title = "Use a Password"; ObjectID = "3PL-wb-zAr"; */
+"3PL-wb-zAr.title" = "Use a Password";
 
-/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "25x-MA-nxi"; */
-"25x-MA-nxi.title" = "Label";
+/* Class = "NSButtonCell"; title = "Show Advanced"; ObjectID = "3V2-or-hwf"; */
+"3V2-or-hwf.title" = "Show Advanced";
 
-/* Class = "NSButtonCell"; title = "Use a Hardware Key"; ObjectID = "3cJ-qw-yF0"; */
-"3cJ-qw-yF0.title" = "使用硬件密钥";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3qt-cl-pNf"; */
+"3qt-cl-pNf.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Version 3.x (.psafe3)\nEncryption: TwoFish & SHA256 Key Derivation\n"; ObjectID = "44Y-Pt-RkM"; */
-"44Y-Pt-RkM.title" = "版本 3.x (.psafe3)\n加密: TwoFish 和 SHA256 密钥派生\n";
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "4S7-5l-b87"; */
+"4S7-5l-b87.title" = "Item 1";
 
-/* Class = "NSSecureTextFieldCell"; placeholderString = "New Password"; ObjectID = "5fv-tS-UX2"; */
-"5fv-tS-UX2.placeholderString" = "新密码";
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "4aR-gj-BdF"; */
+"4aR-gj-BdF.title" = "OK";
 
-/* Class = "NSTextFieldCell"; title = "KDBX 4.0, ChaCha20, AES-256 & Argon2D\nSupports Attachments, Custom Fields, GPU Brute Force Resistance\n"; ObjectID = "6lA-bh-JtU"; */
-"6lA-bh-JtU.title" = "KDBX 4.0, ChaCha20, AES-256 & Argon2D\n支持附件，自定义字段，抗 GPU 暴力破解\n";
+/* Class = "NSSecureTextFieldCell"; placeholderString = "New Password"; ObjectID = "5KX-tb-2Xy"; */
+"5KX-tb-2Xy.placeholderString" = "New Password";
 
-/* Class = "NSTextFieldCell"; title = "<No Need to Localize>"; ObjectID = "9Bt-v0-i50"; */
-"9Bt-v0-i50.title" = "<No Need to Localize>";
+/* Class = "NSTextFieldCell"; title = "Confirm"; ObjectID = "6NL-B0-zVg"; */
+"6NL-B0-zVg.title" = "Confirm";
 
-/* Class = "NSButtonCell"; title = "Accept Empty Password"; ObjectID = "A4l-or-NUB"; */
-"A4l-or-NUB.title" = "允许空白密码";
+/* Class = "NSTextFieldCell"; title = "Please enter master credentials for your database."; ObjectID = "AZe-kd-5H4"; */
+"AZe-kd-5H4.title" = "Please enter master credentials for your database.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Key File Path"; ObjectID = "DWI-ag-76n"; */
+"DWI-ag-76n.placeholderString" = "Key File Path";
+
+/* Class = "NSTextFieldCell"; title = "/Users/mark/my-secret-keyfile"; ObjectID = "DWI-ag-76n"; */
+"DWI-ag-76n.title" = "/Users/mark/my-secret-keyfile";
 
 /* Class = "NSWindow"; title = "Enter Master Credentials"; ObjectID = "F0z-JX-Cv5"; */
 "F0z-JX-Cv5.title" = "输入主凭据";
 
-/* Class = "NSTextFieldCell"; title = "Please enter master credentials for your database."; ObjectID = "I24-dk-Vwi"; */
-"I24-dk-Vwi.title" = "请为您的数据库输入主凭据。";
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm New Password"; ObjectID = "Icq-Qk-0PB"; */
+"Icq-Qk-0PB.placeholderString" = "Confirm New Password";
 
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "J8s-Hn-xGG"; */
-"J8s-Hn-xGG.title" = "取消";
+/* Class = "NSTextFieldCell"; title = "Database Nickname"; ObjectID = "KLM-bC-fVF"; */
+"KLM-bC-fVF.title" = "Database Nickname";
 
-/* Class = "NSTextFieldCell"; title = "New Password"; ObjectID = "LPU-Y6-gbD"; */
-"LPU-Y6-gbD.title" = "新密码";
+/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX 3.1) - Legacy"; ObjectID = "MbI-iZ-2I4"; */
+"MbI-iZ-2I4.title" = "KeePass 2 (KDBX 3.1) - Legacy";
 
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Nig-0H-yzg"; */
-"Nig-0H-yzg.title" = "取消";
+/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX 4.x, Recommended)"; ObjectID = "QQn-nk-BjG"; */
+"QQn-nk-BjG.title" = "KeePass 2 (KDBX 4.x, Recommended)";
 
-/* Class = "NSButtonCell"; title = "KeePass 1"; ObjectID = "P2e-D6-GSn"; */
-"P2e-D6-GSn.title" = "KeePass 1";
+/* Class = "NSTextFieldCell"; title = " "; ObjectID = "QtO-yM-s8u"; */
+"QtO-yM-s8u.title" = " ";
 
-/* Class = "NSButtonCell"; title = "Select Existing..."; ObjectID = "P7n-Ot-jFr"; */
-"P7n-Ot-jFr.title" = "选择已有文件...";
+/* Class = "NSMenuItem"; title = "Password Safe (3.x - psafe3)"; ObjectID = "S8Y-F4-bfc"; */
+"S8Y-F4-bfc.title" = "Password Safe (3.x - psafe3)";
 
-/* Class = "NSTextFieldCell"; title = "KDBX 3.1, Salsa20 & AES-256\nSupports Attachments & Custom Fields"; ObjectID = "Uox-5w-l6z"; */
-"Uox-5w-l6z.title" = "KDBX 3.1, Salsa20 & AES-256\n支持附件和自定义字段";
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "TxC-Zj-MC1"; */
+"TxC-Zj-MC1.title" = "Item 2";
 
-/* Class = "NSButtonCell"; title = "Show Advanced"; ObjectID = "WAB-p8-ccR"; */
-"WAB-p8-ccR.title" = "显示高级设置";
+/* Class = "NSTextFieldCell"; title = "(⌘R)"; ObjectID = "Vol-mu-tOe"; */
+"Vol-mu-tOe.title" = "(⌘R)";
 
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "WZ1-rR-K5D"; */
-"WZ1-rR-K5D.title" = "项目 2";
+/* Class = "NSTextFieldCell"; title = "Enter Master Credentials"; ObjectID = "W6A-iN-sTe"; */
+"W6A-iN-sTe.title" = "Enter Master Credentials";
 
-/* Class = "NSButtonCell"; title = "Password Safe"; ObjectID = "bsw-7p-LHb"; */
-"bsw-7p-LHb.title" = "Password Safe";
+/* Class = "NSMenuItem"; title = "KeePass 1 (KDB) - Legacy"; ObjectID = "Wpg-M8-gMC"; */
+"Wpg-M8-gMC.title" = "KeePass 1 (KDB) - Legacy";
 
-/* Class = "NSButtonCell"; title = "OK"; ObjectID = "c6L-DK-2Qp"; */
-"c6L-DK-2Qp.title" = "确定";
+/* Class = "NSButtonCell"; title = "Use a Key File"; ObjectID = "bn1-Lr-HQv"; */
+"bn1-Lr-HQv.title" = "Use a Key File";
 
-/* Class = "NSTextFieldCell"; title = "The default format is usually the best choice unless you have other clients that are not compatible with the latest file format."; ObjectID = "cxf-wX-A8p"; */
-"cxf-wX-A8p.title" = "除非您正在使用其它与最新文件格式不兼容的客户端，否则默认格式通常是最佳选择。";
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "dTY-rT-lNh"; */
+"dTY-rT-lNh.title" = "Item 3";
 
-/* Class = "NSButtonCell"; title = "Next >"; ObjectID = "ejM-sz-azx"; */
-"ejM-sz-azx.title" = "下一个 >";
+/* Class = "NSTextFieldCell"; title = "New Password"; ObjectID = "e9M-u0-dd9"; */
+"e9M-u0-dd9.title" = "New Password";
 
-/* Class = "NSButtonCell"; title = "KeePass 2 (Legacy)"; ObjectID = "fxN-8H-lmi"; */
-"fxN-8H-lmi.title" = "KeePass 2（旧格式）";
+/* Class = "NSButtonCell"; title = "Create..."; ObjectID = "epu-iA-Xso"; */
+"epu-iA-Xso.title" = "Create...";
 
-/* Class = "NSButtonCell"; title = "Use a Password"; ObjectID = "gwJ-y3-JRu"; */
-"gwJ-y3-JRu.title" = "使用密码";
+/* Class = "NSTextFieldCell"; title = "Database Format"; ObjectID = "hXz-9k-yMx"; */
+"hXz-9k-yMx.title" = "Database Format";
 
-/* Class = "NSButtonCell"; title = "Create New..."; ObjectID = "lKo-rh-FHi"; */
-"lKo-rh-FHi.title" = "新建...";
+/* Class = "NSTextFieldCell"; title = "<No Need to Localize>"; ObjectID = "qW7-eB-MUm"; */
+"qW7-eB-MUm.title" = "<No Need to Localize>";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "oTz-NW-L0F"; */
-"oTz-NW-L0F.title" = "项目 1";
+/* Class = "NSButtonCell"; title = "Use a Hardware Key"; ObjectID = "qYU-9U-UyB"; */
+"qYU-9U-UyB.title" = "Use a Hardware Key";
 
-/* Class = "NSTextFieldCell"; title = "Enter Master Credentials"; ObjectID = "p8A-r3-zwq"; */
-"p8A-r3-zwq.title" = "输入主凭据";
+/* Class = "NSTextFieldCell"; placeholderString = "Nickname"; ObjectID = "tWq-Lz-euf"; */
+"tWq-Lz-euf.placeholderString" = "Nickname";
 
-/* Class = "NSTextFieldCell"; title = "(⌘R)"; ObjectID = "sMN-Hd-XTA"; */
-"sMN-Hd-XTA.title" = "(⌘R)";
+/* Class = "NSTextFieldCell"; title = "My New Database"; ObjectID = "tWq-Lz-euf"; */
+"tWq-Lz-euf.title" = "My New Database";
 
-/* Class = "NSTextFieldCell"; title = "Confirm"; ObjectID = "sm7-dv-AXP"; */
-"sm7-dv-AXP.title" = "确认";
+/* Class = "NSButtonCell"; title = "Select..."; ObjectID = "wlb-wM-74U"; */
+"wlb-wM-74U.title" = "Select...";
 
-/* Class = "NSTextFieldCell"; title = " "; ObjectID = "tPH-27-bnM"; */
-"tPH-27-bnM.title" = " ";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Key File Path"; ObjectID = "u5p-7g-uGc"; */
-"u5p-7g-uGc.placeholderString" = "密钥文件路径";
-
-/* Class = "NSTextFieldCell"; title = "/Users/mark/my-secret-keyfile"; ObjectID = "u5p-7g-uGc"; */
-"u5p-7g-uGc.title" = "/Users/mark/my-secret-keyfile";
-
-/* Class = "NSButtonCell"; title = "KeePass 2 (Default)"; ObjectID = "uby-bX-1k4"; */
-"uby-bX-1k4.title" = "KeePass 2（默认）";
-
-/* Class = "NSTextFieldCell"; title = "KDB, AES-256\nSupports Attachments"; ObjectID = "wDq-YC-f3d"; */
-"wDq-YC-f3d.title" = "KDB, AES-256\n支持附件";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm New Password"; ObjectID = "yt0-NB-xun"; */
-"yt0-NB-xun.placeholderString" = "确认新密码";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zvJ-YJ-TrN"; */
-"zvJ-YJ-TrN.title" = "项目 3";
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "y68-Cn-JIK"; */
+"y68-Cn-JIK.title" = "Label";