diff --git a/HNHUi b/HNHUi index f056276a..0a0c4564 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit f056276a89340b2cb16332279217b9a49da6c80a +Subproject commit 0a0c4564d14a2814f2d7e0196d479a8fb644e5ce diff --git a/KeePassKit b/KeePassKit index ab02bcab..8e317424 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit ab02bcab6ff3b1d19f7cf519bd59e5b6bd60f319 +Subproject commit 8e3174244b07f7065eebdbd0c11eb6af621549a8 diff --git a/MacPass/Base.lproj/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib index e49c41d5..fcdd133c 100644 --- a/MacPass/Base.lproj/GroupInspectorView.xib +++ b/MacPass/Base.lproj/GroupInspectorView.xib @@ -1,8 +1,8 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -98,13 +98,7 @@ - - - - - - - + diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m index e6b7712d..7e63361c 100644 --- a/MacPass/MPGroupInspectorViewController.m +++ b/MacPass/MPGroupInspectorViewController.m @@ -56,6 +56,19 @@ metrics:nil views:views]]; [[self view] layoutSubtreeIfNeeded]; + + NSMenu *autotypeMenu = self.autotypePopupButton.menu; + NSMenuItem *inheritItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_INHERIT", "") action:NULL keyEquivalent:@""]; + inheritItem.tag = KPKInherit; + NSMenuItem *yesItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_YES", "") action:NULL keyEquivalent:@""]; + yesItem.tag = KPKInheritYES; + NSMenuItem *noItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_NO", "") action:NULL keyEquivalent:@""]; + noItem.tag = KPKInheritNO; + + [autotypeMenu addItem:inheritItem]; + [autotypeMenu addItem:yesItem]; + [autotypeMenu addItem:noItem]; + /* void(^copyBlock)(NSTextField *textField) = ^void(NSTextField *textField) { [[MPPasteBoardController defaultController] copyObjects:@[ textField.stringValue ]]; diff --git a/MacPass/de.lproj/GroupInspectorView.strings b/MacPass/de.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/de.lproj/GroupInspectorView.strings +++ b/MacPass/de.lproj/GroupInspectorView.strings @@ -20,15 +20,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */ -"244.title" = "Disable Autotype"; - -/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */ -"245.title" = "Enable Autotype"; - -/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */ -"246.title" = "Inherit Autotype Settings"; - /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */ "265.title" = "Search"; diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index c6e6d70b..7be89fbf 100644 Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ diff --git a/MacPass/en.lproj/GroupInspectorView.strings b/MacPass/en.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/en.lproj/GroupInspectorView.strings +++ b/MacPass/en.lproj/GroupInspectorView.strings @@ -20,15 +20,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */ -"244.title" = "Disable Autotype"; - -/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */ -"245.title" = "Enable Autotype"; - -/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */ -"246.title" = "Inherit Autotype Settings"; - /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */ "265.title" = "Search"; diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index 91d37ebc..3342611b 100644 Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ diff --git a/MacPass/fr.lproj/GroupInspectorView.strings b/MacPass/fr.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/fr.lproj/GroupInspectorView.strings +++ b/MacPass/fr.lproj/GroupInspectorView.strings @@ -20,15 +20,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */ -"244.title" = "Disable Autotype"; - -/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */ -"245.title" = "Enable Autotype"; - -/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */ -"246.title" = "Inherit Autotype Settings"; - /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */ "265.title" = "Search"; diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings index be5d7237..bbe4151d 100644 Binary files a/MacPass/fr.lproj/Localizable.strings and b/MacPass/fr.lproj/Localizable.strings differ diff --git a/MacPass/nl.lproj/GroupInspectorView.strings b/MacPass/nl.lproj/GroupInspectorView.strings index 60c6b98d..7a8d21a8 100644 --- a/MacPass/nl.lproj/GroupInspectorView.strings +++ b/MacPass/nl.lproj/GroupInspectorView.strings @@ -20,15 +20,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OverigeViews"; -/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */ -"244.title" = "Deactiveer Autotype"; - -/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */ -"245.title" = "Activeer Autotype"; - -/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */ -"246.title" = "Erf Autotype Voorkeuren"; - /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */ "265.title" = "Zoeken"; diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings index ab3aaabc..517e145d 100644 Binary files a/MacPass/nl.lproj/Localizable.strings and b/MacPass/nl.lproj/Localizable.strings differ diff --git a/MacPass/zh-Hans.lproj/GroupInspectorView.strings b/MacPass/zh-Hans.lproj/GroupInspectorView.strings index 6349ae2f..767ee822 100644 --- a/MacPass/zh-Hans.lproj/GroupInspectorView.strings +++ b/MacPass/zh-Hans.lproj/GroupInspectorView.strings @@ -20,15 +20,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */ -"244.title" = "不使用自动键入"; - -/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */ -"245.title" = "使用自动键入"; - -/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */ -"246.title" = "继承自动键入设置"; - /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */ "265.title" = "搜索"; diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings index 8b3e36a8..db175392 100644 Binary files a/MacPass/zh-Hans.lproj/Localizable.strings and b/MacPass/zh-Hans.lproj/Localizable.strings differ