Merge branch 'master' of https://github.com/mstarke/MacPass

# Conflicts:
#	MacPass/fr.lproj/Localizable.strings

MacPass/MPAppDelegate.m

@@ -283,7 +283,22 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
   if(isFileURL) {
     [documentController openDocumentWithContentsOfURL:documentUrl
                                               display:YES
-                                    completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {}];
+                                    completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
+                                    
+                                      if(error != nil){
+                                        
+                                        NSAlert *alert = [[NSAlert alloc] init];
+                                        [alert setMessageText:   NSLocalizedString(@"FILE_OPEN_ERROR", nil)];
+                                        [alert setInformativeText: [error localizedDescription]];
+                                        [alert setAlertStyle:NSCriticalAlertStyle ];
+                                        [alert runModal];
+                                      }
+                                      
+                                      if(document == nil){
+                                        [self _showWelcomeWindow];
+                                      }
+                                    
+                                    }];
   }
   return isFileURL;
 }

MacPass/de.lproj/GeneralSettings.strings

@@ -52,3 +52,14 @@
 
 /* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
 "806.title" = "Sperren nach Inaktivität";
+
+/* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
+"ACh-7H-42N.title" = "Das Einschalten dieser Option beeinträchtigt die Sicherheit. Wird diese Option aktiviert, werden Pfadangaben von Datenbank und Schlüsseldatei in den persönlichen Einstellungen gespeichert. Zu Datenbanken ohne Passwort wird kein Schlüsseldatei-Pfad gespeichert.";
+
+/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
+"r6q-He-nYU.title" = "Schlüsseldatei merken";
+
+/* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
+"8Ri-2s-c39.title" = "Gespeicherte Pfadangaben löschen";
+
+

MacPass/de.lproj/IntegrationSettings.strings

@@ -22,3 +22,9 @@
 
 /* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
 "WmI-IB-Aso.title" = "Die Daten werden zur Vorschau in einen temporären Ordern entschlüsselt und beim Beenden der Vorschau wieder gelöscht. Diese Feature ist eine potentielle Sicherheitslücke!";
+
+/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
+"QfO-yG-l3F.title" = "^ als ⌘ interpretieren";
+
+/* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
+"QRy-CY-ENC.title" = "Wenn aktiviert, werden {CONTROL} Befehle als ⌘ gesendet. Deaktivieren Sie diese Option nur wenn Sie sich dessen sicher sind.";

MacPass/de.lproj/PasswordInputView.strings

@@ -5,8 +5,8 @@
 /* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */
 "18.title" = "Schlüsseldatei";
 
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "32"; */
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
-"32.title" = "Passwort";
+"IU9-5u-jn9.title" = "Passwort";
 
 /* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */
 "269.title" = "Passwort falsch!";

MacPass/en.lproj/GeneralSettings.strings

@@ -52,3 +52,12 @@
 
 /* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
 "806.title" = "Lock while idle";
+
+/* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
+"ACh-7H-42N.title" = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved.";
+
+/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
+"r6q-He-nYU.title" = "Remember Keyfile for Databases";
+
+/* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
+"8Ri-2s-c39.title" = "Clear all stored locations";

MacPass/en.lproj/IntegrationSettings.strings

@@ -22,3 +22,9 @@
 
 /* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
 "WmI-IB-Aso.title" = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed. This is a potential security risk!";
+
+/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
+"QfO-yG-l3F.title" = "Interpret ⌃ as ⌘";
+
+/* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
+"QRy-CY-ENC.title" = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to.";

MacPass/en.lproj/PasswordInputView.strings

@@ -5,8 +5,8 @@
 /* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */
 "18.title" = "Keyfile";
 
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "32"; */
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
-"32.title" = "Password";
+"IU9-5u-jn9.title" = "Password";
 
 /* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */
 "269.title" = "Wrong password!";

MacPass/fr.lproj/PasswordInputView.strings

@@ -5,8 +5,8 @@
 /* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */
 "18.title" = "Clef";
 
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "32"; */
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
-"32.title" = "Mot de passe";
+"IU9-5u-jn9.title" = "Mot de passe";
 
 /* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */
 "269.title" = "Mot de passe incorrect !";