Updated changelog.

It caused crashes under 32 bits when pointers would flip our long's most significant bit. (Well, at least that's what I think was going on).

.hgtags

@@ -73,3 +73,6 @@ fad463ae749b7189dce92f1e42a57ac4ee03987d se3.3.3
 93ed33410df2d2f21229a77ae49c83ece2c50a55 pe2.5.0
 c153aef25e5c9911f2197d13899591c50cf38ffc se3.4.1
 71b7e18613f3790cea18cb0dd8c9c986ce237267 me6.3.1
+c3d9f91dc9c9d60f370c72bc211f09be3e4fc18d se3.5.0
+254bce83ad6e56c102d69fd603f6845e2324b470 me6.4.0
+e772f1de86744999ffbbe5845554417965b1dfba me6.4.1

README

@@ -86,7 +86,7 @@ ended up with problems.
 Whenever you have a problem, always double-check that you're running the correct python version. 
 You'll probably have to tweak your $PATH.
 
-To setup a build machine under Ubuntu 12.04 and up, install those packages: python3, python3-pyqt4,
+To setup a build machine under Ubuntu 12.04 and up, install those packages: python3-dev, python3-pyqt4,
 pyqt4-dev-tools, mercurial and then python3-setuptools. Once you've done that, install pip with
 `easy_install`. Once you've done that, you can then perform "The easy way!" installation.
 

cocoa/base/en.lproj/Localizable.strings

@@ -16,10 +16,11 @@
 "Do you really want to remove all your cached picture analysis?" = "Do you really want to remove all your cached picture analysis?";
 
 
-"Add iTunes Directory" = "Add iTunes Directory";
+"Add iTunes Library" = "Add iTunes Library";
 "Remove Dead Tracks in iTunes" = "Remove Dead Tracks in iTunes";
 
 "Add iPhoto Library" = "Add iPhoto Library";
+"Add Aperture Library" = "Add Aperture Library";
 "Clear Picture Cache" = "Clear Picture Cache";
 
 "Yes" = "Yes";

cocoa/base/en.lproj/MainMenu.strings

@@ -53,8 +53,8 @@
 /* Class = "NSMenu"; title = "Actions"; ObjectID = "598"; */
 "598.title" = "Actions";
 
-/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "599"; */
+/* Class = "NSMenuItem"; title = "Send Marked to Trash..."; ObjectID = "599"; */
-"599.title" = "Send Marked to Trash";
+"599.title" = "Send Marked to Trash...";
 
 /* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
 "600.title" = "Move Marked to...";
@@ -170,5 +170,11 @@
 /* Class = "NSMenuItem"; title = "Re-Prioritize Results"; ObjectID = "1276"; */
 "1276.title" = "Re-Prioritize Results";
 
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "1280"; */
+"1280.title" = "Quick Look";
+
 /* Class = "NSMenuItem"; title = "Ignore List"; ObjectID = "1283"; */
 "1283.title" = "Ignore List";
+
+/* Class = "NSMenuItem"; title = "Filter Results..."; ObjectID = "1288"; */
+"1288.title" = "Filter Results...";

cocoa/base/en.lproj/MainMenu.xib

@@ -351,7 +351,7 @@
 								</object>
 								<object class="NSMenuItem" id="894871136">
 									<reference key="NSMenu" ref="600111647"/>
-									<string key="NSTitle">Send Marked to Trash</string>
+									<string key="NSTitle">Send Marked to Trash...</string>
 									<string key="NSKeyEquiv">t</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -574,7 +574,7 @@
 								</object>
 								<object class="NSMenuItem" id="343354529">
 									<reference key="NSMenu" ref="472719764"/>
-									<string key="NSTitle">Quicklook</string>
+									<string key="NSTitle">Quick Look</string>
 									<string key="NSKeyEquiv">l</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>

cocoa/base/en.lproj/ResultWindow.strings

@@ -29,8 +29,8 @@
 /* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
 "19.paletteLabel" = "Directories";
 
-/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
+/* Class = "NSMenuItem"; title = "Send Marked to Trash..."; ObjectID = "29"; */
-"29.title" = "Send Marked to Trash";
+"29.title" = "Send Marked to Trash...";
 
 /* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
 "30.title" = "Move Marked to...";
@@ -91,3 +91,9 @@
 
 /* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
 "74.title" = "Open Selected with Default Application";
+
+/* Class = "NSToolbarItem"; label = "Quick Look"; ObjectID = "86"; */
+"86.label" = "Quick Look";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Quick Look"; ObjectID = "86"; */
+"86.paletteLabel" = "Quick Look";

cocoa/base/en.lproj/ResultWindow.xib

@@ -161,7 +161,7 @@
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {195, 23}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSegmentedCell" key="NSCell" id="993391476">
 									<int key="NSCellFlags">67239424</int>
@@ -218,7 +218,7 @@
 								<int key="NSvFlags">258</int>
 								<string key="NSFrame">{{0, 14}, {81, 22}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSearchFieldCell" key="NSCell" id="830851754">
 									<int key="NSCellFlags">343014976</int>
@@ -310,7 +310,7 @@
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{12, 14}, {44, 25}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:161</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="560045192">
@@ -377,7 +377,7 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{1, 14}, {40, 25}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSPopUpButtonCell" key="NSCell" id="302095930">
 									<int key="NSCellFlags">-2076049856</int>
@@ -418,7 +418,7 @@
 											<reference ref="764786770"/>
 											<object class="NSMenuItem" id="799999563">
 												<reference key="NSMenu" ref="778415311"/>
-												<string key="NSTitle">Send Marked to Trash</string>
+												<string key="NSTitle">Send Marked to Trash...</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="1054238029"/>
@@ -546,7 +546,7 @@
 											</object>
 										</array>
 									</object>
-									<int key="NSSelectedIndex">-1</int>
+									<int key="NSSelectedIndex">1</int>
 									<bool key="NSPullDown">YES</bool>
 									<int key="NSPreferredEdge">3</int>
 									<bool key="NSUsesItemFromMenu">YES</bool>
@@ -651,6 +651,7 @@
 							<string key="NSFrame">{{17, 6}, {523, 17}}</string>
 							<reference key="NSSuperview" ref="709578684"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="28557631">
 								<int key="NSCellFlags">67239424</int>
@@ -684,7 +685,7 @@
 											<string key="NSFrameSize">{557, 355}</string>
 											<reference key="NSSuperview" ref="607866053"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="684329735"/>
+											<reference key="NSNextKeyView" ref="777138208"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="215887725">
 												<reference key="NSNextResponder" ref="684329735"/>
@@ -785,7 +786,7 @@
 							<string key="NSFrame">{{0, 28}, {559, 373}}</string>
 							<reference key="NSSuperview" ref="709578684"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="607866053"/>
+							<reference key="NSNextKeyView" ref="684329735"/>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="777138208"/>
 							<reference key="NSHScroller" ref="517980657"/>
@@ -1558,6 +1559,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">clearPictureCache:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">clearPictureCache:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">clearPictureCache:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/ResultWindow.h</string>
@@ -1571,6 +1583,7 @@
 						<string key="copyMarked:">id</string>
 						<string key="exportToXHTML:">id</string>
 						<string key="filter:">id</string>
+						<string key="focusOnFilterField:">id</string>
 						<string key="ignoreSelected:">id</string>
 						<string key="invokeCustomCommand:">id</string>
 						<string key="markAll:">id</string>
@@ -1613,6 +1626,10 @@
 							<string key="name">filter:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="focusOnFilterField:">
+							<string key="name">focusOnFilterField:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="ignoreSelected:">
 							<string key="name">ignoreSelected:</string>
 							<string key="candidateClassName">id</string>
@@ -1748,18 +1765,10 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<real value="4100" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

cocoa/inter/app_me.py

@@ -146,12 +146,12 @@ class DupeGuruME(DupeGuruBase):
         self.directories = Directories(fileclasses=self.directories.fileclasses)
         self.dead_tracks = []
     
-    def _do_delete(self, j, replace_with_hardlinks):
+    def _do_delete(self, j, replace_with_hardlinks, direct_deletion):
         # XXX If I read correctly, Python 3.3 will allow us to go fetch inner function easily, so
         # we'll be able to replace "op" below with DupeGuruBase._do_delete.op.
         def op(dupe):
             j.add_progress()
-            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+            return self._do_delete_dupe(dupe, replace_with_hardlinks, direct_deletion)
         
         marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
         j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
@@ -164,10 +164,10 @@ class DupeGuruME(DupeGuruBase):
                 pass
         self.results.perform_on_marked(op, True)
     
-    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion):
         if isinstance(dupe, ITunesSong):
             dupe.remove_from_library()
-        DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+        DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion)
     
     def _create_file(self, path):
         if (self.directories.itunes_libpath is not None) and (path in self.directories.itunes_libpath[:-1]):

cocoa/inter/app_pe.py

@@ -11,16 +11,17 @@ import plistlib
 import logging
 import re
 
-from appscript import app, its, CommandError, ApplicationNotFoundError
+from appscript import app, its, k, CommandError, ApplicationNotFoundError
 
 from hscommon import io
-from hscommon.util import remove_invalid_xml
+from hscommon.util import remove_invalid_xml, first
 from hscommon.path import Path
 from hscommon.trans import trget
 from cocoa import proxy
 
 from core.scanner import ScanType
 from core import directories
+from core.app import JobType
 from core_pe import _block_osx
 from core_pe.photo import Photo as PhotoBase
 from core_pe.app import DupeGuru as DupeGuruBase
@@ -29,6 +30,7 @@ from .app import PyDupeGuruBase
 tr = trget('ui')
 
 IPHOTO_PATH = Path('iPhoto Library')
+APERTURE_PATH = Path('Aperture Library')
 
 class Photo(PhotoBase):
     HANDLED_EXTS = PhotoBase.HANDLED_EXTS.copy()
@@ -48,18 +50,25 @@ class Photo(PhotoBase):
     
 
 class IPhoto(Photo):
+    def __init__(self, path, db_id):
+        # In IPhoto, we don't care about the db_id, we find photos by path.
+        Photo.__init__(self, path)
+    
     @property
     def display_folder_path(self):
         return IPHOTO_PATH
-    
-def get_iphoto_database_path():
-    plisturls = proxy.prefValue_inDomain_('iPhotoRecentDatabases', 'com.apple.iApps')
-    if not plisturls:
-        raise directories.InvalidPathError()
-    plistpath = proxy.url2path_(plisturls[0])
-    return Path(plistpath)
 
-def get_iphoto_pictures(plistpath):
+class AperturePhoto(Photo):
+    def __init__(self, path, db_id):
+        Photo.__init__(self, path)
+        self.db_id = db_id
+    
+    @property
+    def display_folder_path(self):
+        return APERTURE_PATH
+
+def get_iphoto_or_aperture_pictures(plistpath, photo_class):
+    # The structure of iPhoto and Aperture libraries for the base photo list are excactly the same.
     if not io.exists(plistpath):
         return []
     s = io.open(plistpath, 'rt', encoding='utf-8').read()
@@ -73,14 +82,33 @@ def get_iphoto_pictures(plistpath):
         logging.warning("%d invalid XML entities replacement made", count)
     plist = plistlib.readPlistFromBytes(s.encode('utf-8'))
     result = []
-    for photo_data in plist['Master Image List'].values():
+    for key, photo_data in plist['Master Image List'].items():
         if photo_data['MediaType'] != 'Image':
             continue
         photo_path = Path(photo_data['ImagePath'])
-        photo = IPhoto(photo_path)
+        photo = photo_class(photo_path, key)
         result.append(photo)
     return result
 
+def get_iphoto_pictures(plistpath):
+    return get_iphoto_or_aperture_pictures(plistpath, IPhoto)
+
+def get_aperture_pictures(plistpath):
+    return get_iphoto_or_aperture_pictures(plistpath, AperturePhoto)
+
+def get_iapps_database_path(prefname):
+    plisturls = proxy.prefValue_inDomain_(prefname, 'com.apple.iApps')
+    if not plisturls:
+        raise directories.InvalidPathError()
+    plistpath = proxy.url2path_(plisturls[0])
+    return Path(plistpath)
+
+def get_iphoto_database_path():
+    return get_iapps_database_path('iPhotoRecentDatabases')
+
+def get_aperture_database_path():
+    return get_iapps_database_path('ApertureLibraries')
+
 class Directories(directories.Directories):
     def __init__(self):
         directories.Directories.__init__(self, fileclasses=[Photo])
@@ -89,6 +117,11 @@ class Directories(directories.Directories):
             self.set_state(self.iphoto_libpath[:-1], directories.DirectoryState.Excluded)
         except directories.InvalidPathError:
             self.iphoto_libpath = None
+        try:
+            self.aperture_libpath = get_aperture_database_path()
+            self.set_state(self.aperture_libpath[:-1], directories.DirectoryState.Excluded)
+        except directories.InvalidPathError:
+            self.aperture_libpath = None
     
     def _get_files(self, from_path, j):
         if from_path == IPHOTO_PATH:
@@ -99,25 +132,33 @@ class Directories(directories.Directories):
             for photo in photos:
                 photo.is_ref = is_ref
             return photos
+        elif from_path == APERTURE_PATH:
+            if self.aperture_libpath is None:
+                return []
+            is_ref = self.get_state(from_path) == directories.DirectoryState.Reference
+            photos = get_aperture_pictures(self.aperture_libpath)
+            for photo in photos:
+                photo.is_ref = is_ref
+            return photos
         else:
             return directories.Directories._get_files(self, from_path, j)
     
     @staticmethod
     def get_subfolders(path):
-        if path == IPHOTO_PATH:
+        if path in {IPHOTO_PATH, APERTURE_PATH}:
             return []
         else:
             return directories.Directories.get_subfolders(path)
     
     def add_path(self, path):
-        if path == IPHOTO_PATH:
+        if path in {IPHOTO_PATH, APERTURE_PATH}:
             if path not in self:
                 self._dirs.append(path)
         else:
             directories.Directories.add_path(self, path)
     
     def has_iphoto_path(self):
-        return any(path == IPHOTO_PATH for path in self._dirs)
+        return any(path in {IPHOTO_PATH, APERTURE_PATH} for path in self._dirs)
     
     def has_any_file(self):
         # If we don't do that, it causes a hangup in the GUI when we click Start Scanning because
@@ -135,11 +176,12 @@ class DupeGuruPE(DupeGuruBase):
         DupeGuruBase.__init__(self, view, appdata)
         self.directories = Directories()
     
-    def _do_delete(self, j, replace_with_hardlinks):
+    def _do_delete(self, j, replace_with_hardlinks, direct_deletion):
         def op(dupe):
             j.add_progress()
-            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+            return self._do_delete_dupe(dupe, replace_with_hardlinks, direct_deletion)
         
+        self.deleted_aperture_photos = False
         marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
         j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
         if any(isinstance(dupe, IPhoto) for dupe in marked):
@@ -150,9 +192,17 @@ class DupeGuruPE(DupeGuruBase):
                 a.select(a.photo_library_album(timeout=0), timeout=0)
             except (CommandError, RuntimeError, ApplicationNotFoundError):
                 pass
+        if any(isinstance(dupe, AperturePhoto) for dupe in marked):
+            self.deleted_aperture_photos = True
+            j.add_progress(0, desc=tr("Talking to Aperture. Don't touch it!"))
+            try:
+                a = app('Aperture')
+                a.activate(timeout=0)
+            except (CommandError, RuntimeError, ApplicationNotFoundError):
+                pass
         self.results.perform_on_marked(op, True)
     
-    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion):
         if isinstance(dupe, IPhoto):
             try:
                 a = app('iPhoto')
@@ -167,16 +217,61 @@ class DupeGuruPE(DupeGuruBase):
                 raise EnvironmentError(msg)
             except (CommandError, RuntimeError) as e:
                 raise EnvironmentError(str(e))
+        if isinstance(dupe, AperturePhoto):
+            try:
+                a = app('Aperture')
+                # I'm flying blind here. In my own test library, all photos are in an album with the
+                # id "LibraryFolder", so I'm going to guess that it's the case at least most of the
+                # time. As a safeguard, if we don't find any library with that id, we'll use the
+                # first album.
+                # Now, about deleting: All attempts I've made at sending photos to trash failed,
+                # even with normal applescript. So, what we're going to do here is to create a
+                # "dupeGuru Trash" project and tell the user to manually send those photos to trash.
+                libraries = a.libraries()
+                library = first(l for l in libraries if l.id == 'LibraryFolder')
+                if library is None:
+                    library = libraries[0]
+                trash_project = a.projects["dupeGuru Trash"]
+                if trash_project.exists():
+                    trash_project = trash_project()
+                else:
+                    trash_project = library.make(new=k.project, with_properties={k.name: "dupeGuru Trash"})
+                [photo] = library.image_versions[its.id == dupe.db_id]()
+                photo.move(to=trash_project)
+            except (IndexError, ValueError):
+                msg = "Could not find photo '{}' in Aperture Library".format(str(dupe.path))
+                raise EnvironmentError(msg)
+            except (CommandError, RuntimeError) as e:
+                raise EnvironmentError(str(e))
         else:
-            DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+            DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion)
     
     def _create_file(self, path):
         if (self.directories.iphoto_libpath is not None) and (path in self.directories.iphoto_libpath[:-1]):
-            return IPhoto(path)
+            if not hasattr(self, 'path2iphoto'):
+                photos = get_iphoto_pictures(self.directories.iphoto_libpath)
+                self.path2iphoto = {p.path: p for p in photos}
+            return self.path2iphoto.get(path)
+        if (self.directories.aperture_libpath is not None) and (path in self.directories.aperture_libpath[:-1]):
+            if not hasattr(self, 'path2aperture'):
+                photos = get_aperture_pictures(self.directories.aperture_libpath)
+                self.path2aperture = {p.path: p for p in photos}
+            return self.path2aperture.get(path)
         return DupeGuruBase._create_file(self, path)
     
+    def _job_completed(self, jobid, exc):
+        DupeGuruBase._job_completed(self, jobid, exc)
+        if jobid == JobType.Load:
+            if hasattr(self, 'path2iphoto'):
+                del self.path2iphoto
+            if hasattr(self, 'path2aperture'):
+                del self.path2aperture
+        if jobid == JobType.Delete and self.deleted_aperture_photos:
+            msg = tr("Deleted Aperture photos were sent to a project called \"dupeGuru Trash\".")
+            self.view.show_message(msg)
+    
     def copy_or_move(self, dupe, copy, destination, dest_type):
-        if isinstance(dupe, IPhoto):
+        if isinstance(dupe, (IPhoto, AperturePhoto)):
             copy = True
         return DupeGuruBase.copy_or_move(self, dupe, copy, destination, dest_type)
     

cocoa/inter/deletion_options.py

@@ -5,6 +5,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
+from objp.util import dontwrap
 from cocoa.inter import PyGUIObject, GUIObjectView
 
 class DeletionOptionsView(GUIObjectView):
@@ -19,9 +20,11 @@ class PyDeletionOptions(PyGUIObject):
         self.model.direct = direct
     
     #--- model --> view
+    @dontwrap
     def update_msg(self, msg):
         self.callback.updateMsg_(msg)
     
+    @dontwrap
     def show(self):
         return self.callback.show()
     

cocoa/inter/ignore_list_dialog.py

@@ -1,4 +1,4 @@
-from objp.util import pyref
+from objp.util import pyref, dontwrap
 from cocoa.inter import PyGUIObject, GUIObjectView
 
 class IgnoreListDialogView(GUIObjectView):
@@ -15,6 +15,7 @@ class PyIgnoreListDialog(PyGUIObject):
         self.model.clear()
     
     #--- model --> view
+    @dontwrap
     def show(self):
         self.callback.show()
     

cocoa/pe/DirectoryPanel.h

@@ -13,4 +13,5 @@ http://www.hardcoded.net/licenses/bsd_license
 {
 }
 - (IBAction)addiPhoto:(id)sender;
+- (IBAction)addAperture:(id)sender;
 @end

cocoa/pe/DirectoryPanel.m

@@ -24,10 +24,18 @@ http://www.hardcoded.net/licenses/bsd_license
     NSMenuItem *mi = [m insertItemWithTitle:TR(@"Add iPhoto Library") action:@selector(addiPhoto:)
         keyEquivalent:@"" atIndex:1];
     [mi setTarget:self];
+    mi = [m insertItemWithTitle:TR(@"Add Aperture Library") action:@selector(addAperture:)
+        keyEquivalent:@"" atIndex:2];
+    [mi setTarget:self];
 }
 
 - (IBAction)addiPhoto:(id)sender
 {
     [self addDirectory:@"iPhoto Library"];
 }
+
+- (IBAction)addAperture:(id)sender
+{
+    [self addDirectory:@"Aperture Library"];
+}
 @end

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.3.1'
+__version__ = '6.4.1'
 __appname__ = 'dupeGuru Music Edition'

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.5.0'
+__version__ = '2.6.0'
 __appname__ = 'dupeGuru Picture Edition'

help/changelog_me

@@ -1,3 +1,14 @@
+=== 6.4.1 (2012-06-04)
+
+* Fixed bug introduced in 6.4.0 preventing deletions from working. [Mac]
+
+=== 6.4.0 (2012-06-02)
+
+* Added a Deletion Options panel.
+* Greatly improved memory usage for big scans.
+* Added a keybinding for the filter field. (#182) [Mac]
+* Upgraded minimum requirements for Ubuntu to 12.04.
+
 === 6.3.1 (2012-04-15)
 
 * Fixed crash on iTunes library parsing. [Mac]

help/changelog_pe

@@ -1,3 +1,12 @@
+=== 2.6.0 (2012-06-06)
+
+* Added Aperture support. (#42)
+* Added a Deletion Options panel.
+* Greatly improved memory usage for big scans.
+* Added a keybinding for the filter field. (#182) [Mac]
+* Fixed occasional hard crashes during scans. [Linux]
+* Upgraded minimum requirements for Ubuntu to 12.04.
+
 === 2.5.0 (2012-03-31)
 
 * Improved results window UI. [Windows, Linux]

help/changelog_se

@@ -3,6 +3,7 @@
 * Added a Deletion Options panel.
 * Greatly improved memory usage for big scans.
 * Added a keybinding for the filter field. (#182) [Mac]
+* Upgraded minimum requirements for Ubuntu to 12.04.
 
 === 3.4.1 (2012-04-14)
 

help/conf.tmpl

@@ -173,51 +173,4 @@ html_show_sourcelink = False
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'dupeGurudoc'
 
-
+todo_include_todos = True
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'dupeGuru.tex', u'dupeGuru Documentation',
-   u'Hardcoded Software', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'dupeguru', u'dupeGuru Documentation',
-     [u'Hardcoded Software'], 1)
-]

help/de/folders.rst

@@ -19,3 +19,5 @@ Jeder Ordner kann in einem von 3 Zuständen sein:
 Der Standardzustand eines Ordners ist natürlich **Normal**. Sie können den **Referenz** Zustand für Ordner nutzen, in denen auf keinen Fall eine Datei gelöscht werden soll. 
 
 Wenn sie einen Zustand für ein Verzeichnis setzen, erben alle Unterordner automatisch diesen Zustand, es sei denn Sie ändern den Zustand der Unterordner explizit.
+
+.. todo:: Add iPhoto/Aperture/iTunes libraries notes

help/en/folders.rst

@@ -21,3 +21,33 @@ Every folder can be in one of these 3 states:
 The default state of a folder is, of course, **Normal**. You can use **Reference** state for a folder if you want to be sure that you won't delete any file from it.
 
 When you set the state of a directory, all subfolders of this folder automatically inherit this state unless you explicitly set a subfolder's state.
+
+.. only:: edition_pe
+
+    iPhoto and Aperture libraries
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    
+    dupeGuru PE supports iPhoto and Aperture, which means that it knows how to read these libraries
+    and how to communicate with iPhoto and Aperture to remove photos from them. To use this feature,
+    use the special "Add iPhoto Library" and "Add Aperture Library" buttons in the menu that pops
+    up when you click the "+" button. This will then add a special folder for those libraries.
+    
+    When duplicates are deleted from an iPhoto library, it's sent to iPhoto's trash.
+    
+    When duplicates are deleted from an Aperture library, it unfortunately can't send it directly
+    to trash, but it creates a special project called "dupeGuru Trash" in Aperture and send all
+    photos in there. You can then send this project to the trash manually.
+
+.. only:: edition_me
+
+    iTunes library
+    ^^^^^^^^^^^^^^
+    
+    dupeGuru ME supports iTunes, which means that it knows how to read its libraries and how to
+    communicate with iTunes to remove songs from it. To use this feature, use the special
+    "Add iTunes Library" button in the menu that pops up when you click the "+" button. This will
+    then add a special folder for those libraries.
+    
+    When duplicates are deleted from an iTunes library, it's sent to the system trash, like a
+    normal file, but it's also removed from iTunes, thus avoiding ending up with missing entries
+    (entries with the "!" logo next to them).

help/fr/folders.rst

@@ -21,3 +21,5 @@ Tout dossier ajouté à la liste est d'un type parmis ces trois:
 Le type par défaut pour un dossier est, bien entendu, **Normal**. Vous pouvez utiliser le type **Référence** pour les dossiers desquels vous ne voulez pas effacer de fichiers.
 
 Le type d'un dossier s'applique à ses sous-dossiers, excepté si un sous-dossier a un autre type explicitement défini.
+
+.. todo:: Add iPhoto/Aperture/iTunes libraries notes

help/hy/folders.rst

@@ -21,3 +21,5 @@
 Թղթապանակի հիմնական վիճակը, իհարկե՛ **Նորմալ է**: Կարող եք օգտագործել **Հղված** վիճակը թղթապանակի համար, եթե ցանկանում եք համոզված լինել, որ ոչ մի ֆայլ չի ջնջվի:
 
 Եթե նշել եք թղթապանակի վիճակը, բոլոր ենթաթղթապանակները միանգամից կժառանգեն այս վիճակը, եթե վիճակը պարզորոշ տրված է թղթապանակի կարգում:
+
+.. todo:: Add iPhoto/Aperture/iTunes libraries notes

help/ru/folders.rst

@@ -20,4 +20,6 @@
 
 Состояние по умолчанию к папке, конечно, **Нормальный**. Вы можете использовать **Ссылка**  состояние для папки, если вы хотите быть уверены, что вы не будете удалять любые файлы из него.
 
-Когда вы устанавливаете состояние каталог, все подпапки этой папки автоматически наследует это состояние, если явно не включенное состояние подпапку в.
+Когда вы устанавливаете состояние каталог, все подпапки этой папки автоматически наследует это состояние, если явно не включенное состояние подпапку в.
+
+.. todo:: Add iPhoto/Aperture/iTunes libraries notes

help/uk/folders.rst

@@ -18,4 +18,6 @@
 
 Стан за замовчуванням до папки, звичайно, **Нормальний**. Ви можете використовувати **Посилання**  стан для папки, якщо ви хочете бути впевнені, що ви не будете видаляти будь-які файли з нього.
 
-Коли ви встановлюєте стан каталог, все підпапки цієї папки автоматично успадковує цей стан, якщо явно не включений стан підпапку в.
+Коли ви встановлюєте стан каталог, все підпапки цієї папки автоматично успадковує цей стан, якщо явно не включений стан підпапку в.
+
+.. todo:: Add iPhoto/Aperture/iTunes libraries notes

locale/cs/LC_MESSAGES/ui.po

@@ -87,16 +87,16 @@ msgstr "Okno s výsledky"
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Soubor"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr ""
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Nápověda"
@@ -140,7 +140,7 @@ msgstr "Vyberte soubor s výsledky, který chcete nahrát"
 msgid "All Files (*.*)"
 msgstr ""
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -261,125 +261,121 @@ msgstr "Ukázat vybrané ve správci souborů"
 msgid "Close"
 msgstr "Zavřít"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Detaily"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Akce"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Zobrazit pouze duplicity"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Zobrazit rozdíly"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr ""
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Označené přesunout..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Označené kopírovat..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Odstranit označené z výsledků"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Odstranit výběr z výsledků"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Přidat výběr na seznam výjimek"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Výběr jako reference"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Vybrané otevřít výchozí aplikací"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Vybrané přejmenovat"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Označit vše"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Zrušit označení"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Invertovat označení"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Označit vybrané"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Uložit výsledky..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Spustit vlastní příkaz"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Sloupce"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Výchozí nastavení"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Vyberte soubor pro uložení výsledků"
 
@@ -534,10 +530,6 @@ msgstr "Nahrát ze souboru..."
 msgid "Reset to Default"
 msgstr "Výchozí nastavení"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Přidat složku iTunes"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Odstranit z iTunes mrtvé stopy"
@@ -590,11 +582,6 @@ msgstr "Předvolby..."
 msgid "Folder Selection Window"
 msgstr "Výběr složky"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Vyhodit označené do koše"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -648,7 +635,7 @@ msgstr "Změnit prioritu výsledků"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -688,7 +675,7 @@ msgstr "Akce"
 msgid "Directories"
 msgstr "Adresáře"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Jen duplicity"
 
@@ -787,15 +774,15 @@ msgstr "Odstraňuji mrtvé stopy z Vaší knihovny iTunes"
 msgid "Scanning the iTunes Library"
 msgstr "Procházím knihovnu iTunes"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Vyhazuji kopie do koše"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "Nelze najít aplikaci iPhoto."
 
@@ -841,7 +828,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -877,26 +864,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr ""
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Přidat složku iTunes"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Vyhodit označené do koše..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/de/LC_MESSAGES/ui.po

@@ -87,16 +87,16 @@ msgstr "Ergebnisfenster"
 msgid "Add Folder..."
 msgstr "Ordner hinzufügen..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Ablage"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "Ansicht"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Hilfe"
@@ -140,7 +140,7 @@ msgstr "Wählen Sie eine Ergebnisliste zum Laden aus."
 msgid "All Files (*.*)"
 msgstr "Alle Dateien (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru Ergebnisse (*.dupeguru)"
 
@@ -270,125 +270,121 @@ msgstr "Zeige Markierte"
 msgid "Close"
 msgstr "Schließen"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Details"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Aktionen"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Nur Duplikate anzeigen"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Zeige Deltawerte"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "Verschiebe Markierte in den Mülleimer"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Verschiebe Markierte nach..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Kopiere Markierte nach..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Entferne Markierte aus den Ergebnissen"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Entferne Ausgewählte aus den Ergebnissen"
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Entferne Ausgewählte aus den Ergebnissen"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Füge Ausgewählte der Ignorier-Liste hinzu"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Mache Ausgewählte zur Referenz"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Öffne Ausgewählte mit Standardanwendung"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Öffne beeinhaltenden Ordner der Ausgewählten"
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Ausgewählte umbenennen"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Alles markieren"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Nichts markieren"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Markierung invertieren"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Ausgewählte markieren"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Exportiere als HTML"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Speichere Ergebnisse..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Eigenen Befehl ausführen"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Auswählen"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Spalten"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Voreinstellungen"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (Ergebnisse)"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Datei zum Speichern der Ergebnisliste auswählen."
 
@@ -544,10 +540,6 @@ msgstr "Load from file..."
 msgid "Reset to Default"
 msgstr "Reset to Default"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Add iTunes Directory"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Remove Dead Tracks in iTunes"
@@ -600,11 +592,6 @@ msgstr "Preferences..."
 msgid "Folder Selection Window"
 msgstr "Folder Selection Window"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Send Marked to Trash"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -658,7 +645,7 @@ msgstr "Re-Prioritize Results"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -688,7 +675,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Directories"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Dupes Only"
 
@@ -787,15 +774,15 @@ msgstr "Entferne tote Stücke aus Ihrer iTunes Bibliothek."
 msgid "Scanning the iTunes Library"
 msgstr "Scanne die iTunes Bibiliothek"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Verschiebe Duplikate in den Mülleimer"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "The iPhoto application couldn't be found."
 
@@ -841,7 +828,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -877,26 +864,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "Verschiebe Markierte in den Mülleimer..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/fr/LC_MESSAGES/ui.po

@@ -87,16 +87,16 @@ msgstr "Fenêtre de résultats"
 msgid "Add Folder..."
 msgstr "Ajouter dossier..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Fichier"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "Voir"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Aide"
@@ -140,7 +140,7 @@ msgstr "Sélectionnez un fichier résultats à charger"
 msgid "All Files (*.*)"
 msgstr "Tout les fichiers (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "Résultats dupeGuru (*.dupeguru)"
 
@@ -272,125 +272,121 @@ msgstr "Révéler Fichier"
 msgid "Close"
 msgstr "Fermer"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Détails"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Actions"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Ne pas montrer les références"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Montrer les valeurs en tant que delta"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "Envoyer marqués à la corbeille"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Déplacer marqués vers..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Copier marqués vers..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Retirer marqués des résultats"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Re-prioriser les résultats"
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Retirer sélectionnés des résultats"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Ajouter sélectionnés à la liste de fichiers ignorés"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Transformer sélectionnés en références"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Ouvrir sélectionné avec l'application par défaut"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Ouvrir le dossier contenant le fichier sélectionné"
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Renommer sélectionné"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Tout marquer"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Tout démarquer"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Inverser le marquage"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Marquer sélectionnés"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Exporter vers HTML"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Sauvegarder résultats..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Invoquer commande personnalisée"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Marquer"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Colonnes"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Réinitialiser"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (Résultats)"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Sélectionnez un fichier résultats dans lequel sauvegarder"
 
@@ -545,10 +541,6 @@ msgstr "Charger un fichier..."
 msgid "Reset to Default"
 msgstr "Colonnes par défault"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Ajouter librairie iTunes"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Retirer les tracks mortes dans iTunes"
@@ -601,11 +593,6 @@ msgstr "Préférences..."
 msgid "Folder Selection Window"
 msgstr "Fenêtre de sélection de dossiers"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Envoyer marqués à la corbeille"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -659,7 +646,7 @@ msgstr "Re-prioriser les résultats"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -699,7 +686,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Dossiers"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Sans réf."
 
@@ -798,15 +785,15 @@ msgstr "Retrait des tracks mortes de votre librairie iTunes"
 msgid "Scanning the iTunes Library"
 msgstr "Scan de la librairie iTunes en cours"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Envoi de doublons à la corbeille en cours"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "iPhoto n'a pas pu être trouvée dans vos applications."
 
@@ -853,7 +840,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -889,28 +876,68 @@ msgstr "Options de suppression"
 msgid "Hardlink deleted files"
 msgstr "Remplacer par des \"hardlinks\""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
-msgstr "Après avoir supprimé un fichier, on remplace celui-ci par un lien "
+msgstr ""
-"vers son fichier de référence."
+"Après avoir supprimé un fichier, on remplace celui-ci par un lien vers son "
+"fichier de référence."
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr "Supprimer les fichiers directement"
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
-msgstr "Au lieu de passer par la corbeille, supprimer directement. Cette "
+msgstr ""
-"option n'est généralement utilisée qu'en cas de problème."
+"Au lieu de passer par la corbeille, supprimer directement. Cette option "
+"n'est généralement utilisée qu'en cas de problème."
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr "Continuer"
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr "En communication avec Aperture. N'y touchez pas!"
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr "Les photos supprimés d'Aperture sont dans le projet nommé \"dupeGuru Trash\"."
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr " (Mac OS X ou Linux seulement)"
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "Envoyer marqués à la corbeille..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Ajouter librairie iTunes"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr "Ajouter librairie Aperture"
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Envoyer marqués à la corbeille..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr "Filtrer les résultats..."

locale/hy/LC_MESSAGES/ui.po

@@ -41,15 +41,15 @@ msgstr "Հեռացվում են վնասված շավիղները iTunes-ի Շտ
 msgid "Scanning the iTunes Library"
 msgstr "Ստուգվում է iTunes-ի Շտեմարանը"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Խաբկանքները տեղափոխվում են Աղբարկղ"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr "Զրույց iPhoto-ի հետ: Մի կպեք! "
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "iPhoto ծրագիրը չի գտնվել:"
 
@@ -122,16 +122,16 @@ msgstr "Արդյունքի պատուհանը"
 msgid "Add Folder..."
 msgstr "Ավելացնել թղթապանակ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Ֆայլ"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "Տեսքը"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Օգնություն"
@@ -175,7 +175,7 @@ msgstr "Ընտրեք արդյունքի ֆայլը՝ բացելու համար"
 msgid "All Files (*.*)"
 msgstr "Բոլոր ֆայլերը  (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru-ի արդյունքները (*.dupeguru)"
 
@@ -305,125 +305,121 @@ msgstr "Ցուցադրել ընտրվածը"
 msgid "Close"
 msgstr "Փակել"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Մանրամասն"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Գործողություններ"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Ցուցադրել միայն պատճեները"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Ցուցադրել դելտա նշան-ը"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "Ուղարկել նշվածները Աղբարկղ"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Տեղափ. նշվածը՝"
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Պատճ. նշվածը՝"
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Հեռացնել նշվածները ցանկից"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Վերաառաջնայնավորել արդյունքները..."
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "ՀԵռացնել ընտրվածը արդյունքներից"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Ավելացնել ընտրվածը Անտեսումների ցանկ"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Նշել ընտրվածի հղումը"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Բացել ընտրվածը Հիմնական ծրագրով"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Բացել ընտրվածը պարունակող թղթապանակը"
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Անվանափոխել ընտրվածը"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Նշել բոլորը"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Ոչինչ չնշել"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Ետարկել նշումը"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Նշել ընտրվածը"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Արտածել HTML-ով"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Պահպանել արդյունքները..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Անտեսել Հրամանի կատարումը"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Նշել"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Սյուները"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Ետարկել ծրագրայինի"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Արդյունքներ"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Ընտրեք ֆայլը՝ պահպանելու արդյունքները՝"
 
@@ -601,10 +597,6 @@ msgstr ""
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "Դուք չունեք շավիղներ Ձեր iTunes Շտեմարանում"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Ավելացնել iTunes թղթապանակ"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Հեռացնել մահացած շավիղները iTunes-ից"
@@ -669,11 +661,6 @@ msgstr "Կարգավորումներ..."
 msgid "Folder Selection Window"
 msgstr "Թղթապանակը ընտրելու պատուհանը"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Ուղարկել նշվածները Աղբարկղ"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -727,7 +714,7 @@ msgstr "Վերաառաջնայնավորել արդյունքները"
 msgid "Ok"
 msgstr "ԼԱՎ"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -757,7 +744,7 @@ msgstr "Գործողությունը"
 msgid "Directories"
 msgstr "Թղթապանակներ"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Միայն կրկ."
 
@@ -852,7 +839,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -888,26 +875,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "Ուղարկել նշվածները Աղբարկղ..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Ավելացնել iTunes թղթապանակ"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Ուղարկել նշվածները Աղբարկղ..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/it/LC_MESSAGES/ui.po

@@ -30,15 +30,15 @@ msgstr "Rimozione delle tracce insistenti dalla libreria di iTunes"
 msgid "Scanning the iTunes Library"
 msgstr "Scansione della libreria di iTunes"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Spostamento dei duplicati nel cestino"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "Non trovo l'applicazione iPhoto."
 
@@ -111,16 +111,16 @@ msgstr "Finestra dei risultati"
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "File"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr ""
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Aiuto"
@@ -166,7 +166,7 @@ msgstr "Seleziona un risultato (file) da caricare"
 msgid "All Files (*.*)"
 msgstr ""
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -298,125 +298,121 @@ msgstr "Mostra i selezionati"
 msgid "Close"
 msgstr "Chiudi"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Dettagli"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Azioni"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Visualizza solo i duplicati"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Visualizza le differenze"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr ""
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Sposta gli elementi marcati nel..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Copia gli elementi evidenziati nel..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Rimuovi gli elementi marcati dai risultati"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Rimuovi gli elementi selezionati dai risultati"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Aggiungi gli elementi selezionati alla lista da ignorare"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Imposta gli elementi selezionati come riferimento"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Apri gli elementi selezionati con l'applicazione predefinita"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Rinomina gli elementi selezionati"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Marca tutti"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Deseleziona tutti"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Inverti la selezione"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Marca i selezionati"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Salva i risultati..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Invoca comando personalizzato"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Colonne"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Ripristina impostazioni predefinite"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Seleziona un file dove salvare i tuoi risultati"
 
@@ -573,10 +569,6 @@ msgstr "Carica dal file..."
 msgid "Reset to Default"
 msgstr "Ripristina le impostazioni predefinite"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Aggiungi alla lista di iTunes"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Rimuovi le tracce inesistenti da iTunes"
@@ -629,11 +621,6 @@ msgstr "Preferenze..."
 msgid "Folder Selection Window"
 msgstr "Finestra di selezione della cartella"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Sposta gli elementi marcati nel cestino"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -687,7 +674,7 @@ msgstr "Cambia la priorità dei risultati"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -727,7 +714,7 @@ msgstr "Azione"
 msgid "Directories"
 msgstr "Cartelle"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Solo duplicati"
 
@@ -858,7 +845,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -894,26 +881,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr ""
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Aggiungi alla lista di iTunes"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Sposta gli elementi marcati nel cestino..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/ru/LC_MESSAGES/ui.po

@@ -40,15 +40,15 @@ msgstr "Удаление мертвых треков из вашей библи
 msgid "Scanning the iTunes Library"
 msgstr "Сканирование ITunes библиотеки"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Отправка обманов в корзину"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr "В контакте с iPhoto. Не трогайте!"
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "iPhoto приложение не может быть найдено."
 
@@ -121,16 +121,16 @@ msgstr "Окно результатов"
 msgid "Add Folder..."
 msgstr "Добавить папку ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Файл"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "Вид"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Помощь"
@@ -174,7 +174,7 @@ msgstr "Выберите файл результатов для загрузки
 msgid "All Files (*.*)"
 msgstr "Все файлы (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru результаты (*. dupeguru)"
 
@@ -308,125 +308,121 @@ msgstr "Показать выбранное"
 msgid "Close"
 msgstr "Закрывать"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Детали"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Действия"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Показать только обманутые"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Показать Дельта значения"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "Отправить Помечено в Корзину"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Перемещение Помечено в ..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Скопировть Помечено в ..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Удалить Помеченные от результатов"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Изменить приоритеты Результатов ..."
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Удалить выбранные из результатов"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Добавить выбранные в черный список"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Сделать выбранной ссылки"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Открыть выбранный с приложений по умолчанию"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Открыть содержащую папку выборных "
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Переименовать выбранное"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Отметить все"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Не отметить"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Обратить Маркировку"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Отметить Выбранные"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Экспорт в HTML"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Сохранить результаты ..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Вызвать специальную команду"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Отметить"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Колонны"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Восстановить значения по умолчанию"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Результаты"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Выберите файл, чтобы сохранить ваши результаты"
 
@@ -604,10 +600,6 @@ msgstr ""
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "У вас нет мертвых треков в вашей библиотеке ITunes"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Добавить ITunes каталог"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Удалить Мертвые треки в ITunes"
@@ -672,11 +664,6 @@ msgstr "Настройки ..."
 msgid "Folder Selection Window"
 msgstr "Окно выбора папок"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Отправить Отмеченное в корзину"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -730,7 +717,7 @@ msgstr "Изменить приоритеты Результатов"
 msgid "Ok"
 msgstr "ОК"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -760,7 +747,7 @@ msgstr "Действие"
 msgid "Directories"
 msgstr "Каталоги"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Только обманки"
 
@@ -855,7 +842,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -891,26 +878,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "Отправить Помечено в Корзину..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Добавить ITunes каталог"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Отправить Отмеченное в корзину..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/ui.pot

@@ -30,7 +30,7 @@ msgstr ""
 msgid "Scanning the iTunes Library"
 msgstr ""
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr ""
 
@@ -57,11 +57,19 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr ""
 
@@ -119,31 +127,35 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -178,16 +190,16 @@ msgstr ""
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr ""
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr ""
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr ""
@@ -231,7 +243,7 @@ msgstr ""
 msgid "All Files (*.*)"
 msgstr ""
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -366,133 +378,133 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr ""
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr ""
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr ""
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr ""
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr ""
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:48
-msgid "Send Marked to Recycle Bin"
+msgid "Send Marked to Recycle Bin..."
 msgstr ""
 
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr ""
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr ""
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr ""
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr ""
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr ""
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr ""
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr ""
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr ""
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr ""
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr ""
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr ""
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr ""
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr ""
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr ""
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr ""
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr ""
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr ""
 
@@ -660,7 +672,7 @@ msgid "The name '%@' already exists."
 msgstr ""
 
 #: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
+msgid "Add iTunes Library"
 msgstr ""
 
 #: cocoa/base/en.lproj/Localizable.strings:0
@@ -671,6 +683,10 @@ msgstr ""
 msgid "Add iPhoto Library"
 msgstr ""
 
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Yes"
 msgstr ""
@@ -729,7 +745,7 @@ msgstr ""
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
+msgid "Send Marked to Trash..."
 msgstr ""
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
@@ -781,6 +797,15 @@ msgstr ""
 msgid "Re-Prioritize Results"
 msgstr ""
 
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""
+
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Ok"
 msgstr ""

locale/uk/LC_MESSAGES/ui.po

@@ -40,15 +40,15 @@ msgstr "Видалення мертвих треків з вашої біблі
 msgid "Scanning the iTunes Library"
 msgstr "Сканування бібліотеки iTunes"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "Відправлення дублікатів до кошика"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr "Виконується взаємодія з програмою iPhoto. Не чіпайте її!"
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "Не вдалося знайти програму iPhoto."
 
@@ -121,16 +121,16 @@ msgstr "Вікно результатів"
 msgid "Add Folder..."
 msgstr "Додати папку ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "Файл"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "Вид"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Допомога"
@@ -174,7 +174,7 @@ msgstr "Виберіть файл результатів для завантаж
 msgid "All Files (*.*)"
 msgstr "Всі файли (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "Результати dupeGuru (*.dupeguru) "
 
@@ -306,125 +306,121 @@ msgstr "Показати вибрані"
 msgid "Close"
 msgstr "Закрити"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "Деталі"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "Дії"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "Показати тільки дуплікати"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "Показати різницю"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "Надіслати позначене до кошику"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "Перемістити позначене до ..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "Скопіювати позначене до ..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "Видалити позначене з результатів"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Змінити пріоритети результатів ..."
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "Видалити обране з результатів"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "Додати обране в чорний список"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "Зробити обране посиланням"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "Відкрити обране програмою за умовчанням"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Відкрити папку, що містить обране"
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "Перейменувати обране"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "Позначити всі"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "Скинути позначення"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "Інвертувати позначення"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "Позначити обране"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Експорт в HTML"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "Зберегти результати ..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "Викликати власну команду"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Позначити"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "Колонки"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "Відновити налаштування за замовчуванням"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Результати"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "Оберіть файл у який слід зберегти ваші результати"
 
@@ -602,10 +598,6 @@ msgstr ""
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "У вашій бібліотеці iTunes немає мертвих треків "
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Додати папку iTunes"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Видалити мертві треки в iTunes"
@@ -670,11 +662,6 @@ msgstr "Налаштування ..."
 msgid "Folder Selection Window"
 msgstr "Вікно вибору папок"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Надіслати позначене до кошику"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -728,7 +715,7 @@ msgstr "Змінити пріоритети Результати"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -758,7 +745,7 @@ msgstr "Дія"
 msgid "Directories"
 msgstr "Папки"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Тільки дублікати"
 
@@ -853,7 +840,7 @@ msgstr "Виконується взаємодія з програмою iTunes.
 msgid "The iTunes application couldn't be found."
 msgstr "Не можливо знайти програму iTunes"
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr "Різниця"
 
@@ -889,26 +876,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "Надіслати позначене до кошику..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr "Додати папку iTunes"
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr "Надіслати позначене до кошику..."
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

locale/zh_CN/LC_MESSAGES/ui.po

@@ -85,16 +85,16 @@ msgstr "结果窗口"
 msgid "Add Folder..."
 msgstr "增加文件夹..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:78
+#: qt/base/directories_dialog.py:67 qt/base/result_window.py:75
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "File"
 msgstr "文件"
 
-#: qt/base/directories_dialog.py:69 qt/base/result_window.py:86
+#: qt/base/directories_dialog.py:69 qt/base/result_window.py:83
 msgid "View"
 msgstr "视图"
 
-#: qt/base/directories_dialog.py:71 qt/base/result_window.py:88
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "帮助"
@@ -138,7 +138,7 @@ msgstr "选择一个结果文件并载入"
 msgid "All Files (*.*)"
 msgstr "所有文件 (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:296
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru结果 (*.dupeguru)"
 
@@ -266,125 +266,121 @@ msgstr "显示选择"
 msgid "Close"
 msgstr "关闭"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:171
+#: qt/base/result_window.py:44 qt/base/result_window.py:168
 #: qt/me/details_dialog.py:20 qt/pe/details_dialog.py:25
 #: qt/se/details_dialog.py:20 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Details"
 msgstr "详细说明"
 
-#: qt/base/result_window.py:48 qt/base/result_window.py:82
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
-#: qt/base/result_window.py:146 qt/base/result_window.py:170
+#: qt/base/result_window.py:143 qt/base/result_window.py:167
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Actions"
 msgstr "行为"
 
-#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:46 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Dupes Only"
 msgstr "仅显示重复文件"
 
-#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show Delta Values"
 msgstr "显示Delta值"
 
-#: qt/base/result_window.py:51
+#: qt/base/result_window.py:49 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Send Marked to Recycle Bin"
-msgstr "将标记的文件移到回收站"
-
-#: qt/base/result_window.py:52 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Move Marked to..."
 msgstr "将标记的文件移动到..."
 
-#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:50 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Copy Marked to..."
 msgstr "将标记的文件复制到..."
 
-#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:51 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Marked from Results"
 msgstr "从结果中移除所标记的文件"
 
-#: qt/base/result_window.py:55
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "从结果中移除所选的文件"
 
-#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Remove Selected from Results"
 msgstr "从结果中移除所选的文件"
 
-#: qt/base/result_window.py:57 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Add Selected to Ignore List"
 msgstr "将所选文件添加到忽略列表中"
 
-#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Make Selected Reference"
 msgstr "将所选文件设定为参照文件"
 
-#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:56 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Open Selected with Default Application"
 msgstr "使用默认程序打开所选文件"
 
-#: qt/base/result_window.py:60
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "打开所选文件所在的文件夹"
 
-#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Rename Selected"
 msgstr "重命名所选文件"
 
-#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark All"
 msgstr "标记全部"
 
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark None"
 msgstr "全部取消标记"
 
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invert Marking"
 msgstr "反选标记文件"
 
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
 msgstr "标记所选文件"
 
-#: qt/base/result_window.py:66
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "导出为 HTML"
 
-#: qt/base/result_window.py:67 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Save Results..."
 msgstr "保存结果..."
 
-#: qt/base/result_window.py:68 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Invoke Custom Command"
 msgstr "调用自定义命令"
 
-#: qt/base/result_window.py:80
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "标记"
 
-#: qt/base/result_window.py:84 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
 msgstr "显示列"
 
-#: qt/base/result_window.py:142 cocoa/se/en.lproj/Preferences.strings:0
+#: qt/base/result_window.py:139 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Reset to Defaults"
 msgstr "重置为默认值"
 
-#: qt/base/result_window.py:164
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (结果)"
 
-#: qt/base/result_window.py:295 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/result_window.py:292 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a file to save your results to"
 msgstr "将结果保存为..."
 
@@ -539,10 +535,6 @@ msgstr "Load from file..."
 msgid "Reset to Default"
 msgstr "Reset to Default"
 
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Add iTunes Directory"
-
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
 msgstr "Remove Dead Tracks in iTunes"
@@ -595,11 +587,6 @@ msgstr "Preferences..."
 msgid "Folder Selection Window"
 msgstr "Folder Selection Window"
 
-#: cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Send Marked to Trash"
-msgstr "Send Marked to Trash"
-
 #: cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Reveal Selected in Finder"
@@ -653,7 +640,7 @@ msgstr "Re-Prioritize Results"
 msgid "Ok"
 msgstr "Ok"
 
-#: qt/base/deletion_options.py:50
+#: qt/base/deletion_options.py:53
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
@@ -693,7 +680,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Directories"
 
-#: qt/base/result_window.py:172 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Dupes Only"
 
@@ -792,15 +779,15 @@ msgstr "从你的iTunes库中移除无效的音轨"
 msgid "Scanning the iTunes Library"
 msgstr "正在扫描iTunes库"
 
-#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:144
+#: cocoa/inter/app_me.py:157 cocoa/inter/app_pe.py:186
 msgid "Sending dupes to the Trash"
 msgstr "将重复文件移到垃圾桶"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
 msgstr "The iPhoto application couldn't be found."
 
@@ -846,7 +833,7 @@ msgstr ""
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:173
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
@@ -882,26 +869,64 @@ msgstr ""
 msgid "Hardlink deleted files"
 msgstr ""
 
-#: qt/base/deletion_options.py:36
+#: qt/base/deletion_options.py:39
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "After having deleted a duplicate, place a hardlink targeting the reference "
 "file to replace the deleted file."
 msgstr ""
 
-#: qt/base/deletion_options.py:41
+#: qt/base/deletion_options.py:44
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Directly delete files"
 msgstr ""
 
-#: qt/base/deletion_options.py:43
+#: qt/base/deletion_options.py:46
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid ""
 "Instead of sending files to trash, delete them directly. This option is "
 "usually used as a workaround when the normal deletion method doesn't work."
 msgstr ""
 
-#: qt/base/deletion_options.py:49
+#: qt/base/deletion_options.py:52
 #: cocoa/base/en.lproj/DeletionOptions.strings:0
 msgid "Proceed"
 msgstr ""
+
+#: cocoa/inter/app_pe.py:197
+msgid "Talking to Aperture. Don't touch it!"
+msgstr ""
+
+#: cocoa/inter/app_pe.py:270
+msgid "Deleted Aperture photos were sent to a project called \"dupeGuru Trash\"."
+msgstr ""
+
+#: qt/base/deletion_options.py:37
+msgid " (Mac OS X or Linux only)"
+msgstr ""
+
+#: qt/base/result_window.py:48
+msgid "Send Marked to Recycle Bin..."
+msgstr "将标记的文件移到回收站..."
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add iTunes Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/Localizable.strings:0
+msgid "Add Aperture Library"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Send Marked to Trash..."
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+#: cocoa/base/en.lproj/ResultWindow.strings:0
+msgid "Quick Look"
+msgstr ""
+
+#: cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Filter Results..."
+msgstr ""

qt/base/result_window.py

@@ -45,7 +45,7 @@ class ResultWindow(QMainWindow):
             ('actionActions', '', '', tr("Actions"), self.actionsTriggered),
             ('actionPowerMarker', 'Ctrl+1', '', tr("Show Dupes Only"), self.powerMarkerTriggered),
             ('actionDelta', 'Ctrl+2', '', tr("Show Delta Values"), self.deltaTriggered),
-            ('actionDeleteMarked', 'Ctrl+D', '', tr("Send Marked to Recycle Bin"), self.deleteTriggered),
+            ('actionDeleteMarked', 'Ctrl+D', '', tr("Send Marked to Recycle Bin..."), self.deleteTriggered),
             ('actionMoveMarked', 'Ctrl+M', '', tr("Move Marked to..."), self.moveTriggered),
             ('actionCopyMarked', 'Ctrl+Shift+M', '', tr("Copy Marked to..."), self.copyTriggered),
             ('actionRemoveMarked', 'Ctrl+R', '', tr("Remove Marked from Results"), self.removeMarkedTriggered),

qt/pe/modules/block.c

@@ -35,7 +35,7 @@ getblock(PyObject *image, int width, int height)
     red = green = blue = 0;
     pixel_count = width * height;
     if (pixel_count) {
-        PyObject *sipptr, *pi;
+        PyObject *sipptr, *bits_capsule, *pi;
         char *s;
         int i;
         
@@ -44,11 +44,10 @@ getblock(PyObject *image, int width, int height)
         Py_DECREF(pi);
         
         sipptr = PyObject_CallMethod(image, "bits", NULL);
-        /* int(sipptr) returns the address of the pointer */
+        bits_capsule = PyObject_CallMethod(sipptr, "ascapsule", NULL);
-        pi = PyObject_CallMethod(sipptr, "__int__", NULL);
         Py_DECREF(sipptr);
-        s = (char *)PyLong_AsLong(pi);
+        s = (char *)PyCapsule_GetPointer(bits_capsule, NULL);
-        Py_DECREF(pi);
+        Py_DECREF(bits_capsule);
         /* Qt aligns all its lines on 32bit, which means that if the number of bytes per
          * line for image is not divisible by 4, there's going to be crap inserted in "s"
          * We have to take this into account when calculating offsets

requirements.txt

@@ -1,6 +1,6 @@
 jobprogress>=1.0.4
 Send2Trash3k>=1.2.0
-sphinx>=1.1.0
+sphinx>=1.1.3
 polib>=0.7.0
 hsaudiotag3k>=1.1.2
 pytest>=2.0.0