Merge branch 'master' into feature/import_plugins

This commit is contained in:
Michael Starke
2019-08-29 12:02:25 +02:00
12 changed files with 223 additions and 27 deletions

View File

@@ -980,6 +980,9 @@
ABAA99A623151BE70095D78E /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PluginRepositoryBrowserView.strings"; sourceTree = "<group>"; };
ABE506D522EFF97400B9F8DA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/AutotypeCandidateSelectionView.strings"; sourceTree = "<group>"; };
ABE506D622EFF97400B9F8DA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/AutotypeBuilderView.strings"; sourceTree = "<group>"; };
ABE8662E2316617500201125 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
ABE8662F2316617500201125 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/AutotypeDoctorReportViewController.strings"; sourceTree = "<group>"; };
ABE86630231662D200201125 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PluginDataView.strings"; sourceTree = "<group>"; };
BB3E050C1FE9D1CA00F0B46F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/AutotypeCandidateSelectionView.strings; sourceTree = "<group>"; };
BB3E050D1FE9D1CB00F0B46F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = nl; path = nl.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
BB3E050E1FE9D1CC00F0B46F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/ReferenceBuilderView.strings; sourceTree = "<group>"; };
@@ -2472,6 +2475,7 @@
A083E27A22DF467B0020E0D5 /* es */,
78E1F8C022E3B22500E738AE /* ru */,
71FF7A1F230FEEC7002F488F /* it */,
ABE86630231662D200201125 /* zh-Hans */,
);
name = PluginDataView.xib;
sourceTree = "<group>";
@@ -2650,6 +2654,7 @@
78E1F8B422E3A5DB00E738AE /* ru */,
4C1888CF230FBC080054A38F /* de */,
71FF7A27230FEF6B002F488F /* it */,
ABE8662F2316617500201125 /* zh-Hans */,
);
name = AutotypeDoctorReportViewController.xib;
sourceTree = "<group>";
@@ -2665,6 +2670,7 @@
4C1D562F2271F4BC00C3E594 /* fr */,
A019D80F22DC6B3C0085FD54 /* es */,
78E1F8C122E3B32D00E738AE /* ru */,
ABE8662E2316617500201125 /* zh-Hans */,
);
name = Localizable.stringsdict;
sourceTree = "<group>";

View File

@@ -0,0 +1,18 @@
/* Class = "NSTextFieldCell"; title = "MacPass will send key press events to the system when Autotype or Global Autotype is executed. Since macOS 10.14 Mojave this is only possible, if Accessibility permissions are granted to the application."; ObjectID = "6GI-KJ-Xue"; */
"6GI-KJ-Xue.title" = "当自动键入执行时MacPass 将会向系统发送按键事件。从 macOS 10.14 Mojave 开始,需要应用有辅助功能的权限,才能进行此操作。";
/* Class = "NSTextFieldCell"; title = "MacPass will read every window title when Global Autotype is executed to find a match. Since macOS 10.15 Catalina it is not possible to read any window title, if the user has not granted permissions to record the screen. If you are running macOS 10.15 or higher, MacPass will check if it can read every window title of currently visible windows. This test will not read the actual title. The titles aren't stored or processed in any way."; ObjectID = "7of-1z-Nfk"; */
"7of-1z-Nfk.title" = "当全局自动键入执行时MacPass 会试图读取每个窗口的标题来找到匹配的窗口。从 macOS 10.15 Catalina 开始,只有用户赋予应用屏幕录制权限,应用才能读取窗口标题。如果你正在使用 macOS 10.15 或以上MacPass 将会检查自己是否能够读取当前可见的窗口的标题。这项检查不会读取或者存储真实的标题。";
/* Class = "NSButtonCell"; title = "Open Accessibilty Preferences…"; ObjectID = "8m1-vs-pd5"; */
"8m1-vs-pd5.title" = "打开辅助功能选项...";
/* Class = "NSTextFieldCell"; title = "Screen Recording"; ObjectID = "9gr-mz-2I4"; */
"9gr-mz-2I4.title" = "屏幕录制";
/* Class = "NSTextFieldCell"; title = "Accessibility"; ObjectID = "aIL-8W-63g"; */
"aIL-8W-63g.title" = "辅助功能";
/* Class = "NSButtonCell"; title = "Open Screen Recording Preferences…"; ObjectID = "lgB-Ys-L9R"; */
"lgB-Ys-L9R.title" = "打开屏幕录制选项...";

View File

@@ -1,14 +1,14 @@
/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
"7.title" = "Search:";
"7.title" = "搜索:";
/* Class = "NSButtonCell"; title = "Empty Trash"; ObjectID = "8Ok-oe-6AB"; */
"8Ok-oe-6AB.title" = "Empty Trash";
"8Ok-oe-6AB.title" = "清空废纸篓";
/* Class = "NSTextFieldCell"; title = "Trash"; ObjectID = "8P1-Rp-sF4"; */
"8P1-Rp-sF4.title" = "Trash";
"8P1-Rp-sF4.title" = "废纸篓";
/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
"53D-ne-nv6.title" = "Title";
"53D-ne-nv6.title" = "标题";
/* Class = "NSButtonCell"; title = "URL"; ObjectID = "92o-gN-Psj"; */
"92o-gN-Psj.title" = "URL";
@@ -20,16 +20,16 @@
"cpr-p6-YAY.title" = "Item 2";
/* Class = "NSTextFieldCell"; title = "History"; ObjectID = "ER3-Ic-v0N"; */
"ER3-Ic-v0N.title" = "History";
"ER3-Ic-v0N.title" = "历史";
/* Class = "NSButtonCell"; title = "Exit History"; ObjectID = "ewQ-8F-e1E"; */
"ewQ-8F-e1E.title" = "Exit History";
"ewQ-8F-e1E.title" = "退出历史";
/* Class = "NSButtonCell"; title = "Notes"; ObjectID = "iDN-2E-hwt"; */
"iDN-2E-hwt.title" = "Notes";
"iDN-2E-hwt.title" = "备注";
/* Class = "NSButtonCell"; title = "Username"; ObjectID = "jfQ-Jh-2gl"; */
"jfQ-Jh-2gl.title" = "Username";
"jfQ-Jh-2gl.title" = "用户名";
/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "LRm-iZ-XrA"; */
"LRm-iZ-XrA.title" = "Item 1";
@@ -38,17 +38,20 @@
"na6-h9-r9q.label" = "Trash";
/* Class = "NSButtonCell"; title = "Password"; ObjectID = "rvQ-4V-SsS"; */
"rvQ-4V-SsS.title" = "Password";
"rvQ-4V-SsS.title" = "密码";
/* Class = "NSTabViewItem"; label = "Filter"; ObjectID = "Ud6-Nz-6PS"; */
"Ud6-Nz-6PS.label" = "Filter";
"Ud6-Nz-6PS.label" = "过滤";
/* Class = "NSButtonCell"; title = "Restore Entry"; ObjectID = "UTg-y9-4DN"; */
"UTg-y9-4DN.title" = "Restore Entry";
"UTg-y9-4DN.title" = "还原项目";
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
"wC4-fF-dLW.title" = "OtherViews";
/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
"z4I-cp-nhf.label" = "History";
/* Class = "NSButtonCell"; title = "Everywhere"; ObjectID = "WMK-bb-ESj"; */
"WMK-bb-ESj.title" = "所有项";
/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
"z4I-cp-nhf.label" = "历史";

View File

@@ -17,7 +17,7 @@
"257.title" = "描述:";
/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
"289.title" = "确定";
"289.title" = "";
/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
"358.label" = "通用";
@@ -65,13 +65,13 @@
"1588.title" = "模板组:";
/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
"1591.title" = "缺省用户名:";
"1591.title" = "默认用户名:";
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
"1740.title" = "OtherViews";
/* Class = "NSTextFieldCell"; title = "File format:"; ObjectID = "bTk-YZ-x0G"; */
"bTk-YZ-x0G.title" = "文件格式";
"bTk-YZ-x0G.title" = "文件格式:";
/* Class = "NSButtonCell"; title = "Recommend key change"; ObjectID = "CtU-Eq-dgy"; */
"CtU-Eq-dgy.title" = "建议修改密码";
@@ -80,7 +80,7 @@
"GVd-KH-pHc.title" = "算法";
/* Class = "NSTextFieldCell"; title = "Encryption:"; ObjectID = "gxY-UL-bEG"; */
"gxY-UL-bEG.title" = "加密";
"gxY-UL-bEG.title" = "加密:";
/* Class = "NSTextFieldCell"; title = "Memory"; ObjectID = "iRY-If-Kwn"; */
"iRY-If-Kwn.title" = "内存";

View File

@@ -1,18 +1,18 @@
/* Class = "NSButtonCell"; title = "Reference password instead of copying it"; ObjectID = "daA-QV-CDq"; */
"daA-QV-CDq.title" = "Reference password instead of copying it";
"daA-QV-CDq.title" = "引用密码而不是生成副本";
/* Class = "NSButtonCell"; title = "Duplicate history"; ObjectID = "dXl-KS-4rE"; */
"dXl-KS-4rE.title" = "Duplicate history";
"dXl-KS-4rE.title" = "生成历史副本";
/* Class = "NSButtonCell"; title = "Reference username instead of copying it"; ObjectID = "O9X-XH-n8o"; */
"O9X-XH-n8o.title" = "Reference username instead of copying it";
"O9X-XH-n8o.title" = "引用用户名而不是生成副本";
/* Class = "NSWindow"; title = "Duplicate Entry Options"; ObjectID = "QvC-M9-y7g"; */
"QvC-M9-y7g.title" = "Window";
/* Class = "NSButtonCell"; title = "Duplicate Entry"; ObjectID = "WqI-qH-ARf"; */
"WqI-qH-ARf.title" = "Duplicate Entry";
"WqI-qH-ARf.title" = "克隆项目";
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "x6e-bE-Y6R"; */
"x6e-bE-Y6R.title" = "Cancel";
"x6e-bE-Y6R.title" = "取消";

View File

@@ -1,3 +1,12 @@
/* (No Comment) */
"KDB Database" = "KDB 数据库";
/* (No Comment) */
"KDBX Database" = "KDBX 数据库";
/* Copyright (human-readable) */
"NSHumanReadableCopyright" = " Copyright © 2012-2019 HicknHack Software GmbH. 保留一切权利。";
/* (No Comment) */
"XML" = "XML";

View File

@@ -14,5 +14,8 @@
"3014.title" = "标记";
/* Class = "NSTextFieldCell"; title = "Notes"; ObjectID = "hwn-UY-9Cr"; */
"hwn-UY-9Cr.title" = "注";
"hwn-UY-9Cr.title" = "注";
/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "None"; ObjectID = "Xpb-G8-gXl"; */
"Xpb-G8-gXl.ibShadowedIsNilPlaceholder" = "无";

View File

@@ -41,5 +41,5 @@
"VVs-b5-cX9.title" = "预览";
/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
"WmI-IB-Aso.title" = "若使用此功能,预览时附件文件将被拷贝到临时文件夹,并且在预览后将被删除。";
"WmI-IB-Aso.title" = "若打开此功能,预览时附件文件将被拷贝到临时文件夹,并且在预览后将被删除。";

View File

@@ -28,15 +28,30 @@
/* Button in dialog to open plugin preferences pane! */
"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OPEN_PREFERENCES" = "打开插件设置...";
/* Informative text of the alert displayed when plugins where disabled due to incompatibilty */
"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_INFORMATIVE_TEXT" = "";
/* Message text of the alert displayed when plugins where disabled due to incompatibilty */
"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_MESSAGE" = "检测到不兼容的插件";
/* Alert informative text when plugins or their settings change and require a restart */
"ALERT_INFORMATIVE_TEXT_PLUGINS_CHANGED_SUGGEST_RESTART" = "对于插件和全局的插件设置改动,需要重启 MacPass 才能有效。现在重启 MacPass 吗?";
/* Alert informative text to ask the user if he really want to uninstall the plugin */
"ALERT_INFORMATIVE_TEXT_REALLY_UNINSTALL_PLUGIN" = "这个插件将会被移动到废纸篓。";
/* Button in dialog to cancel merge of KDB file changes! */
"ALERT_MERGE_CANCEL" = "取消";
/* Button in dialog to merge KDB changes into file! */
"ALERT_MERGE_CONTINUE" = "合并文件";
/* Informative text displayed when merging KDB files */
"ALERT_MERGE_KDB_FILE_INFO_TEXT" = "KDB 数据库没有包含足以进行无缝合并的信息。所有的项目将会被合并,不会有数据丢失。但是由于项目组仅通过名称来进行匹配,可能会有非预期的改变出现。项目可能会被还原到之前的组当中,重命名的组可能不会被合并,被删除的项目可能会重新出现。你确定想继续吗?";
/* Alert message warning user about KDB file merge */
"ALERT_MERGE_KDB_FILE_MESSAGE" = "你正在合并一个 KDB 数据库";
/* Attachments column title (shows counts)
Menu item to toggle display of attachment count column in entry table */
"ATTACHMENTS" = "附件";
@@ -199,7 +214,7 @@
"DATABASE" = "数据库";
/* Default Browser */
"DEFAULT_BROWSER" = "缺省浏览器";
"DEFAULT_BROWSER" = "默认浏览器";
/* Default Titel for new Custom-Fields */
"DEFAULT_CUSTOM_FIELD_TITLE" = "自定义";
@@ -229,6 +244,12 @@
/* Delete Group */
"DELETE_GROUP" = "删除组";
/* Empty Trash */
"DELETE_TRASHED_ENTRY" = "删除被移入废纸篓的项目";
/* Empty Trash */
"DELETE_TRASHED_GROUP" = "删除被移入废纸篓的组";
/* Action name for duplicating entries */
"DUPLICATE_ENTRIES_ACTION_NAME" = "克隆项目";
@@ -284,6 +305,9 @@
/* Format to returen the date an item expires. Includes %@ placehoder for date */
"EXPIRES_AT_DATE_%@" = "失效时间: %@";
/* The master key was changed by an external program! */
"EXTERN_CHANGE_OF_MASTERKEY" = "主密钥被其他程序修改";
/* External file change strategy option: ask what to do */
"FILE_CHANGE_STRATEGY_ASK" = "询问";
@@ -331,8 +355,14 @@
/* Feature only available in kdbx databases */
"KDBX_ONLY_FEATURE" = "KDB 数据库不支持此特性";
/* Button in dialog to ignore the changes to an open file! */
"KEEP_MINE_DISCARD_OTHER" = "保留我的,丢弃他人的改动";
/* Button in dialog to reopen the file! */
"KEEP_OTHER_DISCARD_MINE" = "";
"KEEP_OTHER_DISCARD_MINE" = "保留他人的,丢弃我的改动";
/* Do not restart MacPass */
"KEEP_RUNNING" = "保持运行";
/* last week */
"LAST_WEEK" = "上周";
@@ -340,6 +370,9 @@
/* Toolbar item to Lock the database */
"LOCK" = "锁定";
/* Message in the open panel to add attachments to an entry */
"MESSAGE_ADD_ATTACHMENT_OPEN_PANEL" = "选择要添加的附件";
/* Message in the add plugin open panel */
"MESSAGE_ADD_PLUGIN_OPEN_PANEL" = "选择要安装的插件";
@@ -385,6 +418,9 @@
Notes reference item */
"NOTES" = "备注";
/* Ok Button to dismiss disabled updates alert */
"OK" = "好";
/* preset to expire after one montch from now */
"ONE_MONTH" = "一月之后";
@@ -397,6 +433,9 @@
/* preset to expire after one year from now */
"ONE_YEAR" = "一年之后";
/* Open button in the open panel to add attachments to an entry */
"OPEN_BUTTON_ADD_ATTACHMENT_OPEN_PANEL" = "添加";
/* Open button in the add plugin open panel */
"OPEN_BUTTON_ADD_PLUGIN_OPEN_PANEL" = "安装";
@@ -486,6 +525,9 @@
/* Message text for the recommend password change alert */
"RECOMMEND_PASSWORD_CHANGE_ALERT_TITLE" = "请更改数据库密码!";
/* Restart */
"RESTART" = "重启";
/* Menu item to save the selected attached file.
Save file menu item title when save will just save the file */
"SAVE" = "保存";
@@ -517,6 +559,9 @@
/* Menu item title for the expiry preset selection menu in the date picker */
"SELECT_DATE_PRESET" = "使用预设值…";
/* Message on the open panel for selecting which browser to use for opening URLs */
"SELECT_DEFAULT_BROWSER_OPEN_PANEL_MESSAGE" = "选择要使用的浏览器";
/* Label for the select browser button on the open panel for selecting which browser to use for opening URLs */
"SELECT_DEFAULT_BROWSER_OPEN_PANEL_SELECT_BUTTON" = "选择";
@@ -623,6 +668,12 @@
/* No Key or Password */
"WARNING_NO_PASSWORD_OR_KEYFILE" = "未提供密码或密钥文件!";
/* Informative Text displayed when clearing the Trash */
"WARNING_ON_DELETE_TRASHED_NODE_DESCRIPTION" = "被移入废纸篓的项目将被彻底删除!";
/* Message text for the alert displayed when deleting a node */
"WARNING_ON_DELETE_TRASHED_NODE_TITLE" = "正在删除被移入废纸篓中的项目";
/* Informative Text displayed when clearing the Trash */
"WARNING_ON_EMPTY_TRASH_DESCRIPTION" = "清空废纸篓无法撤销";

View File

@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>%ld_CHARACTERS_TO_PICK_REMAINING</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@characters@</string>
<key>characters</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>剩余 %ld 字符</string>
<key>zero</key>
<string>已选择全部字符</string>
</dict>
</dict>
<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@entries@</string>
<key>entries</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>Duplicate Entries</string>
<key>zero</key>
<string>Duplicate Entries</string>
</dict>
</dict>
<key>DUPLICATE_GROUPS_ACTION_NAME</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@groups@</string>
<key>groups</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>Duplicate Groups</string>
</dict>
</dict>
<key>EVERY_%ld_DAYS</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@days@</string>
<key>days</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>每 %ld 天</string>
<key>zero</key>
<string>每次解锁后</string>
</dict>
</dict>
<key>PICKCHAR_INFO_MESSAGE_PICK_CHARACTERS_%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@characters@</string>
<key>characters</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>请选择要使用的 %ld 个字符</string>
<key>zero</key>
<string>请选择要使用的字符</string>
</dict>
</dict>
<key>PICKED_%ld_CHARACTERS</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@characters@</string>
<key>characters</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>other</key>
<string>选择了 %ld 个字符</string>
<key>zero</key>
<string>未选择任何字符</string>
</dict>
</dict>
</dict>
</plist>

View File

@@ -0,0 +1,6 @@
/* Class = "NSButtonCell"; title = "Remove All"; ObjectID = "6hH-Hc-gf4"; */
"6hH-Hc-gf4.title" = "删除全部";
/* Class = "NSTextFieldCell"; title = "Plugin data"; ObjectID = "unO-bO-8v0"; */
"unO-bO-8v0.title" = "插件数据";

View File

@@ -5,7 +5,7 @@
"2.title" = "项目表";
/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
"7YX-EA-9KA.title" = "缺省浏览器";
"7YX-EA-9KA.title" = "默认浏览器";
/* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
"10.title" = "双击 URL:";