Merge branch 'master' into feature/import_plugins

# Conflicts:
#	Cartfile.resolved

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "MacPass/KeePassKit" "2.4.5"
+github "MacPass/KeePassKit" "2.4.7"
 github "mstarke/HNHUi" "3.0"
 github "robbiehanson/KissXML" "5.2.3"
 github "sparkle-project/Sparkle" "1.20.0"

MacPass/MPTreeDelegate.m

@@ -99,10 +99,9 @@
   return (response == NSModalResponseOK) ? pickFieldViewController.pickedValue : @"";
 }
 
-- (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForEntry:(KPKEntry *)entry field:(NSString *)field options:(NSString *)options {
-  NSString *value = [[entry valueForAttributeWithKey:field] kpk_finalValueForEntry:entry];
+- (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForValue:(NSString *)value options:(NSString *)options {
   if(value.length == 0) {
-    return @""; // error while retrieving source value
+    return @"";
   }
   MPPickcharsParser *parser = [[MPPickcharsParser alloc] initWithOptions:options];
   MPPickcharsViewController *pickCharViewController = [[MPPickcharsViewController alloc] init];

MacPass/zh-Hans.lproj/InfoPlist.strings

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

MacPass/zh-Hans.lproj/Localizable.strings

@@ -22,18 +22,6 @@
 /* Action to add an entry via template */
 "ADD_TREMPLATE_ENTRY" = "创建模板项目";
 
-/* Button in dialog to leave autotype disabled and continiue! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK" = "保持关闭自动键入状态";
-
-/* Button in dialog to open accessibilty preferences pane! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES" = "打开辅助功能设置...";
-
-/* Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT" = "系统阻止了 MacPass 向其他应用发送键盘输入。要使用自动键入，请在隐私设置中授予 MacPass 辅助功能权限。";
-
-/* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "MacPass 不能执行自动键入";
-
 /* Button in dialog to leave plugin ds disabled and continiue! */
 "ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "好";
 
@@ -241,12 +229,21 @@
 /* Delete Group */
 "DELETE_GROUP" = "删除组";
 
+/* Action name for duplicating entries */
+"DUPLICATE_ENTRIES_ACTION_NAME" = "克隆项目";
+
 /* Menu item to directly diplicate an entry */
 "DUPLICATE_ENTRY" = "克隆项目";
 
 /* Menu item to duplicate an entry with options how to duplicate. Will present a dialog. */
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "克隆项目…";
 
+/* Menu item to directly diplicate a group */
+"DUPLICATE_GROUP" = "克隆组";
+
+/* Action name for duplicating groups */
+"DUPLICATE_GROUPS_ACTION_NAME" = "克隆组";
+
 /* Menu item in the database outline context menu to change the template group
    Menu item on the add entry context menu to edit template groups */
 "EDIT_TEMPLATE_GROUP" = "编辑项目模板组";
@@ -535,6 +532,9 @@
 /* Action button in Notification to show the Autotype Doctor */
 "SHOW_AUTOTYPE_DOCTOR" = "打开自动键入诊断";
 
+/* Menu item to show the entries group in the outline view */
+"SHOW_GROUP_IN_OUTLINE" = "在大纲视图中显示项目组";
+
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */
 "SHOW_HISTORY" = "显示历史";

MacPass/zh-Hans.lproj/PasswordCreatorView.strings

@@ -37,3 +37,9 @@
 /* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
 "653.title" = "25000 bit";
 
+/* Class = "NSButtonCell"; title = "Use default only for selected entry"; ObjectID = "cfZ-5F-Nge"; */
+"cfZ-5F-Nge.title" = "只对当前项目使用默认值";
+
+/* Class = "NSButtonCell"; title = "Use characters from every group"; ObjectID = "CMc-Uh-Fo5"; */
+"CMc-Uh-Fo5.title" = "使用所有分组中的字符";
+

MacPass/zh-Hans.lproj/PasswordEditWindow.strings

@@ -1,7 +1,7 @@
 /* Class = "NSWindow"; title = "Change Password"; ObjectID = "1"; */
 "1.title" = "Window";
 
-/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
+/* Class = "NSTextFieldCell"; title = "Mismatching Passwords"; ObjectID = "14"; */
 "14.title" = "密码不匹配";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */

MacPass/zh-Hans.lproj/WorkflowPreferences.strings

@@ -1,4 +1,4 @@
-/* Class = "NSButtonCell"; title = "Hide application after copying to clipboard "; ObjectID = "1Vr-nY-Ogv"; */
+/* Class = "NSButtonCell"; title = "Hide application after copying to clipboard"; ObjectID = "1Vr-nY-Ogv"; */
 "1Vr-nY-Ogv.title" = "复制到剪贴板之后隐藏应用程序";
 
 /* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */