diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index 7deee47a..19a18778 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -305,8 +305,8 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou alert.showsSuppressionButton = YES; alert.suppressionButton.title = NSLocalizedString(@"SET_AS_DEFAULT_FILE_CHANGE_STRATEGY", @"Set the selection as default file change strategy!"); [alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_MERGE", @"Merge changes into file!")]; - [alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_USE_OTHER", @"Reopen the file!")]; - [alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_KEEP_MINE", @"Ignore the changes to an open file!")]; + [alert addButtonWithTitle:NSLocalizedString(@"KEEP_OTHER_DISCARD_MINE", @"Reopen the file!")]; + [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE_DISCARD_OTHER", @"Ignore the changes to an open file!")]; [alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) { BOOL useAsDefault = (alert.suppressionButton.state == NSOnState); switch(returnCode) { diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index 6f0f71ad..8ed6c7af 100644 --- a/MacPass/en.lproj/Localizable.strings +++ b/MacPass/en.lproj/Localizable.strings @@ -203,10 +203,13 @@ "SET_AS_DEFAULT_FILE_CHANGE_STRATEGY" = "Use this method as default. You can change this at any time in the preferences."; /* Always show a dialog after an external file change */ "FILE_CHANGE_STRATEGY_ASK" = "Ask"; +"SHORT_FILE_CHANGE_STRATEGY_ASK" = "Ask"; /* Button to ignore the changes */ "FILE_CHANGE_STRATEGY_KEEP_MINE" = "Keep My Version and Ignore Other Changes"; +"KEEP_MINE_DISCARD_OTHER" = "Keep Mine, Discard Other"; /* Button to reload the changes form disk */ "FILE_CHANGE_STRATEGY_USE_OTHER" = "Load Changed Version and Discard Mine"; +"KEEP_OTHER_DISCARD_MINE" = "Keep Other, Discard Mine"; /* Merge changes into file! */ "FILE_CHANGE_STRATEGY_MERGE" = "Merge Changes";