diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index c44bc877..1e868afd 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -300,10 +300,10 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application"); alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change from another application"); 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(@"KEEP_OTHER_DISCARD_MINE", @"Reopen the file!")]; - [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE_DISCARD_OTHER", @"Ignore the changes to an open file!")]; + alert.suppressionButton.title = NSLocalizedString(@"SET_AS_DEFAULT_FILE_CHANGE_STRATEGY", @"Checkbox in dialog to set the selection as default file change strategy!"); + [alert addButtonWithTitle:NSLocalizedString(@"FILE_CHANGE_STRATEGY_MERGE", @"Button in dialog to merge changes into file!")]; + [alert addButtonWithTitle:NSLocalizedString(@"KEEP_OTHER_DISCARD_MINE", @"Button in dialog to reopen the file!")]; + [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE_DISCARD_OTHER", @"Button in dialog to ignore the changes to an open file!")]; [alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) { BOOL useAsDefault = (alert.suppressionButton.state == NSOnState); switch(returnCode) { diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index ae2d5c18..ff2bfdb5 100644 --- a/MacPass/de.lproj/Localizable.strings +++ b/MacPass/de.lproj/Localizable.strings @@ -454,9 +454,6 @@ /* Button title to save the generated key file */ "SAVE_KEYFILE" = "Schlüsseldatei speichern"; -/* (No Comment) */ -"SAVE_LOSSY" = "Mit Datenverlust speichern"; - /* Save file menu item title when save will prompt for a location to save or ask for a password/key */ "SAVE_WITH_DOTS" = "Speichern…"; diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index c234ff66..1a2bd8ad 100644 --- a/MacPass/en.lproj/Localizable.strings +++ b/MacPass/en.lproj/Localizable.strings @@ -465,9 +465,6 @@ /* Button title to save the generated key file */ "SAVE_KEYFILE" = "Save Keyfile"; -/* (No Comment) */ -"SAVE_LOSSY" = "Save and lose data"; - /* Save file menu item title when save will prompt for a location to save or ask for a password/key */ "SAVE_WITH_DOTS" = "Save…"; diff --git a/MacPass/es.lproj/Localizable.strings b/MacPass/es.lproj/Localizable.strings index 4ae0e341..b398dec0 100644 --- a/MacPass/es.lproj/Localizable.strings +++ b/MacPass/es.lproj/Localizable.strings @@ -162,7 +162,6 @@ "WARNING_ON_LOSSY_SAVE" = "Al guardar en formato KDB, se perderán algunos datos."; "WARNING_ON_LOSSY_SAVE_DESCRIPTION" = "El formato de archivo KDB no permite guardar toda la información."; "CHANGE_FORMAT" = "Cambiar formato de archivo a KDBX"; -"SAVE_LOSSY" = "Guardar y perder datos"; "ENFORCE_PASSWORD_CHANGE_ALERT_TITLE" = "La contraseña de la base de datos ha expirado"; "ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION" = "No será posible guardar cambios hsata que la contraseña o el keyfile sean modificados."; @@ -184,8 +183,6 @@ "FILE_CHANGE_STRATEGY_ASK" = "Preguntarme qué hacer"; /* Button to ignore the changes */ "KEEP_MINE" = "Conservar versión actual y descartar cambios"; -/* Button to reload the changes form disk */ -"LOAD_CHANGES" = "Cargar archivo modificado"; /* Merge changes into file! */ "MERGE_CHANGES" = "Unir cambios"; diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings index 7bde1ab8..9f510855 100644 --- a/MacPass/fr.lproj/Localizable.strings +++ b/MacPass/fr.lproj/Localizable.strings @@ -163,7 +163,6 @@ "WARNING_ON_LOSSY_SAVE" = "Enregistrer au format KDB, peut entrainer une perte de données."; "WARNING_ON_LOSSY_SAVE_DESCRIPTION" = "Le format de fichier KDB ne contient pas toutes les informations."; "CHANGE_FORMAT" = "Convertir le fichier au format KDBX"; -"SAVE_LOSSY" = "Enregistrer (provoque une perte de données)"; "ENFORCE_PASSWORD_CHANGE_ALERT_TITLE" = "Le mot de passe de la base de données a expiré !"; "ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION" = "Vous ne pourrez pas sauvegarder tant que le mot de passe et/ou le fichier clé n'auront pas été modifiés."; @@ -181,8 +180,6 @@ "FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "Le fichier chargé n'est pas le même que celui sur le disque. Comment voulez-vous continuer ?"; /* Button to ignore the changes */ "KEEP_MINE" = "Conserver la version actuelle et ignorer les modifications"; -/* BUtton to reload the changes form disk */ -"LOAD_CHANGES" = "Charger le fichier modifié"; /* Merge changes into file! */ "MERGE_CHANGES" = "Merge changes!"; diff --git a/MacPass/it.lproj/Localizable.strings b/MacPass/it.lproj/Localizable.strings index f4a10da7..9d9ca836 100644 --- a/MacPass/it.lproj/Localizable.strings +++ b/MacPass/it.lproj/Localizable.strings @@ -162,7 +162,6 @@ "WARNING_ON_LOSSY_SAVE" = "Salvare in formato KDB comporterà una perdita di dati."; "WARNING_ON_LOSSY_SAVE_DESCRIPTION" = "Il file KDB non può contenere tutte le informazioni."; "CHANGE_FORMAT" = "Cambia formato a KDBX"; -"SAVE_LOSSY" = "Salva perdendo informazioni"; "ENFORCE_PASSWORD_CHANGE_ALERT_TITLE" = "La password del database é scaduta!"; "ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION" = "Non sarà possibile salvare il database fintanto che la password e/o la chiave sono cambiate."; @@ -180,8 +179,6 @@ "FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "Il file in uso é diverso da quello sul disco, come vuoi procedere?"; /* Button to ignore the changes */ "KEEP_MINE" = "Mantieni la versione corrente e ignora le modifiche."; -/* BUtton to reload the changes form disk */ -"LOAD_CHANGES" = "Ricarica file modificato!"; /* Merge changes into file! */ "MERGE_CHANGES" = "Merge changes!"; diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings index b425198c..d317a844 100644 --- a/MacPass/nl.lproj/Localizable.strings +++ b/MacPass/nl.lproj/Localizable.strings @@ -432,9 +432,6 @@ /* Button title to save the generated key file */ "SAVE_KEYFILE" = "Bewaar sleutelbestand"; -/* (No Comment) */ -"SAVE_LOSSY" = "Bewaar and verlies gegevens"; - /* Save file menu item title when save will prompt for a location to save or ask for a password/key */ "SAVE_WITH_DOTS" = "Bewaar…"; diff --git a/MacPass/pl.lproj/Localizable.strings b/MacPass/pl.lproj/Localizable.strings index 1af157e3..cf9c2ded 100644 --- a/MacPass/pl.lproj/Localizable.strings +++ b/MacPass/pl.lproj/Localizable.strings @@ -341,9 +341,6 @@ /* No comment provided by engineer. */ "SAVE_KEYFILE" = "Zapisz plik z kluczem"; -/* (No Comment) */ -"SAVE_LOSSY" = "Zapisz i strać dane"; - /* No comment provided by engineer. */ "SAVE_WITH_DOTS" = "Zapisz…"; diff --git a/MacPass/ru.lproj/Localizable.strings b/MacPass/ru.lproj/Localizable.strings index 6bbb169b..993520bf 100644 --- a/MacPass/ru.lproj/Localizable.strings +++ b/MacPass/ru.lproj/Localizable.strings @@ -162,7 +162,6 @@ "WARNING_ON_LOSSY_SAVE" = "Сохранение базы в KDB формате может вызвать потерю данных."; "WARNING_ON_LOSSY_SAVE_DESCRIPTION" = "Формат KDB не умеет хранить всю информацию."; "CHANGE_FORMAT" = "Изменить формат файла на KDBX"; -"SAVE_LOSSY" = "Сохранить и потерять данные"; "ENFORCE_PASSWORD_CHANGE_ALERT_TITLE" = "Пароль базы данных истек!"; "ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION" = "Вы не можете ничего сохранять, пока не поменяете пароль базы и/или файл ключа."; @@ -180,8 +179,6 @@ "FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "Загруженный файл отличается от файла на диске. Что вы хотите делать дальше?"; /* Button to ignore the changes */ "KEEP_MINE" = "Сохранить текущую версию и игнорировать изменения на диске!"; -/* BUtton to reload the changes form disk */ -"LOAD_CHANGES" = "Загрузить соханенный файл!"; /* Merge changes into file! */ "MERGE_CHANGES" = "Merge changes!"; diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings index 59458a4d..6e0c561b 100644 --- a/MacPass/zh-Hans.lproj/Localizable.strings +++ b/MacPass/zh-Hans.lproj/Localizable.strings @@ -162,7 +162,6 @@ "WARNING_ON_LOSSY_SAVE" = "保存为 KDB 格式,将会损失数据"; "WARNING_ON_LOSSY_SAVE_DESCRIPTION" = "KDB 格式无法保存所有信息"; "CHANGE_FORMAT" = "更改文件格式为 KDBX"; -"SAVE_LOSSY" = "丢失数据并保存"; "ENFORCE_PASSWORD_CHANGE_ALERT_TITLE" = "数据库密码已过期!"; "ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION" = "更改密码/密钥文件之前,你将不能保存数据库"; @@ -180,8 +179,6 @@ "FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "加载的文件和磁盘上的文件不同,你想怎么处理?"; /* Button to ignore the changes */ "KEEP_MINE" = "不要加载修改过的数据库"; -/* Button to reload the changes form disk */ -"LOAD_CHANGES" = "丢弃我的更改并且加载修改过的数据库"; /* Merge changes into file! */ "MERGE_CHANGES" = "合并更改";