From 76383d6d9daac9139d120a5b77deab3ac8ec6774 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Sat, 2 Sep 2017 10:00:10 +0200
Subject: [PATCH] Added merge action to file menu

---
 MacPass/Base.lproj/MainMenu.xib      | 6 ++++++
 MacPass/MPDocumentWindowController.m | 1 +
 2 files changed, 7 insertions(+)

diff --git a/MacPass/Base.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib
index 64be0c49..d106f320 100644
--- a/MacPass/Base.lproj/MainMenu.xib
+++ b/MacPass/Base.lproj/MainMenu.xib
@@ -143,6 +143,12 @@
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
+                            <menuItem title="Merge…" id="zvE-0h-UxI">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="mergeWithOther:" target="-1" id="OyM-CZ-TDD"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Import XML…" id="rW0-r1-QYL">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 8422ca0b..8414d284 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -301,6 +301,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
   openPanel.allowsMultipleSelection = NO;
   openPanel.canChooseDirectories = NO;
   openPanel.canChooseFiles = YES;
+  openPanel.message = NSLocalizedString(@"SELECT_FILE_TO_MERGE", @"Message for the dialog to open a file for merge");
   //openPanel.allowedFileTypes = @[(id)kUTTypeXML];
   [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
     if(result == NSFileHandlingPanelOKButton) {