nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor changes to localization

Browse Source
This commit is contained in:
michael starke
2017-09-01 19:35:16 +02:00
parent 70650fc20f
commit 1ed9bc2856
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MacPass/MPDocument.m
View File

@@ -305,8 +305,8 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
alert.showsSuppressionButton = YES; alert.showsSuppressionButton = YES;
alert.suppressionButton.title = NSLocalizedString(@"SET_AS_DEFAULT_FILE_CHANGE_STRATEGY", @"Set the selection as default file change strategy!"); 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_MERGE", @"Merge changes into file!")];
[alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_USE_OTHER", @"Reopen the file!")]; [alert addButtonWithTitle:NSLocalizedString(@"KEEP_OTHER_DISCARD_MINE", @"Reopen the file!")];
[alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_KEEP_MINE", @"Ignore the changes to an open file!")]; [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE_DISCARD_OTHER", @"Ignore the changes to an open file!")];
[alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) {
BOOL useAsDefault = (alert.suppressionButton.state == NSOnState); BOOL useAsDefault = (alert.suppressionButton.state == NSOnState);
switch(returnCode) { switch(returnCode) {

3
MacPass/en.lproj/Localizable.strings
View File

@@ -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."; "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 */ /* Always show a dialog after an external file change */
"FILE_CHANGE_STRATEGY_ASK" = "Ask"; "FILE_CHANGE_STRATEGY_ASK" = "Ask";
"SHORT_FILE_CHANGE_STRATEGY_ASK" = "Ask";
/* Button to ignore the changes */ /* Button to ignore the changes */
"FILE_CHANGE_STRATEGY_KEEP_MINE" = "Keep My Version and Ignore Other 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 */ /* Button to reload the changes form disk */
"FILE_CHANGE_STRATEGY_USE_OTHER" = "Load Changed Version and Discard Mine"; "FILE_CHANGE_STRATEGY_USE_OTHER" = "Load Changed Version and Discard Mine";
"KEEP_OTHER_DISCARD_MINE" = "Keep Other, Discard Mine";
/* Merge changes into file! */ /* Merge changes into file! */
"FILE_CHANGE_STRATEGY_MERGE" = "Merge Changes"; "FILE_CHANGE_STRATEGY_MERGE" = "Merge Changes";