Bumped to 0.7.8

MacPass.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; };
 		4C06B17F21D9691F00CD4BBC /* MPPluginStatusTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C06B17E21D9691F00CD4BBC /* MPPluginStatusTableCellView.m */; };
 		4C0728BD17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */; };
-		4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */; };
 		4C08ACEA204F01C700863D99 /* keyboardTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C08ACE9204F01C700863D99 /* keyboardTemplate.pdf */; };
 		4C0949591FD6B89B004F2971 /* NSUserNotification+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */; };
 		4C09495C1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C09495B1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m */; };
@@ -29,6 +28,7 @@
 		4C10207F1B750E2F00BFCD59 /* MPTestAutotype.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10207E1B750E2F00BFCD59 /* MPTestAutotype.m */; };
 		4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10412B178CDD44001B5239 /* NSDate+Humanized.m */; };
 		4C15B74618BCA3B1003F8008 /* MPDocument+Search.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C15B74518BCA3B1003F8008 /* MPDocument+Search.m */; };
+		4C17D11E2250EFBC00C650C4 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C17D1202250EFBC00C650C4 /* SavePanelAccessoryView.xib */; };
 		4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */; };
 		4C17F105184E630200E85625 /* 14_BatteryTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F104184E630200E85625 /* 14_BatteryTemplate.pdf */; };
 		4C17F108184E6B6C00E85625 /* 31_PrintTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F106184E6B6C00E85625 /* 31_PrintTemplate.pdf */; };
@@ -339,7 +339,6 @@
 		4C06B17E21D9691F00CD4BBC /* MPPluginStatusTableCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginStatusTableCellView.m; sourceTree = "<group>"; };
 		4C0728BB17B5B7F7005A7DD9 /* MPPasswordEditWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordEditWindowController.h; sourceTree = "<group>"; };
 		4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditWindowController.m; sourceTree = "<group>"; };
-		4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SavePanelAccessoryView.xib; sourceTree = "<group>"; };
 		4C088C401FD9A42800F92502 /* MPPickcharsParser_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickcharsParser_Private.h; sourceTree = "<group>"; };
 		4C08ACE9204F01C700863D99 /* keyboardTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = keyboardTemplate.pdf; path = Icons/keyboardTemplate.pdf; sourceTree = "<group>"; };
 		4C0949571FD6B89B004F2971 /* NSUserNotification+MPAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSUserNotification+MPAdditions.h"; sourceTree = "<group>"; };
@@ -372,6 +371,10 @@
 		4C10412B178CDD44001B5239 /* NSDate+Humanized.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Humanized.m"; sourceTree = "<group>"; };
 		4C15B74518BCA3B1003F8008 /* MPDocument+Search.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Search.m"; sourceTree = "<group>"; };
 		4C168CB02216CEC300BB1EB0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralSettings.strings; sourceTree = "<group>"; };
+		4C17D11F2250EFBC00C650C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SavePanelAccessoryView.xib; sourceTree = "<group>"; };
+		4C17D1222250EFBF00C650C4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
+		4C17D1242250EFC500C650C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
+		4C17D1262250EFC900C650C4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C17D8E317A1C780006C8C1E /* MPDocumentWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowDelegate.h; sourceTree = "<group>"; };
 		4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentWindowDelegate.m; sourceTree = "<group>"; };
 		4C17F104184E630200E85625 /* 14_BatteryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 14_BatteryTemplate.pdf; sourceTree = "<group>"; };
@@ -1287,7 +1290,7 @@
 			children = (
 				4C0F647917B6BC9C00D9522A /* MPSavePanelAccessoryViewController.h */,
 				4C0F647A17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m */,
-				4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */,
+				4C17D1202250EFBC00C650C4 /* SavePanelAccessoryView.xib */,
 			);
 			name = Accessory;
 			sourceTree = "<group>";
@@ -1911,7 +1914,7 @@
 				4C3826AD1AD04D8E007D7D67 /* 32_FileSystemViewTemplate.pdf in Resources */,
 				6021FE6118E15D9100C3BC51 /* WorkflowSettings.xib in Resources */,
 				6021FE8218E160BC00C3BC51 /* PasswordEditWindow.xib in Resources */,
-				4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */,
+				4C17D11E2250EFBC00C650C4 /* SavePanelAccessoryView.xib in Resources */,
 				4CE88B9717BA651C0042E078 /* contextTriangleTemplate.pdf in Resources */,
 				4C7ABA4817BAEC6700FF5799 /* 15_ScannerTemplate.pdf in Resources */,
 				4C7ABA4917BAEC6700FF5799 /* 16_BrowserTemplate.pdf in Resources */,
@@ -2174,6 +2177,17 @@
 			name = OpenPanelAccessoryView.xib;
 			sourceTree = "<group>";
 		};
+		4C17D1202250EFBC00C650C4 /* SavePanelAccessoryView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4C17D11F2250EFBC00C650C4 /* Base */,
+				4C17D1222250EFBF00C650C4 /* de */,
+				4C17D1242250EFC500C650C4 /* en */,
+				4C17D1262250EFC900C650C4 /* nl */,
+			);
+			name = SavePanelAccessoryView.xib;
+			sourceTree = "<group>";
+		};
 		4C45FB21178E09ED0010007D /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -2682,7 +2696,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7.7;
+				CURRENT_PROJECT_VERSION = 0.7.8;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -2737,7 +2751,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.7.7;
+				CURRENT_PROJECT_VERSION = 0.7.8;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

MacPass/Base.lproj/AutotypeCandidateSelectionView.xib

@@ -82,6 +82,7 @@
                                     </tableColumn>
                                 </tableColumns>
                                 <connections>
+                                    <action trigger="doubleAction" selector="selectAutotypeContext:" target="-2" id="NoK-fa-xIL"/>
                                     <outlet property="dataSource" destination="-2" id="4ld-qs-eNP"/>
                                     <outlet property="delegate" destination="-2" id="ibb-G8-tPQ"/>
                                 </connections>

MacPass/Base.lproj/Credits.rtf

@@ -1,17 +1,20 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
-{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;}
+{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 SFProText-Regular;
-{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red9\green79\blue209;\red52\green110\blue183;
+}
-\red38\green38\blue38;}
+{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red9\green79\blue209;\red69\green60\blue204;
-{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;\cssrgb\c0\c40784\c85490\cname linkColor;\csgenericrgb\c20392\c43137\c71765;
+\red52\green110\blue183;\red38\green38\blue38;}
-\csgenericrgb\c14902\c14902\c14902;}
+{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;\cssrgb\c0\c40784\c85490\cname linkColor;\cssrgb\c34510\c33725\c83922;
+\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;}
 \paperw11900\paperh16840\vieww25780\viewh19380\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 
 \f0\b\fs24 \cf2 Project Website:\cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://github.com/mstarke/MacPass"}}{\fldrslt 
+{\field{\*\fldinst{HYPERLINK "https://macpassapp.org"}}{\fldrslt 
-\f1\b0 \cf3 MacPass}}
+\f1\b0 \cf2 macpassapp.org}}
-\f1\b0 \
+\f1\b0 \cf3 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/mstarke/MacPass"}}{\fldrslt \cf3 MacPass}} \cf2 on GitHub.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 
 \f0\b \cf2 \
@@ -38,7 +41,11 @@ You should have received a copy of the GNU General Public License along with thi
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 
 \f1\b0 \cf2 \
-Dutch translation: {\field{\*\fldinst{HYPERLINK "https://github.com/clone1612"}}{\fldrslt \cf3 Jannick Hemelhof}}\cf0 \
+Dutch translation: {\field{\*\fldinst{HYPERLINK "https://github.com/FrankKooij"}}{\fldrslt \cf3 Frank Kooij}}, 
+\f2 \cf4 \expnd0\expndtw0\kerning0
+ {\field{\*\fldinst{HYPERLINK "https://github.com/clone1612"}}{\fldrslt 
+\f1 \cf3 \kerning1\expnd0\expndtw0 Jannick Hemelhof}}
+\f1 \cf0 \kerning1\expnd0\expndtw0 \
 \
 \cf2 French translation:\cf0  {\field{\*\fldinst{HYPERLINK "mailto:gil@panix.com"}}{\fldrslt \cf3 Gil Andr\'e9}}\
 \
@@ -56,17 +63,17 @@ Moises Perez}}\
 \cf2 MacPass\kerning1\expnd0\expndtw3
  \kerning1\expnd0\expndtw0 Icon:\cf0  {\field{\*\fldinst{HYPERLINK "http://iiro.jappinen.me"}}{\fldrslt \cf3 Iiro J\'e4ppinen}}\
 \
-\cf2 Database Icons:\cf0  {\field{\*\fldinst{HYPERLINK "https://github.com/JoannaOlsen"}}{\fldrslt \cf3 Joanna Olsen}}\cf4 \
+\cf2 Database Icons:\cf0  {\field{\*\fldinst{HYPERLINK "https://github.com/JoannaOlsen"}}{\fldrslt \cf3 Joanna Olsen}}\cf5 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt \cf3 KissXML}}\cf5 \
+{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt \cf3 KissXML}}\cf6 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 \cf2 Copyright \'a9 2012 Robbie Hanson. All rights reserved.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf3 MiniKeePass}}\cf5 \
+{\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf3 MiniKeePass}}\cf6 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-\cf2 Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\cf5 \
+\cf2 Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\cf6 \
 	\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/mpowrie/KeePassLib"}}{\fldrslt \cf3 KeePass Database Library}}\
@@ -75,34 +82,35 @@ Moises Perez}}\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org"}}{\fldrslt \cf3 Sparkl\kerning1\expnd0\expndtw3
-e}}\cf5 \kerning1\expnd0\expndtw3
+e}}\cf6 \kerning1\expnd0\expndtw3
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-\cf2 Copyright \'a9 2006 Andy Matuschak. \kerning1\expnd0\expndtw0 All rights reserved.\kerning1\expnd0\expndtw3
+\cf2 \kerning1\expnd0\expndtw3
+Copyright \'a9 2006 Andy Matuschak. \kerning1\expnd0\expndtw0 All rights reserved.\kerning1\expnd0\expndtw3
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 \cf2 \kerning1\expnd0\expndtw0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 NSData+Base64}}\cf5 \
+{\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 NSData+Base64}}\cf6 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 \cf2 Copyright \'a92013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt \cf3 denis2342}}\cf3 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-\cf5 \
+\cf6 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "http://www.cocoadev.com/index.pl?NSDataCategory"}}{\fldrslt \cf3 NSData+Gzip}}\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-\cf2 Extracted from code on the CocoaDev Wiki\cf5 \
+\cf2 Extracted from code on the CocoaDev Wiki\cf6 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 \cf2 Code reused in HNHUISecureTextField\
-Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\cf5 \
+Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\cf6 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
-\cf2 Copyright \'a92008-2009 Jim Dovey, All rights reserved.\cf5 \
+\cf2 Copyright \'a92008-2009 Jim Dovey, All rights reserved.\cf6 \
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/mattt/TransformerKit"}}{\fldrslt \cf3 TransformerKit}}\

MacPass/Base.lproj/DatabaseSettingsWindow.xib

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -48,17 +47,17 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="500" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="553" height="484"/>
+                <rect key="frame" x="0.0" y="0.0" width="500" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="288">
-                        <rect key="frame" x="480" y="13" width="59" height="32"/>
+                        <rect key="frame" x="427" y="13" width="59" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="289">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -71,7 +70,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="956">
-                        <rect key="frame" x="398" y="13" width="82" height="32"/>
+                        <rect key="frame" x="345" y="13" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="957">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -84,7 +83,7 @@ Gw
                         </connections>
                     </button>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="357">
-                        <rect key="frame" x="13" y="41" width="527" height="437"/>
+                        <rect key="frame" x="13" y="41" width="474" height="313"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="358">
@@ -99,7 +98,7 @@ Gw
                                             </constraints>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="232">
                                                 <font key="font" metaFont="system"/>
-                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
@@ -120,7 +119,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1394">
-                                            <rect key="frame" x="152" y="73" width="70" height="26"/>
+                                            <rect key="frame" x="152" y="73" width="71" height="25"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="1395">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -158,30 +157,30 @@ Gw
                                         </colorWell>
                                         <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1530">
                                             <rect key="frame" x="154" y="117" width="280" height="100"/>
-                                            <clipView key="contentView" id="WOI-1v-RCe">
+                                            <clipView key="contentView" drawsBackground="NO" id="WOI-1v-RCe">
                                                 <rect key="frame" x="1" y="1" width="278" height="98"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="1531">
                                                         <rect key="frame" x="0.0" y="0.0" width="278" height="98"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <size key="minSize" width="278" height="98"/>
                                                         <size key="maxSize" width="463" height="10000000"/>
-                                                        <color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                                        <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                     </textView>
                                                 </subviews>
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             </clipView>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="100" id="8fE-cP-ksD"/>
                                                 <constraint firstAttribute="width" constant="280" id="J06-kE-yVi"/>
                                             </constraints>
-                                            <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="1532">
+                                            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="1532">
                                                 <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
-                                            <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="1533">
+                                            <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="1533">
                                                 <rect key="frame" x="263" y="1" width="16" height="98"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
@@ -241,7 +240,7 @@ Gw
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ek-Rg-w82">
-                                            <rect key="frame" x="150" y="199" width="155" height="26"/>
+                                            <rect key="frame" x="150" y="199" width="155" height="25"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="F8Y-Uw-4mL"/>
                                             </constraints>
@@ -252,7 +251,7 @@ Gw
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vH7-5a-52C">
-                                            <rect key="frame" x="73" y="206" width="73" height="17"/>
+                                            <rect key="frame" x="73" y="205" width="73" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encryption:" id="gxY-UL-bEG">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -262,18 +261,18 @@ Gw
                                         <box title="Key derivation" translatesAutoresizingMaskIntoConstraints="NO" id="pbl-Mb-r8V">
                                             <rect key="frame" x="17" y="16" width="420" height="178"/>
                                             <view key="contentView" id="hkT-SX-Te1">
-                                                <rect key="frame" x="2" y="2" width="416" height="161"/>
+                                                <rect key="frame" x="3" y="3" width="414" height="160"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P98-Cu-Tha">
-                                                        <rect key="frame" x="253" y="18" width="143" height="25"/>
+                                                        <rect key="frame" x="251.5" y="18" width="143" height="23"/>
                                                         <buttonCell key="cell" type="roundTextured" title="Generate Parameters" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PoI-Er-Y8P">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
                                                     </button>
                                                     <tabView drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="2MY-PW-kzL">
-                                                        <rect key="frame" x="13" y="50" width="390" height="62"/>
+                                                        <rect key="frame" x="12" y="49" width="390" height="62"/>
                                                         <font key="font" metaFont="system"/>
                                                         <tabViewItems>
                                                             <tabViewItem label="Aes" identifier="1" id="ft1-pl-lpO">
@@ -299,7 +298,7 @@ Gw
                                                                                     <real key="minimum" value="0.0"/>
                                                                                 </numberFormatter>
                                                                                 <font key="font" metaFont="system"/>
-                                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
@@ -347,7 +346,7 @@ Gw
                                                                                     <real key="maximum" value="16777215"/>
                                                                                 </numberFormatter>
                                                                                 <font key="font" metaFont="system"/>
-                                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
@@ -359,7 +358,7 @@ Gw
                                                                                     <real key="maximum" value="4294967295"/>
                                                                                 </numberFormatter>
                                                                                 <font key="font" metaFont="system"/>
-                                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
@@ -415,7 +414,7 @@ Gw
                                                         </tabViewItems>
                                                     </tabView>
                                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2cq-R3-Ksh">
-                                                        <rect key="frame" x="131" y="117" width="155" height="26"/>
+                                                        <rect key="frame" x="130" y="116" width="155" height="25"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="Pb9-YV-rYe">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="menu"/>
@@ -426,7 +425,7 @@ Gw
                                                         </connections>
                                                     </popUpButton>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4el-r1-iRL">
-                                                        <rect key="frame" x="64" y="124" width="63" height="17"/>
+                                                        <rect key="frame" x="63" y="122" width="63" height="17"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Algorithm" id="GVd-KH-pHc">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -494,7 +493,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1294">
-                                            <rect key="frame" x="255" y="324" width="19" height="27"/>
+                                            <rect key="frame" x="255" y="325" width="19" height="27"/>
                                             <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="1295"/>
                                         </stepper>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1268">
@@ -522,18 +521,18 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="599">
-                                            <rect key="frame" x="255" y="296" width="19" height="27"/>
+                                            <rect key="frame" x="255" y="297" width="19" height="27"/>
                                             <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="600"/>
                                         </stepper>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="535">
-                                            <rect key="frame" x="184" y="265" width="137" height="18"/>
+                                            <rect key="frame" x="184" y="266" width="137" height="18"/>
                                             <buttonCell key="cell" type="check" title="Enable Recycle Bin" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="536">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="678">
-                                            <rect key="frame" x="184" y="235" width="37" height="26"/>
+                                            <rect key="frame" x="184" y="236" width="38" height="25"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="679">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -541,10 +540,10 @@ Gw
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="U7M-MH-EFw">
-                                            <rect key="frame" x="20" y="287" width="467" height="5"/>
+                                            <rect key="frame" x="20" y="288" width="467" height="5"/>
                                         </box>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1582">
-                                            <rect key="frame" x="63" y="199" width="117" height="17"/>
+                                            <rect key="frame" x="63" y="200" width="117" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Default Username:" id="1591">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -552,15 +551,15 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1730">
-                                            <rect key="frame" x="186" y="196" width="301" height="22"/>
+                                            <rect key="frame" x="186" y="197" width="301" height="22"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="1731">
                                                 <font key="font" metaFont="system"/>
-                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1738">
-                                            <rect key="frame" x="184" y="152" width="37" height="26"/>
+                                            <rect key="frame" x="184" y="153" width="38" height="25"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="1739">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -568,7 +567,7 @@ Gw
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19r-LE-7X5">
-                                            <rect key="frame" x="186" y="94" width="128" height="22"/>
+                                            <rect key="frame" x="186" y="95" width="128" height="22"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="128" id="COb-0V-OmT"/>
                                             </constraints>
@@ -584,21 +583,21 @@ Gw
                                             <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="qQV-3d-GpK"/>
                                         </stepper>
                                         <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Hqc-B0-xyz">
-                                            <rect key="frame" x="184" y="122" width="171" height="18"/>
+                                            <rect key="frame" x="184" y="123" width="171" height="18"/>
                                             <buttonCell key="cell" type="check" title="Recommend key change" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="CtU-Eq-dgy">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="upv-b3-vCc">
-                                            <rect key="frame" x="184" y="70" width="129" height="18"/>
+                                            <rect key="frame" x="184" y="71" width="129" height="18"/>
                                             <buttonCell key="cell" type="check" title="Force key change" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="z6u-YT-7LE">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VYh-cm-fix">
-                                            <rect key="frame" x="186" y="42" width="128" height="22"/>
+                                            <rect key="frame" x="186" y="43" width="128" height="22"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="M9G-Yy-1s4">
                                                 <customFormatter key="formatter" id="3Ax-U4-Ofb" customClass="MPDayCountFormatter"/>
                                                 <font key="font" metaFont="system"/>
@@ -619,7 +618,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="I0d-r2-ySf">
-                                            <rect key="frame" x="20" y="144" width="467" height="5"/>
+                                            <rect key="frame" x="20" y="145" width="467" height="5"/>
                                         </box>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NPm-5h-2Mz">
                                             <rect key="frame" x="65" y="242" width="115" height="17"/>
@@ -630,7 +629,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OmP-GD-2nA">
-                                            <rect key="frame" x="27" y="111" width="153" height="17"/>
+                                            <rect key="frame" x="27" y="98" width="153" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Recommend key change" id="Xib-Fn-sqx">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -638,7 +637,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="S0c-4E-42z">
-                                            <rect key="frame" x="56" y="59" width="124" height="17"/>
+                                            <rect key="frame" x="56" y="46" width="124" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Enforce key change" id="5QH-N1-FHK">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -646,7 +645,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="VMc-Qg-eCr">
-                                            <rect key="frame" x="184" y="18" width="257" height="18"/>
+                                            <rect key="frame" x="184" y="19" width="257" height="18"/>
                                             <buttonCell key="cell" type="check" title="Force key change once after unlocking" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="pA1-aL-KjT">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>

MacPass/MPAddEntryContextMenuDelegate.m

@@ -24,6 +24,7 @@
 #import "MPDocument.h"
 #import "MPDocumentWindowController.h"
 #import "MPActionHelper.h"
+#import "KPKNode+IconImage.h"
 
 #import "KeePassKit/KeePassKit.h"
 
@@ -47,6 +48,8 @@
     NSMenuItem *templateItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:templateMask, entry.title]
                                                                                     action:@selector(createEntryFromTemplate:)
                                                                              keyEquivalent:@""];
+    templateItem.image = [entry.iconImage copy];
+    templateItem.image.size = NSMakeSize(14, 14);
     templateItem.representedObject = entry.uuid;
     [menu addItem:templateItem];
   }

MacPass/MPEntryInspectorViewController.m

@@ -201,7 +201,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
 }
 - (void)removeCustomField:(id)sender {
   NSInteger rowIndex = [self.customFieldsTableView rowForView:sender];
-  NSAssert(rowIndex > 0 && rowIndex < self.representedEntry.customAttributes.count, @"Invalid custom attribute index.");
+  NSAssert(rowIndex >= 0 && rowIndex < self.representedEntry.customAttributes.count, @"Invalid custom attribute index.");
   KPKAttribute *attribute = self.representedEntry.customAttributes[rowIndex];
   [self.observer willChangeModelProperty];
   [self.representedEntry removeCustomAttribute:attribute];

MacPass/MPPasswordCreatorViewController.m

@@ -241,6 +241,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
     [NSUserDefaults.standardUserDefaults setInteger:self.characterFlags forKey:kMPSettingsKeyPasswordCharacterFlags];
     [NSUserDefaults.standardUserDefaults setBool:self.useCustomString forKey:kMPSettingsKeyPasswordUseCustomString];
     [NSUserDefaults.standardUserDefaults setObject:self.customCharactersTextField.stringValue forKey:kMPSettingsKeyPasswordCustomString];
+    [NSUserDefaults.standardUserDefaults setBool:self.ensureOccurance forKey:kMPSettingsKeyPasswordEnsureOccurance];
   }
   else {
     NSLog(@"Cannot set password generator defaults. Inconsistent state. Aborting.");
@@ -274,10 +275,8 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
 }
 
 - (void)setRepresentedObject:(id)representedObject {
-  if(self.representedObject != representedObject) {
-    self.useEntryDefaults = [self _hasValidDefaultsForCurrentEntry];
-  }
   [super setRepresentedObject:representedObject];
+  self.useEntryDefaults = [self _hasValidDefaultsForCurrentEntry];
 }
 
 - (void)setPassword:(NSString *)password {
@@ -307,6 +306,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
 
 - (void)setEnsureOccurance:(BOOL)useCharacterFromEachGroup {
   if(self.ensureOccurance != useCharacterFromEachGroup) {
+    self.setDefaultButton.enabled = YES;
     _ensureOccurance = useCharacterFromEachGroup;
     [self _resetCharacters];
     [self _generatePassword:nil];

MacPass/MPPathControl.m

@@ -10,10 +10,15 @@
 
 @implementation MPPathControl
 
-- (BOOL)canBecomeKeyView {
+/*- (BOOL)canBecomeKeyView {
   return YES;
 }
 
+- (BOOL)acceptsFirstResponder {
+  return YES;
+}
+*/
+
 - (instancetype)initWithFrame:(NSRect)frameRect {
   self = [super initWithFrame:frameRect];
   self.delegate = self;

MacPass/de.lproj/Localizable.strings

@@ -433,7 +433,7 @@
 "NEW_ENTRY" = "Neuer Eintrag";
 
 /* Submenu to add an entry via template */
-"NEW_ENTRY_WITH_TEMPLATE_%@" = "Neuer Eintrag aus Vorlage %@";
+"NEW_ENTRY_WITH_TEMPLATE_%@" = "mit %@";
 
 /* Action name for a newly created group
    Menu item to create a new group

MacPass/de.lproj/SavePanelAccessoryView.strings

@@ -0,0 +1,15 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "4"; */
+"4.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "KeePass 1 (KDB)"; ObjectID = "5"; */
+"5.title" = "KeePass 1 (KDB)";
+
+/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX)"; ObjectID = "6"; */
+"6.title" = "KeePass 2 (KDBX)";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "12"; */
+"12.title" = "Format:";
+
+/* Class = "NSTextFieldCell"; title = "Not all Information inside your current database can be stored with this format."; ObjectID = "52"; */
+"52.title" = "Es können nicht alle Informationen der Datenbank in diesem Format gespeichert werden.";

MacPass/en.lproj/Localizable.strings

@@ -433,7 +433,7 @@
 "NEW_ENTRY" = "New Entry";
 
 /* Submenu to add an entry via template */
-"NEW_ENTRY_WITH_TEMPLATE_%@" = "Create Entry with Template %@";
+"NEW_ENTRY_WITH_TEMPLATE_%@" = "from %@";
 
 /* Action name for a newly created group
    Menu item to create a new group

MacPass/en.lproj/SavePanelAccessoryView.strings

@@ -0,0 +1,15 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "4"; */
+"4.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "KeePass 1 (KDB)"; ObjectID = "5"; */
+"5.title" = "KeePass 1 (KDB)";
+
+/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX)"; ObjectID = "6"; */
+"6.title" = "KeePass 2 (KDBX)";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "12"; */
+"12.title" = "Format:";
+
+/* Class = "NSTextFieldCell"; title = "Not all Information inside your current database can be stored with this format."; ObjectID = "52"; */
+"52.title" = "Not all Information inside your current database can be stored with this format.";

MacPass/nl.lproj/AutotypeCandidateSelectionView.strings

@@ -2,7 +2,7 @@
 "60p-7v-Nje.title" = "Annuleer";
 
 /* Class = "NSTextFieldCell"; title = "There are multiple matches for the current window. Please select which match should be used."; ObjectID = "gcf-gb-ZsF"; */
-"gcf-gb-ZsF.title" = "MacPass heeft meerdere overeenkomsten gevonden voor deze website. Selecteer de identiteit waarmee je automatisch wilt inloggen.";
+"gcf-gb-ZsF.title" = "MacPass heeft meerdere overeenkomsten gevonden voor deze website. Selecteer de identiteit waarmee je wilt inloggen.";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "PKW-gr-yqN"; */
 "PKW-gr-yqN.title" = "";

MacPass/nl.lproj/ContextBar.strings

@@ -50,7 +50,7 @@
 "wC4-fF-dLW.title" = "Overige weergaven";
 
 /* Class = "NSButtonCell"; title = "Everywhere"; ObjectID = "WMK-bb-ESj"; */
-"WMK-bb-ESj.title" = "Overal";
+"WMK-bb-ESj.title" = "Alles";
 
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
 "z4I-cp-nhf.label" = "Geschiedenis";

MacPass/nl.lproj/InfoPlist.strings

@@ -7,9 +7,6 @@
 /* (No Comment) */
 "MacPass Plugin" = "Extensie voor MacPass";
 
-/* (No Comment) */
-"NSHumanReadableCopyright" = "Copyright ©2012-2019 HicknHack Software GmbH. Alle rechten voorbehouden.";
-
 /* (No Comment) */
 "XML" = "XML";
 

MacPass/nl.lproj/Localizable.strings

@@ -1,3 +1,6 @@
+/* Count of characters remaining in pickchars dialog */
+"%ld_CHARACTERS_TO_PICK_REMAINING" = "%ld tekens over om te kiezen";
+
 /* Display format for days. Should contain a long decimal placeholder! */
 "%ld_DAYS" = "%ld dagen";
 
@@ -34,6 +37,9 @@
 /* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
 "ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "Bevoegdheid om automatisch in te loggen ontbreekt";
 
+/* Button in dialog to leave plugin ds disabled and continiue! */
+"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "OK";
+
 /* Button in dialog to open plugin preferences pane! */
 "ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OPEN_PREFERENCES" = "Toon extensievoorkeuren…";
 
@@ -84,7 +90,7 @@
 "AUTOTYPE_INHERIT" = "Erf voorkeuren voor automatisch inloggen";
 
 /* Message displayed to the user to unlock the database to perform global autotype */
-"AUTOTYPE_MESSAGE_UNLOCK_DATABASE" = "Ontgrendel de wachtwoordenkluis om automatisch in te loggen";
+"AUTOTYPE_MESSAGE_UNLOCK_DATABASE" = "Ontgrendel de wachtwoordenkluis om in te loggen.";
 
 /* Disable autotype menu item */
 "AUTOTYPE_NO" = "Deactiveer automatisch inloggen";
@@ -93,11 +99,14 @@
 "AUTOTYPE_NOTIFICATION_MACPASS_HAS_NO_ACCESSIBILTY_PERMISSIONS" = "Automatisch inloggen is niet beschikbaar, omdat MacPass geen toestemming heeft om je computer te besturen. Kies Apple-menu >'Systeemvoorkeuren', klik op 'Beveiliging en privacy', klik vervolgens op 'Privacy' en voeg MacPass toe aan de groep Toegankelijkheid om automatisch inloggen aan te zetten. Stop en open MacPass opnieuw om de wijziging door te voeren.";
 
 /* Notification: Autotype failed, no documents are open */
-"AUTOTYPE_OVERLAY_NO_DOCUMENTS" = "Open een wachtwoordenkluis om automatisch in te kunnen loggen";
+"AUTOTYPE_OVERLAY_NO_DOCUMENTS" = "Open een wachtwoordenkluis om automatisch te kunnen inloggen.";
 
 /* Noticiation: Autotype failed to find a match for %@ (string placeholder) */
 "AUTOTYPE_OVERLAY_NO_MATCH_FOR_%@" = "Geen overeenkomst gevonden voor %@";
 
+/* Notification: Autotype found a single match for %@ (string placeholder). */
+"AUTOTYPE_OVERLAY_SINGLE_MATCH_FOR_%@" = "Automatisch ingelogd op %@.";
+
 /* Enable autotype menu item */
 "AUTOTYPE_YES" = "Activeer automatisch inloggen";
 
@@ -388,7 +397,7 @@
 "NOTES" = "Notities";
 
 /* Ok Button to dismiss disabled updates alert */
-"OK" = "";
+"OK" = "OK";
 
 /* preset to expire after one montch from now */
 "ONE_MONTH" = "één maand";
@@ -452,6 +461,15 @@
 /* Menu item to perform autotype with the selected entry */
 "PERFORM_AUTOTYPE_FOR_ENTRY" = "Log automatisch in";
 
+/* Info about how many character has to pick in pickchar dialog */
+"PICKCHAR_INFO_MESSAGE_PICK_CHARACTERS_%ld" = "Kies %ld tekens";
+
+/* Window displayed to the user to pick an amout of characters */
+"PICKCHAR_WINDOW_TITLE" = "Tekenkeuze";
+
+/* Count of picked characters in pickchars dialog if no limit is set */
+"PICKED_%ld_CHARACTERS" = "%ld tekens gekozen";
+
 /* Label for the button when a download did not succeed */
 "PLUGIN_BROWSER_ACTION_RETRY_FAILED_DOWNLOAD" = "Mislukt. Probeer opnieuw.";
 
@@ -470,6 +488,12 @@
 /* Status for an uninstalled plugin in the plugin browser */
 "PLUGIN_BROWSER_PLUGIN_NOT_INSTALLED" = "Niet geïnstalleerd";
 
+/* Status for an unkonw plugin version in the plugin browser */
+"PLUGIN_BROWSER_UNKNOWN_PLUGIN_VERSION_INSTALLED_%@" = "Onbekende versie %@ geïnstalleerd";
+
+/* Error for a plugin that is disabled. */
+"PLUGIN_ERROR_DISABLED_PLUGIN" = "De extensie is uitgeschakeld door de gebruiker";
+
 /* Plugin is not with this version of MacPass */
 "PLUGIN_ERROR_HOST_VERSION_NOT_SUPPORTED" = "De extensie is niet compatibel met deze versie van MacPass";
 
@@ -553,7 +577,7 @@
 "SELECT_FILE_TO_MERGE" = "Kies een wachtwoordenkluis om mee samen te voegen";
 
 /* Menu displayed as popup selection for search options if no filter is selected */
-"SELECT_FILTER_WITH_DOTS" = "Selecteer…";
+"SELECT_FILTER_WITH_DOTS" = "Filter…";
 
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */

MacPass/nl.lproj/Localizable.stringsdict

@@ -13,11 +13,11 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>ld</string>
 			<key>one</key>
-			<string>One character remaining</string>
+			<string>Eén teken over</string>
 			<key>other</key>
-			<string>%ld characters remaining</string>
+			<string>%ld tekens over</string>
 			<key>zero</key>
-			<string>All characters picked</string>
+			<string>Alle tekens gekozen</string>
 		</dict>
 	</dict>
 	<key>DUPLICATE_ENTRIES_%ld</key>
@@ -67,11 +67,11 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>ld</string>
 			<key>one</key>
-			<string>Please pick a single character to use</string>
+			<string>Kies één teken om te gebruiken</string>
 			<key>other</key>
-			<string>Please pick %ld characters to use</string>
+			<string>Kies %ld tekens om te gebruiken</string>
 			<key>zero</key>
-			<string>Please pick the characters to use</string>
+			<string>Kies de tekens om te gebruiken</string>
 		</dict>
 	</dict>
 	<key>PICKED_%ld_CHARACTERS</key>
@@ -85,11 +85,11 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>ld</string>
 			<key>one</key>
-			<string>%ld character picked</string>
+			<string>%ld teken gekozen</string>
 			<key>other</key>
-			<string>%ld characters picked</string>
+			<string>%ld tekens gekozen</string>
 			<key>zero</key>
-			<string>No characters picked</string>
+			<string>Geen tekens gekozen</string>
 		</dict>
 	</dict>
 </dict>

MacPass/nl.lproj/MainMenu.strings

@@ -2,7 +2,7 @@
 "2VP-vB-IeX.title" = "Blader door onderdelen";
 
 /* Class = "NSMenuItem"; title = "Item"; ObjectID = "3st-rv-EeQ"; */
-"3st-rv-EeQ.title" = "";
+"3st-rv-EeQ.title" = "Onderdeel";
 
 /* Class = "NSMenu"; title = "Import"; ObjectID = "4q9-u1-pcm"; */
 "4q9-u1-pcm.title" = "Importeer";
@@ -179,7 +179,7 @@
 "rW0-r1-QYL.title" = "Importeer XML…";
 
 /* Class = "NSMenu"; title = "Item"; ObjectID = "Ttt-tR-emo"; */
-"Ttt-tR-emo.title" = "";
+"Ttt-tR-emo.title" = "Onderdeel";
 
 /* Class = "NSMenuItem"; title = "Export"; ObjectID = "tz9-yK-pOf"; */
 "tz9-yK-pOf.title" = "Exporteer";

MacPass/nl.lproj/PasswordCreatorView.strings

@@ -41,7 +41,7 @@
 "cfZ-5F-Nge.title" = "Gebruik deze toegestane tekens eenmalig";
 
 /* Class = "NSButtonCell"; title = "Use characters from every group"; ObjectID = "CMc-Uh-Fo5"; */
-"CMc-Uh-Fo5.title" = "Gebruik tekens uit elke groep";
+"CMc-Uh-Fo5.title" = "Gebruik tekens uit elke toegestane groep";
 
 /* Class = "NSButtonCell"; title = "Set Default"; ObjectID = "Wvs-Md-Ob8"; */
 "Wvs-Md-Ob8.title" = "Stel de standaardwaarde in";

MacPass/nl.lproj/PickfieldView.strings

@@ -1,6 +1,9 @@
 /* Class = "NSButtonCell"; title = "Select"; ObjectID = "6Wi-9i-Tcb"; */
 "6Wi-9i-Tcb.title" = "Kies";
 
+/* Class = "NSTextFieldCell"; title = "Please pick a field value to be inserted"; ObjectID = "aJS-22-6Va"; */
+"aJS-22-6Va.title" = "Kies een waarde om in te voegen";
+
 /* Class = "NSTableColumn"; headerCell.title = "Value"; ObjectID = "rVo-ud-5fs"; */
 "rVo-ud-5fs.headerCell.title" = "Waarde";
 

MacPass/nl.lproj/SavePanelAccessoryView.strings

@@ -0,0 +1,15 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "4"; */
+"4.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "KeePass 1 (KDB)"; ObjectID = "5"; */
+"5.title" = "KeePass 1 (KDB)";
+
+/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX)"; ObjectID = "6"; */
+"6.title" = "KeePass 2 (KDBX)";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "12"; */
+"12.title" = "Format:";
+
+/* Class = "NSTextFieldCell"; title = "Not all Information inside your current database can be stored with this format."; ObjectID = "52"; */
+"52.title" = "Not all Information inside your current database can be stored with this format.";

README.md

@@ -104,92 +104,88 @@ The following list might not be complete, please refer to [merged Pull Requests]
 
 ### Contributors
 
-[ad](github.mnms@mamber.net)
+[ad](mailto:github.mnms@mamber.net)
-[Alex Borisov](alex@alexborisov.org)
+[Alex Borisov](mailto:alex@alexborisov.org)
-[Alex Seeholzer](seeholzer@gmail.com)
+[Alex Seeholzer](mailto:seeholzer@gmail.com)
-[amd](amd@gurge.com)
+[amd](mailto:amd@gurge.com)
-[Andrew Schleifer](me@andrewschleifer.name)
+[Andrew Schleifer](mailto:me@andrewschleifer.name)
-[AntoineCa](antoine@carrincazeaux.fr)
+[AntoineCa](mailto:antoine@carrincazeaux.fr)
-[Benjamin Steinwender](b@stbe.at)
+[Benjamin Steinwender](mailto:b@stbe.at)
-[binarious](bieder.martin@googlemail.com)
+[binarious](mailto:bieder.martin@googlemail.com)
-[Carlos Filipe Simões](ravemir@users.noreply.github.com)
+[Can Rau](mailto:cansrau@gmail.com)
-[Chester Liu](skyline75489@outlook.com)
+[Carlos Filipe Simões](mailto:ravemir@users.noreply.github.com)
-[Chhom Seng](chhom.seng@gmail.com)
+[Chester Liu](mailto:skyline75489@outlook.com)
-[Christoph Leimbrock](christoph.leimbrock@gmx.de)
+[Chhom Seng](mailto:chhom.seng@gmail.com)
-[Cory Hutchison](cjhutchi@users.noreply.github.com)
+[Christoph Leimbrock](mailto:christoph.leimbrock@gmx.de)
-[Daniele Polencic](daniele.polencic@gmail.com)
+[Cory Hutchison](mailto:cjhutchi@users.noreply.github.com)
-[darnel](vojta.j@gmail.com)
+[Daniele Polencic](mailto:daniele.polencic@gmail.com)
-[Deiwin Sarjas](deiwin.sarjas@gmail.com)
+[darnel](mailto:vojta.j@gmail.com)
-[Dennis Bolio](git@bolio.nl)
+[Deiwin Sarjas](mailto:deiwin.sarjas@gmail.com)
-[Dylan Smith](dylansmith@gmail.com)
+[Dennis Bolio](mailto:git@bolio.nl)
-[eiermaaaan](37532252+eiermaaaan@users.noreply.github.com)
+[Dylan Smith](mailto:dylansmith@gmail.com)
-[Filipe Farinha](filipe@ktorn.com)
+[eiermaaaan](mailto:37532252+eiermaaaan@users.noreply.github.com)
-[floriangouy](florian.gouy@gmail.com)
+[Erwann Mest](mailto:m+github@kud.io)
-[Francesco Servida](info@francescoservida.ch)
+[Filipe Farinha](mailto:filipe@ktorn.com)
-[Frank Enderle](frank.enderle@anamica.de)
+[floriangouy](mailto:florian.gouy@gmail.com)
-[Frank Kooij](FrankKooij@users.noreply.github.com)
+[Francesco Servida](mailto:info@francescoservida.ch)
-[Gaétan Ryckeboer](gryckeboer@jouve.com)
+[Frank Enderle](mailto:frank.enderle@anamica.de)
-[Geigi](git@geigi.de)
+[Frank Kooij](https://github.com/FrankKooij)
-[Henri de Jong](henridejong@gmail.com)
+[Gaétan Ryckeboer](mailto:gryckeboer@jouve.com)
-[James Hurst](jamesrhurst@outlook.com)
+[Geigi](mailto:git@geigi.de)
-[Jannick Hemelhof](mister.jannick@gmail.com)
+[Henri de Jong](mailto:henridejong@gmail.com)
-[Jefftree](jeffrey.ying86@live.com)
+[James Hurst](mailto:jamesrhurst@outlook.com)
-[Jellyfrog](Jellyfrog@users.noreply.github.com)
+[Jannick Hemelhof](mailto:mister.jannick@gmail.com)
-[Joanna Olsen](jo4flash@gmail.com)
+[Jefftree](mailto:jeffrey.ying86@live.com)
-[Josh Halstead](jhalstead85@gmail.com)
+[Jellyfrog](mailto:Jellyfrog@users.noreply.github.com)
-[Kurt](kurt@soapbox-software.com)
+[Joanna Olsen](mailto:jo4flash@gmail.com)
-[Lenucksi](lenucksi@users.noreply.github.com)
+[Josh Halstead](mailto:jhalstead85@gmail.com)
-[Leonardo Faoro](lfaoro@users.noreply.github.com)
+[Kurt](mailto:kurt@soapbox-software.com)
-[Liam Anderson](liam.anderson.91@gmail.com)
+[Laurent Cozic](mailto:laurent22@users.noreply.github.com)
-[Maarten Terpstra](m.l.terpstra@student.rug.nl)
+[Lenucksi](mailto:lenucksi@users.noreply.github.com)
-[Mario Sangiorgio](mariosangiorgio@gmail.com)
+[Leonardo Faoro](mailto:lfaoro@users.noreply.github.com)
-[MBibal](michel.bibal@gmail.com)
+[Liam Anderson](mailto:liam.anderson.91@gmail.com)
-[Michael Belz](mbelz@outlook.de)
+[m0yP](mailto:moises@perez.lt)
-[MichaelKo](viacheslav.sychov@gmail.com)
+[Maarten Terpstra](mailto:m.l.terpstra@student.rug.nl)
-[Michal Jaglewicz](michalj@webii.pl)
+[Mario Sangiorgio](mailto:mariosangiorgio@gmail.com)
-[Moises Perez](moises@perez.lt)
+[MBibal](mailto:michel.bibal@gmail.com)
-[mrdoggy](mrdoggy.all@gmail.com)
+[Michael Belz](mailto:mbelz@outlook.de)
-[Nathan Landis](nathanlandis@gmail.com)
+[MichaelKo](mailto:viacheslav.sychov@gmail.com)
-[Nathaniel Madura](nmadura@umich.edu)
+[Michal Jaglewicz](mailto:michalj@webii.pl)
-[neuroine](d.dzieduch@gmail.com)
+[Moises Perez](mailto:moises@perez.lt)
-[Patrik Thunström](magebarf@gmail.com)
+[mrdoggy](mailto:mrdoggy.all@gmail.com)
-[rdoering](rdoering.info@gmail.com)
+[Nathan Landis](mailto:nathanlandis@gmail.com)
-[Ryan Rogers](ryan@timewasted.me)
+[Nathaniel Madura](mailto:nmadura@umich.edu)
-[Sitsofe Wheeler](sitsofe@yahoo.com)
+[neuroine](mailto:d.dzieduch@gmail.com)
-[Stephen Taylor](schtee.taylor@gmail.com)
+[Patrik Thunström](mailto:magebarf@gmail.com)
-[Thom](thomscode@gmail.com)
+[rdoering](mailto:rdoering.info@gmail.com)
-[Thorsten Jacoby](tjacoby@gmail.com)
+[remi6397](mailto:remi6397@gmail.com)
-[Volcyy](Volcyy@users.noreply.github.com)
+[Roman Verchikov](mailto:roman-verchikov@users.noreply.github.com)
-[Yonatan Mittlefehldt](yono@toojuice.com)
+[Ryan Rogers](mailto:ryan@timewasted.me)
-[Zero King](l2dy@icloud.com)
+[Sitsofe Wheeler](mailto:sitsofe@yahoo.com)
-[Zhao Peng](patchao2000@gmail.com)
+[Stephen Taylor](mailto:schtee.taylor@gmail.com)
+[thesoundofom](mailto:45923716+thesoundofom@users.noreply.github.com)
+[Thom](mailto:thomscode@gmail.com)
+[Thorsten Jacoby](mailto:tjacoby@gmail.com)
+[Volcyy](mailto:Volcyy@users.noreply.github.com)
+[Yonatan Mittlefehldt](mailto:yono@toojuice.com)
+[Zero King](mailto:l2dy@icloud.com)
+[Zhao Peng](mailto:patchao2000@gmail.com)
 
 ## Copyright
 
 This Project is based upon the following work:
 
 [KeePassKit](https://github.com/mstarke/KeePassKit) Copyright 2012 HicknHack Software GmbH. All rights reserved.  
-
 [HNHUi](https://github.com/mstarke/HNHUi) Copyright 2012 HicknHack Software GmbH. All rights reserved.  
-
 [MiniKeePass](https://github.com/MiniKeePass/MiniKeePass) Copyright 2011 Jason Rush and John Flanagan. All rights reserved.  
-
 [KeePass Database Library](https://github.com/mpowrie/KeePassLib) Copyright 2010 Qiang Yu. All rights reserved.  
-
 [PXSourceList](https://github.com/Perspx/PXSourceList) Copyright 2011, Alex Rozanski. All rights reserved.  
-
 [KSPasswordField](https://github.com/karelia/SecurityInterface) Copyright 2012 Mike Abdullah, Karelia Software. All rights reserved.  
-
 [DDHotKey](https://github.com/davedelong/DDHotKey) Copyright [Dave DeLong](http://www.davedelong.com). All rights reserved.  
-
 [Sparkle](http://sparkle.andymatuschak.org) Copyright 2006 Andy Matuschak  
-
 [TransformerKit](https://github.com/mattt/TransformerKit) Licensed under MIT license. Copyright 2012 [Mattt Thompson](http://mattt.me/). All rights reserved  
-
 [MJGFoundation](https://github.com/mstarke/MJGFoundation) Licensed under BSD 2-Clause License. Copyright 2011 [Matt Galloway](http://www.galloway.me.uk/). All rights reserved.  
-
 [ShortcutRecorder](http://wafflesoftware.net/shortcut/) Copyright 2006—2013 all [Shortcut Recorder contributors](http://wafflesoftware.net/shortcut/contributors/)  
-
 [NSBundle Codesignature Check](http://jedda.me/2012/03/verifying-plugin-bundles-using-code-signing/) Copyright 2014 [Jedda Wignall](http://jedda.me). All rights reserved.
 
 See submodules for additional Licenses

scripts/list_of_contributors.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 # prints the list of contributors in markdown format
-git log --pretty="[%an](%ae)" | sort | uniq
+git log --pretty="[%an](mailto:%ae), " | sort -fu