rolled out new submenu to single items

changed some localization keys
build menus using centralized MPContextMenuHelper

MacPass.xcodeproj/project.pbxproj

@@ -628,7 +628,6 @@
 		4C840C531D773E5E0081F605 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/DatePickingView.strings; sourceTree = "<group>"; };
 		4C840C541D773E5E0081F605 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/ReferenceBuilderView.strings; sourceTree = "<group>"; };
 		4C840C551D773E6B0081F605 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		4C888C8F16EB6C91003D34A1 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; lineEnding = 0; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
 		4C888C9116EB6F5E003D34A1 /* MPToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarItem.h; sourceTree = "<group>"; };
 		4C888C9216EB6F5E003D34A1 /* MPToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarItem.m; sourceTree = "<group>"; };
 		4C888C9516EB754B003D34A1 /* MPActionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPActionHelper.h; sourceTree = "<group>"; };
@@ -647,6 +646,7 @@
 		4C8B36AA17A6ED4B005E1FF1 /* MPOutlineContextMenuDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineContextMenuDelegate.m; sourceTree = "<group>"; };
 		4C8DEAA11C314D2C00D24C32 /* MPTestAutotypeDelay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTestAutotypeDelay.m; sourceTree = "<group>"; };
 		4C978E0C19AE54AB003067DF /* MPFlagsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFlagsHelper.m; sourceTree = "<group>"; };
+		4C97CCEF1FA727DC00E58F8C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		4CA08D9E17A831B200A6544B /* MPAddEntryContextMenuDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAddEntryContextMenuDelegate.h; sourceTree = "<group>"; };
 		4CA08D9F17A831B200A6544B /* MPAddEntryContextMenuDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAddEntryContextMenuDelegate.m; sourceTree = "<group>"; };
 		4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = "<group>"; };
@@ -2112,7 +2112,6 @@
 		4C888C8E16EB6C91003D34A1 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				4C888C8F16EB6C91003D34A1 /* en */,
 				4C7615771764C4A40015A1A6 /* de */,
 				4C5CD34017D158DE000B7F38 /* fr */,
 				601F811818E016340028F3DE /* zh-Hans */,
@@ -2122,6 +2121,7 @@
 				4C43B02F1E266A3A000CB4D7 /* pl */,
 				4C4161131F50333C003BC0AF /* es */,
 				4CC6C39C1F98D93B0021E561 /* Base */,
+				4C97CCEF1FA727DC00E58F8C /* en */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";

MacPass/Base.lproj/EntryInspectorView.xib

@@ -96,7 +96,7 @@
                                         <rect key="frame" x="20" y="26" width="253" height="396"/>
                                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="F3N-QI-Di5">
                                             <rect key="frame" x="1" y="1" width="251" height="394"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="36" rowSizeStyle="automatic" viewBased="YES" id="137">
                                                     <rect key="frame" x="0.0" y="0.0" width="251" height="394"/>
@@ -512,23 +512,27 @@
                 <constraint firstAttribute="trailing" secondItem="5" secondAttribute="trailing" constant="20" symbolic="YES" id="50"/>
                 <constraint firstItem="QSX-Xo-tcH" firstAttribute="leading" secondItem="4" secondAttribute="leading" constant="20" symbolic="YES" id="2AA-hQ-mL7"/>
                 <constraint firstItem="IpW-b2-jWu" firstAttribute="leading" secondItem="4" secondAttribute="leading" constant="20" id="51R-pR-KLO"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="52" secondAttribute="trailing" constant="20" symbolic="YES" id="6P6-fW-kGx"/>
                 <constraint firstAttribute="trailing" secondItem="179" secondAttribute="trailing" constant="20" symbolic="YES" id="Bys-px-9xs"/>
                 <constraint firstAttribute="trailing" secondItem="IpW-b2-jWu" secondAttribute="trailing" constant="20" id="D0t-s7-2hT"/>
                 <constraint firstItem="0U8-TS-giU" firstAttribute="top" secondItem="179" secondAttribute="bottom" constant="8" symbolic="YES" id="GNj-yE-507"/>
                 <constraint firstItem="7" firstAttribute="top" secondItem="56" secondAttribute="bottom" constant="12" id="Gh9-Lg-kcm"/>
                 <constraint firstItem="IpW-b2-jWu" firstAttribute="top" secondItem="0U8-TS-giU" secondAttribute="bottom" constant="8" symbolic="YES" id="HSM-Aj-X9I"/>
                 <constraint firstItem="58" firstAttribute="top" secondItem="55" secondAttribute="bottom" constant="12" id="JiM-Dm-AG8"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="57" secondAttribute="trailing" constant="20" symbolic="YES" id="N4A-wg-PdS"/>
                 <constraint firstItem="179" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4" secondAttribute="leading" constant="20" symbolic="YES" id="OUg-H1-uyM"/>
                 <constraint firstItem="QSX-Xo-tcH" firstAttribute="top" secondItem="IpW-b2-jWu" secondAttribute="bottom" constant="8" symbolic="YES" id="TPp-cx-48q"/>
                 <constraint firstItem="8" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="Xa5-Ir-XNC"/>
                 <constraint firstAttribute="bottom" secondItem="QSX-Xo-tcH" secondAttribute="bottom" constant="20" symbolic="YES" id="ZdF-5c-xDa"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="0U8-TS-giU" secondAttribute="trailing" constant="20" symbolic="YES" id="a5R-eI-VuV"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="54" secondAttribute="trailing" constant="20" symbolic="YES" id="cYP-oK-dVP"/>
                 <constraint firstAttribute="trailing" secondItem="QSX-Xo-tcH" secondAttribute="trailing" constant="20" symbolic="YES" id="hr2-Eb-g24"/>
                 <constraint firstItem="0U8-TS-giU" firstAttribute="leading" secondItem="4" secondAttribute="leading" constant="20" id="kLH-Bj-C5m"/>
                 <constraint firstItem="57" firstAttribute="top" secondItem="59" secondAttribute="bottom" constant="8" symbolic="YES" id="lYe-am-xJx"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="58" secondAttribute="trailing" constant="20" symbolic="YES" id="rbs-i7-bti"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6" secondAttribute="trailing" constant="20" symbolic="YES" id="uuh-ba-z4h"/>
             </constraints>
-            <point key="canvasLocation" x="-306" y="-851"/>
+            <point key="canvasLocation" x="-525" y="-927"/>
         </customView>
         <view translatesAutoresizingMaskIntoConstraints="NO" id="zv7-wE-Bmg" customClass="HNHUIScrollDocumentViewAdapter">
             <rect key="frame" x="0.0" y="0.0" width="301" height="424"/>
@@ -587,7 +591,7 @@
                     <rect key="frame" x="20" y="138" width="261" height="160"/>
                     <clipView key="contentView" id="aDE-WT-YIv">
                         <rect key="frame" x="1" y="1" width="259" height="158"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="caM-L6-UHC">
                                 <rect key="frame" x="0.0" y="0.0" width="259" height="158"/>
@@ -896,7 +900,7 @@
             <connections>
                 <outlet property="nextKeyView" destination="QSX-Xo-tcH" id="KP9-D4-4cC"/>
             </connections>
-            <point key="canvasLocation" x="-725" y="-950"/>
+            <point key="canvasLocation" x="-899" y="-949"/>
         </scrollView>
     </objects>
     <resources>

MacPass/Base.lproj/Localizable.strings

@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Add Entry";
+"NEW_ENTRY" = "New Entry";
-"ADD_GROUP" = "Add Group";
+"NEW_GROUP" = "New Group";
 "DUPLICATE_ENTRY" = "Duplicate Entry";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplicate Entry…";
 "COPY_ENTRY" = "Copy Entry";

MacPass/Base.lproj/MainMenu.xib

@@ -76,27 +76,11 @@
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" id="82">
+                            <menuItem title="New Database" keyEquivalent="n" id="82">
-                                <menu key="submenu" id="Mjd-iK-MxC">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                    <items>
+                                <connections>
-                                        <menuItem title="Entry" keyEquivalent="n" id="5pt-iM-iQB">
+                                    <action selector="newDocument:" target="-1" id="ju8-Y5-iJk"/>
-                                            <connections>
+                                </connections>
-                                                <action selector="createEntry:" target="-1" id="NRG-FC-HaO"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Group" keyEquivalent="N" id="dMl-Ia-k8o">
-                                            <connections>
-                                                <action selector="createGroup:" target="-1" id="RtX-HO-Zdw"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Database" id="Ame-Ou-khG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="newDocument:" target="-1" id="VEe-mh-brx"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
                             </menuItem>
                             <menuItem title="Open…" keyEquivalent="o" id="72">
                                 <connections>
@@ -352,10 +336,11 @@ CA
                     </menu>
                 </menuItem>
             </items>
-            <point key="canvasLocation" x="-175" y="101"/>
+            <point key="canvasLocation" x="-452" y="80"/>
         </menu>
         <customObject id="494" customClass="MPAppDelegate">
             <connections>
+                <outlet property="fileNewMenuItem" destination="82" id="BUX-dy-HS2"/>
                 <outlet property="fixAutotypeMenuItem" destination="nx7-Vf-LiD" id="5n1-bG-JxJ"/>
                 <outlet property="saveMenuItem" destination="75" id="dsN-Im-4eZ"/>
             </connections>

MacPass/Base.lproj/WelcomeWindow.xib

@@ -83,7 +83,7 @@
                     <constraint firstItem="3" firstAttribute="centerX" secondItem="2" secondAttribute="centerX" id="100"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-5" y="71"/>
+            <point key="canvasLocation" x="133" y="85"/>
         </window>
     </objects>
     <resources>

MacPass/EntryView.xib

@@ -131,11 +131,11 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="PasswordCell" id="428">
-                                                <rect key="frame" x="256" y="1" width="119" height="17"/>
+                                                <rect key="frame" x="256" y="1" width="118" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="429" customClass="NSSecureTextField">
-                                                        <rect key="frame" x="1" y="0.0" width="117" height="17"/>
+                                                        <rect key="frame" x="1" y="0.0" width="116" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="430">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>

MacPass/MPAppDelegate.h

@@ -32,6 +32,7 @@ APPKIT_EXTERN NSString *const MPDidChangeStoredKeyFilesSettings;
 @property (strong) IBOutlet NSWindow *welcomeWindow;
 @property (weak) IBOutlet NSMenuItem *saveMenuItem;
 @property (weak) IBOutlet NSMenuItem *fixAutotypeMenuItem;
+@property (weak) IBOutlet NSMenuItem *fileNewMenuItem;
 
 @property (nonatomic, assign) BOOL isAllowedToStoreKeyFile;
 

MacPass/MPAppDelegate.m

@@ -23,6 +23,7 @@
 #import "MPAppDelegate.h"
 
 #import "MPAutotypeDaemon.h"
+#import "MPContextMenuHelper.h"
 #import "MPDockTileHelper.h"
 #import "MPDocument.h"
 #import "MPDocumentController.h"
@@ -104,6 +105,13 @@ NSString *const MPHelpURLKey = @"MPHelpURL";
     toObject:NSUserDefaultsController.sharedUserDefaultsController
  withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyRememberKeyFilesForDatabases]
      options:nil];
+  
+  NSMenu *fileMenu = self.fileNewMenuItem.menu;
+  NSInteger insertIndex = [fileMenu indexOfItem:self.fileNewMenuItem]+1;
+  NSArray *items = [MPContextMenuHelper contextMenuItemsWithItems:MPContextMenuCreate];
+  for(NSMenuItem *item in items.reverseObjectEnumerator) {
+    [fileMenu insertItem:item atIndex:insertIndex];
+  }
 }
 
 #pragma mark -

MacPass/MPContextMenuHelper.m

@@ -46,10 +46,10 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) {
   NSMutableArray *items = [NSMutableArray arrayWithCapacity:10];
   if(insertCreate) {
     
-    NSMenuItem *newGroup = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"ADD_GROUP", @"")
+    NSMenuItem *newGroup = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"NEW_GROUP", @"")
                                                       action:[MPActionHelper actionOfType:MPActionAddGroup]
                                                keyEquivalent:@"N"];
-    NSMenuItem *newEntry = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"ADD_ENTRY", @"")
+    NSMenuItem *newEntry = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"NEW_ENTRY", @"")
                                                       action:[MPActionHelper actionOfType:MPActionAddEntry]
                                                keyEquivalent:@"n"];
     

MacPass/MPDocument.m

@@ -612,6 +612,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   if(parent.isTrash || parent.isTrashed) {
     return nil; // no new Groups in trash
   }
+  
   KPKEntry *newEntry = [self.tree createEntry:parent];
   /* setting properties on entries is undoable, but we do not want to record this so disable on creation */
   BOOL wasUndoEnabeld = self.undoManager.isUndoRegistrationEnabled;
@@ -629,7 +630,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
     [self.undoManager enableUndoRegistration];
   }
   [newEntry addToGroup:parent];
-  [newEntry.undoManager setActionName:NSLocalizedString(@"ADD_ENTRY", "")];
+  [newEntry.undoManager setActionName:NSLocalizedString(@"NEW_ENTRY", "")];
   [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentDidAddEntryNotification
                                                    object:self
                                                  userInfo:@{ MPDocumentEntryKey: newEntry }];
@@ -654,7 +655,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
     [self.undoManager enableUndoRegistration];
   }
   [newGroup addToGroup:parent];
-  [newGroup.undoManager setActionName:NSLocalizedString(@"ADD_GROUP", "")];
+  [newGroup.undoManager setActionName:NSLocalizedString(@"NEW_GROUP", "")];
   [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentDidAddGroupNotification
                                                     object:self
                                                   userInfo:@{ MPDocumentGroupKey : newGroup }];

MacPass/MPDocumentWindowController.m

@@ -111,7 +111,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
   
   [self.entryViewController registerNotificationsForDocument:document];
   [self.inspectorViewController registerNotificationsForDocument:document];
-  [self.outlineViewController regsiterNotificationsForDocument:document];
+  [self.outlineViewController registerNotificationsForDocument:document];
   [self.toolbarDelegate registerNotificationsForDocument:document];
   
   self.toolbar = [[NSToolbar alloc] initWithIdentifier:@"MainWindowToolbar"];

MacPass/MPOutlineViewController.h

@@ -32,7 +32,7 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection;
 
 - (void)clearSelection;
 - (void)showOutline;
-- (void)regsiterNotificationsForDocument:(MPDocument *)document;
+- (void)registerNotificationsForDocument:(MPDocument *)document;
 
 /**
  *	Retrieves the current item for the current mouse location

MacPass/MPOutlineViewController.m

@@ -193,7 +193,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 
 #pragma mark Notifications
-- (void)regsiterNotificationsForDocument:(MPDocument *)document {
+- (void)registerNotificationsForDocument:(MPDocument *)document {
   [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didAddGroup:) name:MPDocumentDidAddGroupNotification object:document];
 }
 

MacPass/MPToolbarDelegate.m

@@ -230,8 +230,8 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
   dispatch_once(&onceToken, ^{
     labelDict = @{ MPToolbarItemLock: NSLocalizedString(@"LOCK", @""),
                    MPToolbarItemAction: NSLocalizedString(@"ACTION", @""),
-                   MPToolbarItemAddEntry: NSLocalizedString(@"ADD_ENTRY", @""),
+                   MPToolbarItemAddEntry: NSLocalizedString(@"NEW_ENTRY", @""),
-                   MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""),
+                   MPToolbarItemAddGroup: NSLocalizedString(@"NEW_GROUP", @""),
                    MPToolbarItemCopyPassword: NSLocalizedString(@"COPY_PASSWORD", @""),
                    MPToolbarItemCopyUsername: NSLocalizedString(@"COPY_USERNAME", @""),
                    MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""),

MacPass/OutlineView.xib

@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPOutlineViewController">
@@ -23,7 +24,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="231" id="228" customClass="MPOutlineView">
-                                <rect key="frame" x="0.0" y="0.0" width="272" height="0.0"/>
+                                <rect key="frame" x="0.0" y="0.0" width="272" height="449"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="0.0"/>
                                 <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -121,6 +122,7 @@
                 <constraint firstItem="227" firstAttribute="trailing" secondItem="196" secondAttribute="trailing" id="269"/>
                 <constraint firstAttribute="bottom" secondItem="227" secondAttribute="bottom" id="NQ5-NK-jdK"/>
             </constraints>
+            <point key="canvasLocation" x="-288" y="-139"/>
         </customView>
     </objects>
     <resources>

MacPass/PasswordCreatorWindow.xib

@@ -21,7 +21,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="338" height="216"/>
                 <autoresizingMask key="autoresizingMask"/>
             </view>
-            <point key="canvasLocation" x="150" y="5"/>
+            <point key="canvasLocation" x="288" y="14"/>
         </window>
     </objects>
 </document>

MacPass/de.lproj/Localizable.strings

@@ -32,10 +32,10 @@
 "ACTION" = "Aktion";
 
 /* No comment provided by engineer. */
-"ADD_ENTRY" = "Neuer Eintrag";
+"NEW_ENTRY" = "Neuer Eintrag";
 
 /* No comment provided by engineer. */
-"ADD_GROUP" = "Neue Gruppe";
+"NEW_GROUP" = "Neue Gruppe";
 
 /* No comment provided by engineer. */
 "ADD_TREMPLATE_ENTRY" = "Vorgabeeintrag erstellen";

MacPass/de.lproj/MainMenu.strings

@@ -41,7 +41,7 @@
 "81.title" = "Ablage";
 
 /* Class = "NSMenuItem"; title = "New"; ObjectID = "82"; */
-"82.title" = "Neu";
+"82.title" = "Neue Datenbank";
 
 /* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */
 "83.title" = "Ablage";

MacPass/en.lproj/Localizable.strings

@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Add Entry";
+"NEW_ENTRY" = "New Entry";
-"ADD_GROUP" = "Add Group";
+"NEW_GROUP" = "New Group";
 "DUPLICATE_ENTRY" = "Duplicate Entry";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplicate Entry…";
 "COPY_ENTRY" = "Copy Entry";

MacPass/en.lproj/MainMenu.strings

@@ -36,7 +36,7 @@
 "81.title" = "File";
 
 /* Class = "NSMenuItem"; title = "New"; ObjectID = "82"; */
-"82.title" = "New";
+"82.title" = "New Database";
 
 /* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */
 "83.title" = "File";

MacPass/es.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Formatted Times  */
+/* Formatted Times  */
 "%ld_DAYS_AGO" = "hace %ld días";
 "%ld_HOURS_AGO" = "hace aproximadamente %ld horas";
 "%ld_MINUTES_AGO" = "hace %ld minutos";
@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Agregar Entrada";
+"NEW_ENTRY" = "Agregar Entrada";
-"ADD_GROUP" = "Agregar Grupo";
+"NEW_GROUP" = "Agregar Grupo";
 "DUPLICATE_ENTRY" = "Duplicar Entrada";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplicar Entrada…";
 "COPY_ENTRY" = "Copiar Entrada";

MacPass/fr.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Formatted Times  */
+/* Formatted Times  */
 "%ld_DAYS_AGO" = "Depuis %ld jours";
 "%ld_HOURS_AGO" = "Depuis %ld heures";
 "%ld_MINUTES_AGO" = "Depuis %ld minutes";
@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Ajouter entrée";
+"NEW_ENTRY" = "Ajouter entrée";
-"ADD_GROUP" = "Ajouter groupe";
+"NEW_GROUP" = "Ajouter groupe";
 "DUPLICATE_ENTRY" = "Dupliquer entrée";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Dupliquer entrée…";
 "COPY_ENTRY" = "Copier entrée";

MacPass/it.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Formatted Times  */
+/* Formatted Times  */
 "%ld_DAYS_AGO" = "%ld giorni fa";
 "%ld_HOURS_AGO" = "circa %ld ore fa";
 "%ld_MINUTES_AGO" = "%ld minuti fa";
@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Aggiungi elemento";
+"NEW_ENTRY" = "Aggiungi elemento";
-"ADD_GROUP" = "Aggiungi gruppo";
+"NEW_GROUP" = "Aggiungi gruppo";
 "DUPLICATE_ENTRY" = "Duplica elemento";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplica elemento…";
 "COPY_ENTRY" = "Copia elemento";

MacPass/nl.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Formatted Times  */
+/* Formatted Times  */
 "%ld_DAYS_AGO" = "%ld dagen geleden";
 "%ld_HOURS_AGO" = "ongeveer %ld uur geleden";
 "%ld_MINUTES_AGO" = "%ld minuten geleden";
@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Voeg Item toe";
+"NEW_ENTRY" = "Voeg Item toe";
-"ADD_GROUP" = "Voeg Groep toe";
+"NEW_GROUP" = "Voeg Groep toe";
 "DUPLICATE_ENTRY" = "Dupliceer Item";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Dupliceer Item…";
 "COPY_ENTRY" = "Kopieer Item";

MacPass/pl.lproj/Localizable.strings

@@ -29,10 +29,10 @@
 "ACTION" = "Akcja";
 
 /* No comment provided by engineer. */
-"ADD_ENTRY" = "Dodaj wpis";
+"NEW_ENTRY" = "Dodaj wpis";
 
 /* No comment provided by engineer. */
-"ADD_GROUP" = "Dodaj grupę";
+"NEW_GROUP" = "Dodaj grupę";
 
 /* No comment provided by engineer. */
 "ADD_TREMPLATE_ENTRY" = "Dodaj szablon wpisu";

MacPass/ru.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Formatted Times  */
+/* Formatted Times  */
 "%ld_DAYS_AGO" = "%ld дней назад";
 "%ld_HOURS_AGO" = "около %ld часов назад";
 "%ld_MINUTES_AGO" = "%ld минут назад";
@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "Добавить Запись";
+"NEW_ENTRY" = "Добавить Запись";
-"ADD_GROUP" = "Добавить Группу";
+"NEW_GROUP" = "Добавить Группу";
 "DUPLICATE_ENTRY" = "Скопировать Запись";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Скопировать Запись…";
 "COPY_ENTRY" = "Копировать Запись";

MacPass/zh-Hans.lproj/Localizable.strings

@@ -22,8 +22,8 @@
 /*
  Actions
  */
-"ADD_ENTRY" = "添加项目";
+"NEW_ENTRY" = "添加项目";
-"ADD_GROUP" = "添加组";
+"NEW_GROUP" = "添加组";
 "DUPLICATE_ENTRY" = "克隆项目";
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "克隆项目…";
 "COPY_ENTRY" = "拷贝项目";