From 11450ae56ad970f0f77df8dc47043099e7933c16 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 27 Apr 2013 09:38:08 -0400 Subject: [PATCH] [#222] Tweaked ref-swapping action text. Make Selected Reference --> Make Selected into Reference. --- cocoa/base/en.lproj/Localizable.strings | 2 +- cocoa/base/ui/main_menu.py | 2 +- cocoa/base/ui/result_window.py | 2 +- help/de/reprioritize.rst | 2 +- help/en/faq.rst | 10 +++++++--- help/en/reprioritize.rst | 6 +++--- help/en/results.rst | 21 +++++++++++++++------ help/fr/reprioritize.rst | 6 +++--- locale/ui.pot | 5 +++-- qt/base/result_window.py | 2 +- 10 files changed, 36 insertions(+), 22 deletions(-) diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings index b7ab63a3..b9ba0b2b 100644 --- a/cocoa/base/en.lproj/Localizable.strings +++ b/cocoa/base/en.lproj/Localizable.strings @@ -83,7 +83,7 @@ "Load Recent Results" = "Load Recent Results"; "Load Results" = "Load Results"; "Load Results..." = "Load Results..."; -"Make Selected Reference" = "Make Selected Reference"; +"Make Selected into Reference" = "Make Selected into Reference"; "Mark All" = "Mark All"; "Mark None" = "Mark None"; "Mark Selected" = "Mark Selected"; diff --git a/cocoa/base/ui/main_menu.py b/cocoa/base/ui/main_menu.py index 8ed00fd9..c6d324a4 100644 --- a/cocoa/base/ui/main_menu.py +++ b/cocoa/base/ui/main_menu.py @@ -56,7 +56,7 @@ actionMenu.addItem("Re-Prioritize Results", Action(None, 'reprioritizeResults')) actionMenu.addSeparator() actionMenu.addItem("Remove Selected from Results", Action(None, 'removeSelected'), 'cmd+backspace') actionMenu.addItem("Add Selected to Ignore List", Action(None, 'ignoreSelected'), 'cmd+g') -actionMenu.addItem("Make Selected Reference", Action(None, 'switchSelected'), 'cmd+arrowup') +actionMenu.addItem("Make Selected into Reference", Action(None, 'switchSelected'), 'cmd+arrowup') actionMenu.addSeparator() actionMenu.addItem("Open Selected with Default Application", Action(None, 'openSelected'), 'cmd+return') actionMenu.addItem("Reveal Selected in Finder", Action(None, 'revealSelected'), 'cmd+alt+return') diff --git a/cocoa/base/ui/result_window.py b/cocoa/base/ui/result_window.py index dbf82a76..b4fa769b 100644 --- a/cocoa/base/ui/result_window.py +++ b/cocoa/base/ui/result_window.py @@ -57,7 +57,7 @@ actionPopup.menu.addSeparator() for menu in (actionPopup.menu, contextMenu): menu.addItem("Remove Selected from Results", action=Action(owner, 'removeSelected')) menu.addItem("Add Selected to Ignore List", action=Action(owner, 'ignoreSelected')) - menu.addItem("Make Selected Reference", action=Action(owner, 'switchSelected')) + menu.addItem("Make Selected into Reference", action=Action(owner, 'switchSelected')) menu.addSeparator() menu.addItem("Open Selected with Default Application", action=Action(owner, 'openSelected')) menu.addItem("Reveal Selected in Finder", action=Action(owner, 'revealSelected')) diff --git a/help/de/reprioritize.rst b/help/de/reprioritize.rst index 431178b0..ff37088b 100644 --- a/help/de/reprioritize.rst +++ b/help/de/reprioritize.rst @@ -3,7 +3,7 @@ Re-Prioritizing duplicates dupeGuru tries to automatically determine which duplicate should go in each group's reference position, but sometimes it gets it wrong. In many cases, clever dupe sorting with "Delta Values" -and "Dupes Only" options in addition to the "Make Selected Reference" action does the trick, but +and "Dupes Only" options in addition to the "Make Selected into Reference" action does the trick, but sometimes, a more powerful option is needed. This is where the Re-Prioritization dialog comes into play. You can summon it through the "Re-Prioritize Results" item in the "Actions" menu. diff --git a/help/en/faq.rst b/help/en/faq.rst index d43bf85a..dc792aac 100644 --- a/help/en/faq.rst +++ b/help/en/faq.rst @@ -30,7 +30,11 @@ Frequently Asked Questions .. topic:: The mark box of a file I want to delete is disabled. What must I do? - You cannot mark the reference (The first file) of a duplicate group. However, what you can do is to promote a duplicate file to reference. Thus, if a file you want to mark is reference, select a duplicate file in the group that you want to promote to reference, and click on **Actions-->Make Selected Reference**. If the reference file is from a reference folder (filename written in blue letters), you cannot remove it from the reference position. + You cannot mark the reference (The first file) of a duplicate group. However, what you can do + is to promote a duplicate file to reference. Thus, if a file you want to mark is reference, + select a duplicate file in the group that you want to promote to reference, and click on + **Actions-->Make Selected into Reference**. If the reference file is from a reference folder + (filename written in blue letters), you cannot remove it from the reference position. .. topic:: I have a folder from which I really don't want to delete files. @@ -63,7 +67,7 @@ Frequently Asked Questions * Click on the "Modification" column to sort the results by modification date. * Click on the "Modification" column again to reverse the sort order. * Select all duplicates over 0. - * Click on **Make Selected Reference**. + * Click on **Make Selected into Reference**. .. topic:: I want to mark all duplicates containing the word "copy". How do I do that? @@ -90,7 +94,7 @@ Frequently Asked Questions * Click on the "Bitrate" column to sort the results by bitrate. * Click on the "Bitrate" column again to reverse the sort order. * Select all duplicates over 0. - * Click on **Make Selected Reference**. + * Click on **Make Selected into Reference**. .. topic:: I don't want [live] and [remix] versions of my songs counted as duplicates. How do I do that? diff --git a/help/en/reprioritize.rst b/help/en/reprioritize.rst index 431178b0..4febfca4 100644 --- a/help/en/reprioritize.rst +++ b/help/en/reprioritize.rst @@ -3,9 +3,9 @@ Re-Prioritizing duplicates dupeGuru tries to automatically determine which duplicate should go in each group's reference position, but sometimes it gets it wrong. In many cases, clever dupe sorting with "Delta Values" -and "Dupes Only" options in addition to the "Make Selected Reference" action does the trick, but -sometimes, a more powerful option is needed. This is where the Re-Prioritization dialog comes into -play. You can summon it through the "Re-Prioritize Results" item in the "Actions" menu. +and "Dupes Only" options in addition to the "Make Selected into Reference" action does the trick, +but sometimes, a more powerful option is needed. This is where the Re-Prioritization dialog comes +into play. You can summon it through the "Re-Prioritize Results" item in the "Actions" menu. This dialog allows you to select criteria according to which a reference dupe will be selected in each dupe group. The list of available criteria is on the left and the list of criteria you've diff --git a/help/en/results.rst b/help/en/results.rst index 06e79132..b03af6c6 100644 --- a/help/en/results.rst +++ b/help/en/results.rst @@ -12,7 +12,8 @@ You can mark duplicate files, but you can never mark the reference file of a gro What determines which files are reference and which files are duplicates is first their folder state. A file from a reference folder will always be reference in a duplicate group. If all files are from a normal folder, the size determine which file will be the reference of a duplicate group. dupeGuru assumes that you always want to keep the biggest file, so the biggest files will take the reference position. -You can change the reference file of a group manually. To do so, select the duplicate file you want to promote to reference, and click on **Actions-->Make Selected Reference**. +You can change the reference file of a group manually. To do so, select the duplicate file you want +to promote to reference, and click on **Actions-->Make Selected into Reference**. Reviewing results ----------------- @@ -54,7 +55,15 @@ Dupes Only and Delta Values The Dupes Only mode unveil its true power when you use it with the Delta Values switch turned on. When you turn it on, relative values will be displayed instead of absolute ones. So if, for example, you want to remove from your results all duplicates that are more than 300 KB away from their reference, you could sort the dupes only results by Size, select all duplicates under -300 in the Size column, delete them, and then do the same for duplicates over 300 at the bottom of the list. -You could also use it to change the reference priority of your duplicate list. When you make a fresh scan, if there are no reference folders, the reference file of every group is the biggest file. If you want to change that, for example, to the latest modification time, you can sort the dupes only results by modification time in **descending** order, select all duplicates with a modification time delta value higher than 0 and click on **Make Selected Reference**. The reason why you must make the sort order descending is because if 2 files among the same duplicate group are selected when you click on **Make Selected Reference**, only the first of the list will be made reference, the other will be ignored. And since you want the last modified file to be reference, having the sort order descending assures you that the first item of the list will be the last modified. +You could also use it to change the reference priority of your duplicate list. When you make a fresh +scan, if there are no reference folders, the reference file of every group is the biggest file. If +you want to change that, for example, to the latest modification time, you can sort the dupes only +results by modification time in **descending** order, select all duplicates with a modification time +delta value higher than 0 and click on **Make Selected into Reference**. The reason why you must +make the sort order descending is because if 2 files among the same duplicate group are selected +when you click on **Make Selected into Reference**, only the first of the list will be made reference, +the other will be ignored. And since you want the last modified file to be reference, having the +sort order descending assures you that the first item of the list will be the last modified. Filtering --------- @@ -95,10 +104,10 @@ Action Menu not be touched and will stay where they are. * **Remove Selected from Results:** Remove all selected duplicates from results. Note that all selected reference files will be ignored, only duplicates can be removed with this action. -* **Make Selected Reference:** Promote all selected duplicates to reference. If a duplicate is a - part of a group having a reference file coming from a reference folder (in blue color), no action - will be taken for this duplicate. If more than one duplicate among the same group are selected, - only the first of each group will be promoted. +* **Make Selected into Reference:** Promote all selected duplicates to reference. If a duplicate is + a part of a group having a reference file coming from a reference folder (in blue color), no + action will be taken for this duplicate. If more than one duplicate among the same group are + selected, only the first of each group will be promoted. * **Add Selected to Ignore List:** This first removes all selected duplicates from results, and then add the match of that duplicate and the current reference in the ignore list. This match will not come up again in further scan. The duplicate itself might come back, but it will be diff --git a/help/fr/reprioritize.rst b/help/fr/reprioritize.rst index 431178b0..4febfca4 100644 --- a/help/fr/reprioritize.rst +++ b/help/fr/reprioritize.rst @@ -3,9 +3,9 @@ Re-Prioritizing duplicates dupeGuru tries to automatically determine which duplicate should go in each group's reference position, but sometimes it gets it wrong. In many cases, clever dupe sorting with "Delta Values" -and "Dupes Only" options in addition to the "Make Selected Reference" action does the trick, but -sometimes, a more powerful option is needed. This is where the Re-Prioritization dialog comes into -play. You can summon it through the "Re-Prioritize Results" item in the "Actions" menu. +and "Dupes Only" options in addition to the "Make Selected into Reference" action does the trick, +but sometimes, a more powerful option is needed. This is where the Re-Prioritization dialog comes +into play. You can summon it through the "Re-Prioritize Results" item in the "Actions" menu. This dialog allows you to select criteria according to which a reference dupe will be selected in each dupe group. The list of available criteria is on the left and the list of criteria you've diff --git a/locale/ui.pot b/locale/ui.pot index 3bb6cef4..7622916d 100644 --- a/locale/ui.pot +++ b/locale/ui.pot @@ -1,6 +1,7 @@ # msgid "" -msgstr "Content-Type: text/plain; charset=utf-8\n" +msgstr "" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: utf-8\n" #: cocoa/inter/app.py:15 qt/base/app.py:38 @@ -404,7 +405,7 @@ msgid "Add Selected to Ignore List" msgstr "" #: qt/base/result_window.py:55 cocoa/base/en.lproj/Localizable.strings:0 -msgid "Make Selected Reference" +msgid "Make Selected into Reference" msgstr "" #: qt/base/result_window.py:56 cocoa/base/en.lproj/Localizable.strings:0 diff --git a/qt/base/result_window.py b/qt/base/result_window.py index d8c58c96..e7bd213d 100644 --- a/qt/base/result_window.py +++ b/qt/base/result_window.py @@ -52,7 +52,7 @@ class ResultWindow(QMainWindow): ('actionReprioritize', '', '', tr("Re-Prioritize Results..."), self.reprioritizeTriggered), ('actionRemoveSelected', 'Ctrl+Del', '', tr("Remove Selected from Results"), self.removeSelectedTriggered), ('actionIgnoreSelected', 'Ctrl+Shift+Del', '', tr("Add Selected to Ignore List"), self.addToIgnoreListTriggered), - ('actionMakeSelectedReference', 'Ctrl+Space', '', tr("Make Selected Reference"), self.makeReferenceTriggered), + ('actionMakeSelectedReference', 'Ctrl+Space', '', tr("Make Selected into Reference"), self.makeReferenceTriggered), ('actionOpenSelected', 'Ctrl+O', '', tr("Open Selected with Default Application"), self.openTriggered), ('actionRevealSelected', 'Ctrl+Shift+O', '', tr("Open Containing Folder of Selected"), self.revealTriggered), ('actionRenameSelected', 'F2', '', tr("Rename Selected"), self.renameTriggered),