From deb5260c6ac1de5a84b23a2082eace044b857714 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Tue, 31 Jul 2012 15:33:44 -0400 Subject: [PATCH] Pushed the error message logic in Cocoa' addDirectory into the core. --- cocoa/base/DirectoryPanel.m | 12 +---------- cocoa/base/en.lproj/Localizable.strings | 2 -- cocoa/inter/app.py | 4 ++-- core/app.py | 5 ++--- locale/core.pot | 28 ++++++++++++++++--------- locale/cs/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/cs/LC_MESSAGES/ui.po | 8 ------- locale/de/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/de/LC_MESSAGES/ui.po | 8 ------- locale/fr/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/fr/LC_MESSAGES/ui.po | 8 ------- locale/hy/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/hy/LC_MESSAGES/ui.po | 8 ------- locale/it/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/it/LC_MESSAGES/ui.po | 8 ------- locale/pt_BR/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/pt_BR/LC_MESSAGES/ui.po | 8 ------- locale/ru/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/ru/LC_MESSAGES/ui.po | 8 ------- locale/ui.pot | 8 ------- locale/uk/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/uk/LC_MESSAGES/ui.po | 8 ------- locale/zh_CN/LC_MESSAGES/core.po | 28 ++++++++++++++++--------- locale/zh_CN/LC_MESSAGES/ui.po | 8 ------- 24 files changed, 185 insertions(+), 198 deletions(-) diff --git a/cocoa/base/DirectoryPanel.m b/cocoa/base/DirectoryPanel.m index d74a3494..d771922d 100644 --- a/cocoa/base/DirectoryPanel.m +++ b/cocoa/base/DirectoryPanel.m @@ -138,17 +138,7 @@ http://www.hardcoded.net/licenses/bsd_license /* Public */ - (void)addDirectory:(NSString *)directory { - NSInteger r = [model addDirectory:directory]; - if (r) { - NSString *m = @""; - if (r == 1) { - m = TR(@"'%@' already is in the list."); - } - else if (r == 2) { - m = TR(@"'%@' does not exist."); - } - [Dialogs showMessage:[NSString stringWithFormat:m,directory]]; - } + [model addDirectory:directory]; [_recentDirectories addFile:directory]; [[self window] makeKeyAndOrderFront:nil]; } diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings index 88ce0882..ff2f9137 100644 --- a/cocoa/base/en.lproj/Localizable.strings +++ b/cocoa/base/en.lproj/Localizable.strings @@ -7,8 +7,6 @@ "Select a file to save your results to" = "Select a file to save your results to"; "Select a folder to add to the scanning list" = "Select a folder to add to the scanning list"; "You have unsaved results, do you really want to continue?" = "You have unsaved results, do you really want to continue?"; -"'%@' already is in the list." = "'%@' already is in the list."; -"'%@' does not exist." = "'%@' does not exist."; "The name '%@' already exists." = "The name '%@' already exists."; "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again."; "Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"; diff --git a/cocoa/inter/app.py b/cocoa/inter/app.py index b39720b0..4be6e714 100644 --- a/cocoa/inter/app.py +++ b/cocoa/inter/app.py @@ -58,8 +58,8 @@ class PyDupeGuruBase(PyFairware): return self.model.deletion_options #---Directories - def addDirectory_(self, directory: str) -> int: - return self.model.add_directory(directory) + def addDirectory_(self, directory: str): + self.model.add_directory(directory) #---Results def doScan(self): diff --git a/core/app.py b/core/app.py index 233191ba..b30c5e64 100644 --- a/core/app.py +++ b/core/app.py @@ -265,11 +265,10 @@ class DupeGuru(RegistrableApplication, Broadcaster): try: self.directories.add_path(Path(d)) self.notify('directories_changed') - return 0 except directories.AlreadyThereError: - return 1 + self.view.show_message(tr("'{}' already is in the list.").format(d)) except directories.InvalidPathError: - return 2 + self.view.show_message(tr("'{}' does not exist.").format(d)) def add_selected_to_ignore_list(self): dupes = self.without_ref(self.selected_dupes) diff --git a/locale/core.pot b/locale/core.pot index 14cd2e56..80a6664a 100644 --- a/locale/core.pot +++ b/locale/core.pot @@ -35,43 +35,51 @@ msgstr "" msgid "You cannot delete, move or copy more than 10 duplicates at once in demo mode." msgstr "" -#: core/app.py:279 +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "" + +#: core/app.py:278 msgid "All selected %d matches are going to be ignored in all subsequent scans. Continue?" msgstr "" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "" -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "" diff --git a/locale/cs/LC_MESSAGES/core.po b/locale/cs/LC_MESSAGES/core.po index 22a4711d..3f7c5fe7 100644 --- a/locale/cs/LC_MESSAGES/core.po +++ b/locale/cs/LC_MESSAGES/core.po @@ -12,15 +12,15 @@ msgid "" "mode." msgstr "" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Shromažďuji prohlížené soubory" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Vybrané adresáře neobsahují žádné soubory vhodné k prohledávání." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d vyřazeno)" @@ -136,7 +136,7 @@ msgstr "" msgid "All marked files were sucessfully sent to Trash." msgstr "" -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -148,24 +148,24 @@ msgstr "" msgid "Do you really want to remove all %d items from the ignore list?" msgstr "Opravdu chcete odstranit všech %d položek ze seznamu výjimek?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "Nedefinoval jste žádný uživatelský příkaz. Nadefinujete ho v předvolbách." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Chystáte se z výsledků odstranit %d souborů. Pokračovat?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "" @@ -181,6 +181,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "" diff --git a/locale/cs/LC_MESSAGES/ui.po b/locale/cs/LC_MESSAGES/ui.po index 4c861772..394d018c 100644 --- a/locale/cs/LC_MESSAGES/ui.po +++ b/locale/cs/LC_MESSAGES/ui.po @@ -708,14 +708,6 @@ msgstr "" msgid "The iPhoto application couldn't be found." msgstr "Nelze najít aplikaci iPhoto." -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' already is in the list." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' does not exist." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "The name '%@' already exists." diff --git a/locale/de/LC_MESSAGES/core.po b/locale/de/LC_MESSAGES/core.po index 29b7af2a..d9968566 100644 --- a/locale/de/LC_MESSAGES/core.po +++ b/locale/de/LC_MESSAGES/core.po @@ -12,15 +12,15 @@ msgid "" "mode." msgstr "" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Sammle Dateien zum Scannen" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Der ausgewählte Ordner enthält keine scannbare Dateien." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d verworfen)" @@ -136,7 +136,7 @@ msgstr "" msgid "All marked files were sucessfully sent to Trash." msgstr "" -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -146,25 +146,25 @@ msgstr "%d Dateien werden in zukünftigen Scans ignoriert werden. Fortfahren?" msgid "Do you really want to remove all %d items from the ignore list?" msgstr "Möchten Sie wirklich alle %d Einträge aus der Ignorier-Liste löschen?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "Sie haben keinen eigenen Befehl erstellt. Bitte in den Einstellungen " "konfigurieren." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "%d Dateien werden aus der Ergebnisliste entfernt. Fortfahren?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "kopieren" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "verschieben" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Wählen sie einen Ordner zum {} der ausgewählten Dateien" @@ -180,6 +180,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "" diff --git a/locale/de/LC_MESSAGES/ui.po b/locale/de/LC_MESSAGES/ui.po index 0d7eb4bf..1e186def 100644 --- a/locale/de/LC_MESSAGES/ui.po +++ b/locale/de/LC_MESSAGES/ui.po @@ -708,14 +708,6 @@ msgstr "" msgid "The iPhoto application couldn't be found." msgstr "The iPhoto application couldn't be found." -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' already is in the list." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' does not exist." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "The name '%@' already exists." diff --git a/locale/fr/LC_MESSAGES/core.po b/locale/fr/LC_MESSAGES/core.po index 2930fce2..4395571f 100644 --- a/locale/fr/LC_MESSAGES/core.po +++ b/locale/fr/LC_MESSAGES/core.po @@ -14,15 +14,15 @@ msgstr "" "Vous ne pouvez pas effacer, déplacer ou copier plus de 10 doublons à la fois" " en mode démo." -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Collecte des fichiers à scanner" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Les dossiers sélectionnés ne contiennent pas de fichiers valides." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d hors-groupe)" @@ -139,7 +139,7 @@ msgid "All marked files were sucessfully sent to Trash." msgstr "" "Tous les fichiers marqués ont été correctement envoyés à la corbeille." -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -151,24 +151,24 @@ msgstr "" "Voulez-vous vider la liste de fichiers ignorés des %d items qu'elle " "contient?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "Vous n'avez pas de commande personnalisée. Ajoutez-la dans vos préférences." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "%d fichiers seront retirés des résultats. Continuer?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "copier" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "déplacer" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Sélectionnez un dossier vers lequel {} les fichiers marqués." @@ -184,6 +184,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "'{}' est déjà dans la liste." + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "'{}' n'existe pas." diff --git a/locale/fr/LC_MESSAGES/ui.po b/locale/fr/LC_MESSAGES/ui.po index 7bd2c77d..ebe4e42f 100644 --- a/locale/fr/LC_MESSAGES/ui.po +++ b/locale/fr/LC_MESSAGES/ui.po @@ -719,14 +719,6 @@ msgstr "" msgid "The iPhoto application couldn't be found." msgstr "iPhoto n'a pas pu être trouvée dans vos applications." -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' est déjà dans la liste." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' n'existe pas." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "Le nom '%@' existe déjà." diff --git a/locale/hy/LC_MESSAGES/core.po b/locale/hy/LC_MESSAGES/core.po index 72039f47..646bceb2 100755 --- a/locale/hy/LC_MESSAGES/core.po +++ b/locale/hy/LC_MESSAGES/core.po @@ -26,15 +26,15 @@ msgstr "" "Չեք կարող ջնջել, տեղափձոխել կամ պատճենել ավելի քան 10 օրինակներ փորձնական " "եղանակում:" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Հավաքվում են ֆայլեր՝ ստուգելու համար" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Ընտրված թղթապանակները պարունակում են չստուգվող ֆայլ:" -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d անպիտան)" @@ -150,7 +150,7 @@ msgstr "Բոլոր նշված ֆայլերը հաջողությամբ տեղափ msgid "All marked files were sucessfully sent to Trash." msgstr "Բոլոր նշված ֆայլերը հաջողությամբ Ջնջվել են:" -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -161,23 +161,23 @@ msgstr "" msgid "Do you really want to remove all %d items from the ignore list?" msgstr "Ցանկանու՞մ եք հեռացնել բոլոր %d ֆայլերը անտեսումների ցանկից:" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "Դուք չեք կատարել Հրամանի ընտրություն: Կատարեք այն կարգավորումներում:" -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Դուք պատրաստվում եք ջնջելու %d ֆայլեր: Շարունակե՞լ:" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "պատճենել" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "տեղափոխել" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Ընտրել թղթապանակ՝ {} նշված ֆայլերի համար" @@ -193,6 +193,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "'{}'-ը արդեն առկա է ցանկում:" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "'{}'-ը գոյություն չունի:" diff --git a/locale/hy/LC_MESSAGES/ui.po b/locale/hy/LC_MESSAGES/ui.po index 6853fb60..405057a3 100755 --- a/locale/hy/LC_MESSAGES/ui.po +++ b/locale/hy/LC_MESSAGES/ui.po @@ -526,14 +526,6 @@ msgstr "Բացել ֆայլից..." msgid "Reset to Default" msgstr "Ետարկել ծրագրայինի" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@'-ը արդեն առկա է ցանկում:" - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@'-ը գոյություն չունի:" - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "'%@' անունը արդեն առկա է:" diff --git a/locale/it/LC_MESSAGES/core.po b/locale/it/LC_MESSAGES/core.po index 9a03173d..41e65e3b 100644 --- a/locale/it/LC_MESSAGES/core.po +++ b/locale/it/LC_MESSAGES/core.po @@ -12,15 +12,15 @@ msgid "" "mode." msgstr "" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Raccolta file da scansionare" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Le cartelle selezionate non contengono file da scansionare." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d scartati)" @@ -137,7 +137,7 @@ msgstr "Tutti i file marcati sono stati spostati correttamente." msgid "All marked files were sucessfully sent to Trash." msgstr "Tutti i file marcati sono stati inviati nel cestino." -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -151,25 +151,25 @@ msgstr "" "Vuoi veramente rimuovere tutti i %d elementi dalla lista dei file da " "ignorare?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "Non hai impostato nessun comando personalizzato. Impostalo nelle tue " "preferenze." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Stai per rimuovere %d file dai risultati. Continuare?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "" @@ -185,6 +185,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "'{}' è già nella lista." + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "'{}' non esiste." diff --git a/locale/it/LC_MESSAGES/ui.po b/locale/it/LC_MESSAGES/ui.po index 2f43d3c8..6cab7bd2 100644 --- a/locale/it/LC_MESSAGES/ui.po +++ b/locale/it/LC_MESSAGES/ui.po @@ -724,14 +724,6 @@ msgstr "Contenuto audio" msgid "dupeGuru PE Preferences" msgstr "Preferenze di dupeGuru PE" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' è già nella lista." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' non esiste." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "Il nome '%@' è già esistente." diff --git a/locale/pt_BR/LC_MESSAGES/core.po b/locale/pt_BR/LC_MESSAGES/core.po index c156432d..fc17a263 100644 --- a/locale/pt_BR/LC_MESSAGES/core.po +++ b/locale/pt_BR/LC_MESSAGES/core.po @@ -38,42 +38,42 @@ msgstr "" "Enquanto em modo demo, você não pode apagar, mover ou copiar mais que 10 " "duplicatas por vez." -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" msgstr "Excluir %d duplicata(s) selecionada(s) de escaneamentos posteriores?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "copiar" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "mover" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Selecione uma pasta para {} os arquivos marcados" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "Você não possui nenhum comando personalizado. Crie um nas preferências." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Remover %d arquivo(s) dos resultados?" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Juntando arquivos para escanear" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "As pastas selecionadas não contém arquivos escaneáveis." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d rejeitado)" @@ -181,6 +181,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "'{}' já está na lista" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "'{}' não existe" diff --git a/locale/pt_BR/LC_MESSAGES/ui.po b/locale/pt_BR/LC_MESSAGES/ui.po index 0e117762..9d4996dd 100644 --- a/locale/pt_BR/LC_MESSAGES/ui.po +++ b/locale/pt_BR/LC_MESSAGES/ui.po @@ -620,14 +620,6 @@ msgstr "Carregar do arquivo…" msgid "Reset to Default" msgstr "Restaurar Padrões" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' já está na lista" - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' não existe" - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "O nome '%@' já existe" diff --git a/locale/ru/LC_MESSAGES/core.po b/locale/ru/LC_MESSAGES/core.po index 14a6f297..dae40412 100755 --- a/locale/ru/LC_MESSAGES/core.po +++ b/locale/ru/LC_MESSAGES/core.po @@ -25,15 +25,15 @@ msgstr "" "Вы не можете удалять, перемещать или копировать более 10 дубликатов сразу в " "демонстрационном режиме." -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Сбор файлов для сканирования" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Выбранных директорий не содержат сканируемых файлов." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s. (%d отменено)" @@ -149,7 +149,7 @@ msgstr "Все выбранные файлы были перемещены ус msgid "All marked files were sucessfully sent to Trash." msgstr "Все выбранные файлы были успешно отправлены в корзину." -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -161,25 +161,25 @@ msgstr "" msgid "Do you really want to remove all %d items from the ignore list?" msgstr "Вы действительно хотите удалить все элементы %d из черного списка?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "" "У вас нет пользовательской команды создали. Установите его в ваших " "предпочтениях." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Вы собираетесь удалить файлы %d из результата поиска. Продолжить?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "копия" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "перемещение" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Выберите каталог на {} отмеченные файлы" @@ -195,6 +195,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "" diff --git a/locale/ru/LC_MESSAGES/ui.po b/locale/ru/LC_MESSAGES/ui.po index 74b4a9d7..8801f7db 100755 --- a/locale/ru/LC_MESSAGES/ui.po +++ b/locale/ru/LC_MESSAGES/ui.po @@ -529,14 +529,6 @@ msgstr "Загрузить из файла ..." msgid "Reset to Default" msgstr "Восстановить значения по умолчанию" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' Уже есть в списке. " - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' не существует." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr " Имя '%@' уже существует." diff --git a/locale/ui.pot b/locale/ui.pot index ec78857d..42feaad0 100644 --- a/locale/ui.pot +++ b/locale/ui.pot @@ -596,14 +596,6 @@ msgstr "" msgid "Reset to Default" msgstr "" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "" - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "" - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "" diff --git a/locale/uk/LC_MESSAGES/core.po b/locale/uk/LC_MESSAGES/core.po index adca935d..57cdf183 100755 --- a/locale/uk/LC_MESSAGES/core.po +++ b/locale/uk/LC_MESSAGES/core.po @@ -24,15 +24,15 @@ msgstr "" "Ви не можете видаляти, переміщати або копіювати більше 10 дублікатів відразу" " в демонстраційному режимі." -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "Збір файлів для пошуку" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "Обрані папки не містять файлів придатних для пошуку." -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d відкинуто)" @@ -152,7 +152,7 @@ msgstr "Усі позначені файли були переміщені ус msgid "All marked files were sucessfully sent to Trash." msgstr "Усі позначені файли були успішно відправлені до кошика." -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -164,23 +164,23 @@ msgstr "" msgid "Do you really want to remove all %d items from the ignore list?" msgstr "Ви дійсно хочете видалити всі %d елементів з чорного списку?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "Власна команда не встановлена. Встановіть її у налаштуваннях." -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "Ви збираєтеся видалити %d файлів з результату пошуку. Продовжити?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "копіювання" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "переміщення" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "Оберіть цільову папку для {} позначених файлів" @@ -196,6 +196,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "'{}' вже є в списку." + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "'{}' не існує." diff --git a/locale/uk/LC_MESSAGES/ui.po b/locale/uk/LC_MESSAGES/ui.po index c73a31ac..24706b65 100755 --- a/locale/uk/LC_MESSAGES/ui.po +++ b/locale/uk/LC_MESSAGES/ui.po @@ -527,14 +527,6 @@ msgstr "Завантажити з файлу ..." msgid "Reset to Default" msgstr "Відновити налаштування за замовчуванням" -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' вже є в списку." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' не існує." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "Ім’я '%@' вже існує." diff --git a/locale/zh_CN/LC_MESSAGES/core.po b/locale/zh_CN/LC_MESSAGES/core.po index 03c0ba3b..b1885b70 100644 --- a/locale/zh_CN/LC_MESSAGES/core.po +++ b/locale/zh_CN/LC_MESSAGES/core.po @@ -12,15 +12,15 @@ msgid "" "mode." msgstr "" -#: core/app.py:530 +#: core/app.py:529 msgid "Collecting files to scan" msgstr "收集文件以备扫描" -#: core/app.py:541 +#: core/app.py:540 msgid "The selected directories contain no scannable file." msgstr "所选文件夹中不包含可供扫描的文件。" -#: core/app.py:580 +#: core/app.py:579 msgid "%s (%d discarded)" msgstr "%s (%d 无效)" @@ -136,7 +136,7 @@ msgstr "" msgid "All marked files were sucessfully sent to Trash." msgstr "" -#: core/app.py:279 +#: core/app.py:278 msgid "" "All selected %d matches are going to be ignored in all subsequent scans. " "Continue?" @@ -146,23 +146,23 @@ msgstr "目前已选的 %d 个匹配项将在后续的扫描中被忽略。继 msgid "Do you really want to remove all %d items from the ignore list?" msgstr "确定要从忽略列表中移除 %d 项吗?" -#: core/app.py:392 +#: core/app.py:391 msgid "You have no custom command set up. Set it up in your preferences." msgstr "你没有设定自定义命令。请在首选项中进行设定。" -#: core/app.py:479 core/app.py:490 +#: core/app.py:478 core/app.py:489 msgid "You are about to remove %d files from results. Continue?" msgstr "你将从结果中移除 %d 个文件。继续吗?" -#: core/app.py:339 +#: core/app.py:338 msgid "copy" msgstr "复制" -#: core/app.py:339 +#: core/app.py:338 msgid "move" msgstr "移动" -#: core/app.py:340 +#: core/app.py:339 msgid "Select a directory to {} marked files to" msgstr "选择一个文件夹将标记的 {} 个文件进行..." @@ -178,6 +178,14 @@ msgstr "" msgid "Shortest" msgstr "" -#: core/app.py:510 +#: core/app.py:509 msgid "{} duplicate groups were changed by the re-prioritization." msgstr "" + +#: core/app.py:269 +msgid "'{}' already is in the list." +msgstr "" + +#: core/app.py:271 +msgid "'{}' does not exist." +msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/ui.po b/locale/zh_CN/LC_MESSAGES/ui.po index dbff9a53..06c371b2 100644 --- a/locale/zh_CN/LC_MESSAGES/ui.po +++ b/locale/zh_CN/LC_MESSAGES/ui.po @@ -713,14 +713,6 @@ msgstr "" msgid "The iPhoto application couldn't be found." msgstr "The iPhoto application couldn't be found." -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' already is in the list." -msgstr "'%@' already is in the list." - -#: cocoa/base/en.lproj/Localizable.strings:0 -msgid "'%@' does not exist." -msgstr "'%@' does not exist." - #: cocoa/base/en.lproj/Localizable.strings:0 msgid "The name '%@' already exists." msgstr "The name '%@' already exists."