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

@@ -68,3 +68,11 @@ a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
 6a08c1205dfe5e537e5c2dc99d05e05d1d3928f6 me6.2.1
 a619f313712e2923160b8f90d8250ee0e184c7b9 pe2.4.1
 fad463ae749b7189dce92f1e42a57ac4ee03987d se3.3.3
+236cf9b690a144392e7e86e7c9749fc834a8b271 me6.3.0
+90318f1303858d9d01065d92d78d98b888b38ea0 se3.4.0
+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

@@ -80,26 +80,16 @@ If you didn't use mercurial to download this source, you probably have an incomp
 External projects (hscommon, qtlib, cocoalib) need to be at the root of the dupeGuru project folder.
 You'll have to download those separately. Or use mercurial, it's much easier.
 
-As far as I can tell, you don't *have* to compile/install everything manually and you can normally
-use `easy_install` to install python dependencies. However, be aware that compiling/installing
-manually from the repositories of each project is what I personally do, so if you hit a snag 
-somewhere, you might want to try the manual way.
-
-PyObjC's website is badly outdated. Also, as far as I can tell, the package installable with
-`easy_install` has good chances of not working. Your best bet is to download the latest tagged
-version from the repository and compile it from source.
-
 Another one on OS X: I wouldn't use macports/fink/whatever. Whenever I tried using those, I always 
 ended up with problems.
 
-On OSX Lion, for dupeGuru PE, make sure that you installed the latest version of macholib because there was a
-10.7 related bug that was fixed recently. Right now, the fix hasn't even been released yet so you 
-have to install directly from the repo ( http://bitbucket.org/ronaldoussoren/macholib ). The fix
-in question is at http://bitbucket.org/ronaldoussoren/macholib/changeset/4ab0de0f5b60
-
 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-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.
+
 Building dupeGuru
 =================
 

build.py

@@ -117,9 +117,6 @@ def build_localizations(ui, edition):
     loc.compile_all_po('locale')
     loc.compile_all_po(op.join('hscommon', 'locale'))
     loc.merge_locale_dir(op.join('hscommon', 'locale'), 'locale')
-    if op.exists(op.join('build', 'locale')):
-        shutil.rmtree(op.join('build', 'locale'))
-    shutil.copytree('locale', op.join('build', 'locale'), ignore=shutil.ignore_patterns('*.po', '*.pot'))
     if ui == 'cocoa':
         print("Creating lproj folders based on .po files")
         for lang in loc.get_langs('locale'):
@@ -140,6 +137,9 @@ def build_localizations(ui, edition):
     elif ui == 'qt':
         loc.compile_all_po(op.join('qtlib', 'locale'))
         loc.merge_locale_dir(op.join('qtlib', 'locale'), 'locale')
+    if op.exists(op.join('build', 'locale')):
+        shutil.rmtree(op.join('build', 'locale'))
+    shutil.copytree('locale', op.join('build', 'locale'), ignore=shutil.ignore_patterns('*.po', '*.pot'))
 
 def build_updatepot():
     print("Building .pot files from source files")
@@ -198,6 +198,7 @@ def build_cocoa_bridging_interfaces(edition):
     add_to_pythonpath('cocoalib')
     from cocoa.inter import (PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
         OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyFairware)
+    from inter.deletion_options import PyDeletionOptions, DeletionOptionsView
     from inter.details_panel import PyDetailsPanel, DetailsPanelView
     from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView
     from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView
@@ -210,12 +211,13 @@ def build_cocoa_bridging_interfaces(edition):
     appmod = importlib.import_module('inter.app_{}'.format(edition))
     allclasses = [PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyFairware,
         PyDetailsPanel, PyDirectoryOutline, PyPrioritizeDialog, PyPrioritizeList, PyProblemDialog,
-        PyIgnoreListDialog, PyResultTable, PyStatsLabel, PyDupeGuruBase, appmod.PyDupeGuru]
+        PyIgnoreListDialog, PyDeletionOptions, PyResultTable, PyStatsLabel, PyDupeGuruBase,
+        appmod.PyDupeGuru]
     for class_ in allclasses:
         objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True)
     allclasses = [GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView,
         DetailsPanelView, DirectoryOutlineView, PrioritizeDialogView, PrioritizeListView,
-        IgnoreListDialogView, ResultTableView, StatsLabelView, DupeGuruView]
+        IgnoreListDialogView, DeletionOptionsView, ResultTableView, StatsLabelView, DupeGuruView]
     clsspecs = [objp.o2p.spec_from_python_class(class_) for class_ in allclasses]
     objp.p2o.generate_python_proxy_code_from_clsspec(clsspecs, 'build/CocoaViews.m')
     build_cocoa_ext('CocoaViews', 'cocoa/inter', ['build/CocoaViews.m', 'build/ObjP.m'])

cocoa/base/AppDelegate.m

@@ -9,7 +9,7 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "AppDelegate.h"
 #import "ProgressController.h"
 #import "HSFairwareReminder.h"
-#import "Utils.h"
+#import "HSPyUtil.h"
 #import "Consts.h"
 #import "Dialogs.h"
 #import "ValueTransformers.h"

cocoa/base/DeletionOptions.h

@@ -0,0 +1,25 @@
+/* 
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/bsd_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "PyDeletionOptions.h"
+
+@interface DeletionOptions : NSWindowController
+{
+    IBOutlet NSTextField *messageTextField;
+    IBOutlet NSButton *hardlinkButton;
+    IBOutlet NSButton *directButton;
+    
+    PyDeletionOptions *model;
+}
+- (id)initWithPyRef:(PyObject *)aPyRef;
+
+- (IBAction)updateOptions:(id)sender;
+- (IBAction)proceed:(id)sender;
+- (IBAction)cancel:(id)sender;
+@end

cocoa/base/DeletionOptions.m

@@ -0,0 +1,58 @@
+/* 
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/bsd_license
+*/
+
+#import "DeletionOptions.h"
+#import "HSPyUtil.h"
+
+@implementation DeletionOptions
+- (id)initWithPyRef:(PyObject *)aPyRef
+{
+    self = [super initWithWindowNibName:@"DeletionOptions"];
+    [self window];
+    model = [[PyDeletionOptions alloc] initWithModel:aPyRef];
+    [model bindCallback:createCallback(@"DeletionOptionsView", self)];
+    return self;
+}
+
+- (void)dealloc
+{
+    [model release];
+    [super dealloc];
+}
+
+- (IBAction)updateOptions:(id)sender
+{
+    [model setHardlink:[hardlinkButton state] == NSOnState];
+    [model setDirect:[directButton state] == NSOnState];
+}
+
+- (IBAction)proceed:(id)sender
+{
+    [NSApp stopModalWithCode:NSOKButton];
+}
+
+- (IBAction)cancel:(id)sender
+{
+    [NSApp stopModalWithCode:NSCancelButton];
+}
+
+/* model --> view */
+- (void)updateMsg:(NSString *)msg
+{
+    [messageTextField setStringValue:msg];
+}
+
+- (BOOL)show
+{
+    [hardlinkButton setState:NSOffState];
+    [directButton setState:NSOffState];
+    NSInteger r = [NSApp runModalForWindow:[self window]];
+    [[self window] close];
+    return r == NSOKButton;
+}
+@end

cocoa/base/DetailsPanel.m

@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DetailsPanel.h"
-#import "Utils.h"
+#import "HSPyUtil.h"
 
 @implementation DetailsPanel
 - (id)initWithPyRef:(PyObject *)aPyRef

cocoa/base/IgnoreListDialog.m

@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "IgnoreListDialog.h"
-#import "Utils.h"
+#import "HSPyUtil.h"
 
 @implementation IgnoreListDialog
 - (id)initWithPyRef:(PyObject *)aPyRef

cocoa/base/PrioritizeDialog.m

@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "PrioritizeDialog.h"
-#import "Utils.h"
+#import "HSPyUtil.h"
 
 @implementation PrioritizeDialog
 - (id)initWithApp:(PyDupeGuru *)aApp

cocoa/base/ResultWindow.h

@@ -11,6 +11,7 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "StatsLabel.h"
 #import "ResultTable.h"
 #import "ProblemDialog.h"
+#import "DeletionOptions.h"
 #import "HSTableView.h"
 #import "PyDupeGuru.h"
 
@@ -31,6 +32,7 @@ http://www.hardcoded.net/licenses/bsd_license
     ResultTable *table;
     StatsLabel *statsLabel;
     ProblemDialog *problemDialog;
+    DeletionOptions *deletionOptions;
     QLPreviewPanel* previewPanel;
 }
 - (id)initWithParentApp:(AppDelegateBase *)app;
@@ -41,7 +43,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 /* Helpers */
 - (void)fillColumnsMenu;
-- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted;
 - (void)updateOptionSegments;
 - (void)showProblemDialog;
 - (void)adjustUIToLocalization;
@@ -49,10 +50,10 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Actions */
 - (IBAction)changeOptions:(id)sender;
 - (IBAction)copyMarked:(id)sender;
-- (IBAction)deleteMarked:(id)sender;
-- (IBAction)hardlinkMarked:(id)sender;
+- (IBAction)trashMarked:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
 - (IBAction)filter:(id)sender;
+- (IBAction)focusOnFilterField:(id)sender;
 - (IBAction)ignoreSelected:(id)sender;
 - (IBAction)invokeCustomCommand:(id)sender;
 - (IBAction)markAll:(id)sender;

cocoa/base/ResultWindow.m

@@ -27,6 +27,7 @@ http://www.hardcoded.net/licenses/bsd_license
     table = [[ResultTable alloc] initWithPyRef:[model resultTable] view:matches];
     statsLabel = [[StatsLabel alloc] initWithPyRef:[model statsLabel] view:stats];
     problemDialog = [[ProblemDialog alloc] initWithPyRef:[model problemDialog]];
+    deletionOptions = [[DeletionOptions alloc] initWithPyRef:[model deletionOptions]];
     [self initResultColumns];
     [self fillColumnsMenu];
     [matches setTarget:self];
@@ -74,18 +75,6 @@ http://www.hardcoded.net/licenses/bsd_license
     [mi setTarget:self];
 }
 
-- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
-    if (hardlinkDeleted) {
-        [model hardlinkMarked];
-    }
-    else {
-        [model deleteMarked];
-    }
-}
-
 - (void)updateOptionSegments
 {
     [optionsSwitch setSelected:[[app detailsPanel] isVisible] forSegment:0];
@@ -145,14 +134,11 @@ http://www.hardcoded.net/licenses/bsd_license
     [model copyMarked];
 }
 
-- (IBAction)deleteMarked:(id)sender
+- (IBAction)trashMarked:(id)sender
 {
-    [self sendMarkedToTrash:NO];
-}
-
-- (IBAction)hardlinkMarked:(id)sender
-{
-    [self sendMarkedToTrash:YES];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    [model deleteMarked];
 }
 
 - (IBAction)exportToXHTML:(id)sender
@@ -168,6 +154,11 @@ http://www.hardcoded.net/licenses/bsd_license
     [model applyFilter:[filterField stringValue]];
 }
 
+- (IBAction)focusOnFilterField:(id)sender
+{
+    [[self window] makeFirstResponder:filterField];
+}
+
 - (IBAction)ignoreSelected:(id)sender
 {
     [model addSelectedToIgnoreList];

cocoa/base/en.lproj/DeletionOptions.strings

@@ -0,0 +1,21 @@
+
+/* Class = "NSWindow"; title = "Deletion Options"; ObjectID = "1"; */
+"1.title" = "Deletion Options";
+
+/* Class = "NSButtonCell"; title = "Hardlink deleted files"; ObjectID = "4"; */
+"4.title" = "Hardlink deleted files";
+
+/* Class = "NSTextFieldCell"; title = "After having deleted a duplicate, place a hardlink targeting the reference file to replace the deleted file."; ObjectID = "8"; */
+"8.title" = "After having deleted a duplicate, place a hardlink targeting the reference file to replace the deleted file.";
+
+/* Class = "NSButtonCell"; title = "Directly delete files"; ObjectID = "36"; */
+"36.title" = "Directly delete files";
+
+/* Class = "NSTextFieldCell"; title = "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."; ObjectID = "38"; */
+"38.title" = "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.";
+
+/* Class = "NSButtonCell"; title = "Proceed"; ObjectID = "40"; */
+"40.title" = "Proceed";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "42"; */
+"42.title" = "Cancel";

cocoa/base/en.lproj/DeletionOptions.xib

@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2182</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSTextField</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTextFieldCell</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSCustomObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">DeletionOptions</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {449, 215}}</string>
+				<int key="NSWTFlags">1618477056</int>
+				<string key="NSWindowTitle">Deletion Options</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="22939991">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{18, 154}, {413, 18}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="258896148"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="199073808">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Hardlink deleted files</string>
+								<object class="NSFont" key="NSSupport" id="672375986">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="22939991"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage" id="28662763">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage" id="1065109393">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="1003638083">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{18, 96}, {413, 18}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="316971589"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="791836143">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Directly delete files</string>
+								<reference key="NSSupport" ref="672375986"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="1003638083"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSNormalImage" ref="28662763"/>
+								<reference key="NSAlternateImage" ref="1065109393"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="258896148">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{38, 120}, {394, 28}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1003638083"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="939395720">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">272629760</int>
+								<string key="NSContents">After having deleted a duplicate, place a hardlink targeting the reference file to replace the deleted file.</string>
+								<object class="NSFont" key="NSSupport" id="1067329392">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="258896148"/>
+								<object class="NSColor" key="NSBackgroundColor" id="360163505">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="819030839">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="316971589">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{38, 48}, {394, 42}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="375232713"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="404549205">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">272629760</int>
+								<string key="NSContents">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.</string>
+								<reference key="NSSupport" ref="1067329392"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="316971589"/>
+								<reference key="NSBackgroundColor" ref="360163505"/>
+								<reference key="NSTextColor" ref="819030839"/>
+							</object>
+						</object>
+						<object class="NSButton" id="630940386">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{331, 12}, {104, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="551779024">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Proceed</string>
+								<reference key="NSSupport" ref="672375986"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="630940386"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="375232713">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{227, 12}, {104, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="630940386"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="311692270">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="672375986"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="375232713"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="275527426">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 178}, {415, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="22939991"/>
+							<string key="NSReuseIdentifierKey">_NS:1505</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="184485433">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="672375986"/>
+								<string key="NSCellIdentifier">_NS:1505</string>
+								<reference key="NSControlView" ref="275527426"/>
+								<reference key="NSBackgroundColor" ref="360163505"/>
+								<reference key="NSTextColor" ref="819030839"/>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{449, 215}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="275527426"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">NO</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">messageTextField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="275527426"/>
+					</object>
+					<int key="connectionID">45</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hardlinkButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="22939991"/>
+					</object>
+					<int key="connectionID">46</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">directButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1003638083"/>
+					</object>
+					<int key="connectionID">47</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">updateOptions:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="22939991"/>
+					</object>
+					<int key="connectionID">48</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">updateOptions:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1003638083"/>
+					</object>
+					<int key="connectionID">49</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="375232713"/>
+					</object>
+					<int key="connectionID">50</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">proceed:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="630940386"/>
+					</object>
+					<int key="connectionID">51</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">52</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="275527426"/>
+							<reference ref="22939991"/>
+							<reference ref="1003638083"/>
+							<reference ref="258896148"/>
+							<reference ref="316971589"/>
+							<reference ref="630940386"/>
+							<reference ref="375232713"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="22939991"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="199073808"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="199073808"/>
+						<reference key="parent" ref="22939991"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="258896148"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="939395720"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="939395720"/>
+						<reference key="parent" ref="258896148"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">35</int>
+						<reference key="object" ref="1003638083"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="791836143"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">36</int>
+						<reference key="object" ref="791836143"/>
+						<reference key="parent" ref="1003638083"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">37</int>
+						<reference key="object" ref="316971589"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="404549205"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="404549205"/>
+						<reference key="parent" ref="316971589"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">39</int>
+						<reference key="object" ref="630940386"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="551779024"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">40</int>
+						<reference key="object" ref="551779024"/>
+						<reference key="parent" ref="630940386"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">41</int>
+						<reference key="object" ref="375232713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="311692270"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">42</int>
+						<reference key="object" ref="311692270"/>
+						<reference key="parent" ref="375232713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">43</int>
+						<reference key="object" ref="275527426"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="184485433"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">44</int>
+						<reference key="object" ref="184485433"/>
+						<reference key="parent" ref="275527426"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
+				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">52</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">DeletionOptions</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="proceed:">id</string>
+						<string key="updateOptions:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="proceed:">
+							<string key="name">proceed:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="updateOptions:">
+							<string key="name">updateOptions:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="directButton">NSButton</string>
+						<string key="hardlinkButton">NSButton</string>
+						<string key="messageTextField">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="directButton">
+							<string key="name">directButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hardlinkButton">
+							<string key="name">hardlinkButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="messageTextField">
+							<string key="name">messageTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DeletionOptions.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<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>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSSwitch</string>
+			<string key="NS.object.0">{15, 15}</string>
+		</object>
+	</data>
+</archive>

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"; */
-"599.title" = "Send Marked to Trash";
+/* Class = "NSMenuItem"; title = "Send Marked to Trash..."; ObjectID = "599"; */
+"599.title" = "Send Marked to Trash...";
 
 /* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
 "600.title" = "Move Marked to...";
@@ -158,9 +158,6 @@
 /* Class = "NSMenuItem"; title = "Save Results..."; ObjectID = "1206"; */
 "1206.title" = "Save Results...";
 
-/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "1227"; */
-"1227.title" = "Delete Marked and Replace with Hardlinks";
-
 /* Class = "NSMenuItem"; title = "Load Recent Results"; ObjectID = "1239"; */
 "1239.title" = "Load Recent Results";
 
@@ -173,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

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2177</string>
+			<string key="NS.object.0">2182</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSMenu</string>
@@ -294,6 +294,26 @@
 									<reference key="NSOnImage" ref="34697260"/>
 									<reference key="NSMixedImage" ref="201180191"/>
 								</object>
+								<object class="NSMenuItem" id="1047465480">
+									<reference key="NSMenu" ref="649942443"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="34697260"/>
+									<reference key="NSMixedImage" ref="201180191"/>
+								</object>
+								<object class="NSMenuItem" id="820963618">
+									<reference key="NSMenu" ref="649942443"/>
+									<string key="NSTitle">Filter Results...</string>
+									<string key="NSKeyEquiv">f</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="34697260"/>
+									<reference key="NSMixedImage" ref="201180191"/>
+								</object>
 							</array>
 						</object>
 					</object>
@@ -331,22 +351,13 @@
 								</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>
 									<reference key="NSOnImage" ref="34697260"/>
 									<reference key="NSMixedImage" ref="201180191"/>
 								</object>
-								<object class="NSMenuItem" id="514384201">
-									<reference key="NSMenu" ref="600111647"/>
-									<string key="NSTitle">Delete Marked and Replace with Hardlinks</string>
-									<string key="NSKeyEquiv">T</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="34697260"/>
-									<reference key="NSMixedImage" ref="201180191"/>
-								</object>
 								<object class="NSMenuItem" id="207129050">
 									<reference key="NSMenu" ref="600111647"/>
 									<string key="NSTitle">Move Marked to...</string>
@@ -563,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>
@@ -780,14 +791,6 @@
 					</object>
 					<int key="connectionID">1244</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deleteMarked:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="894871136"/>
-					</object>
-					<int key="connectionID">1245</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">exportToXHTML:</string>
@@ -796,14 +799,6 @@
 					</object>
 					<int key="connectionID">1246</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hardlinkMarked:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="514384201"/>
-					</object>
-					<int key="connectionID">1247</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">ignoreSelected:</string>
@@ -964,6 +959,22 @@
 					</object>
 					<int key="connectionID">1282</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trashMarked:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="894871136"/>
+					</object>
+					<int key="connectionID">1286</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">focusOnFilterField:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="820963618"/>
+					</object>
+					<int key="connectionID">1289</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -1314,7 +1325,6 @@
 							<reference ref="564101661"/>
 							<reference ref="747820446"/>
 							<reference ref="517397504"/>
-							<reference ref="514384201"/>
 							<reference ref="200019883"/>
 						</array>
 						<reference key="parent" ref="528113253"/>
@@ -1445,6 +1455,8 @@
 							<reference ref="666519843"/>
 							<reference ref="996047427"/>
 							<reference ref="956279291"/>
+							<reference ref="1047465480"/>
+							<reference ref="820963618"/>
 						</array>
 						<reference key="parent" ref="551331186"/>
 					</object>
@@ -1544,11 +1556,6 @@
 						<reference key="object" ref="630362403"/>
 						<reference key="parent" ref="948321368"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1227</int>
-						<reference key="object" ref="514384201"/>
-						<reference key="parent" ref="600111647"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1239</int>
 						<reference key="object" ref="356425059"/>
@@ -1583,6 +1590,16 @@
 						<reference key="object" ref="361987512"/>
 						<reference key="parent" ref="472719764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1287</int>
+						<reference key="object" ref="1047465480"/>
+						<reference key="parent" ref="649942443"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1288</int>
+						<reference key="object" ref="820963618"/>
+						<reference key="parent" ref="649942443"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1603,13 +1620,14 @@
 				<string key="1204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1280.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1283.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1287.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1288.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1668,7 +1686,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1285</int>
+			<int key="maxID">1289</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1816,6 +1834,57 @@
 						<string key="minorKey">./Classes/IgnoreListDialog.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PrioritizeDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="addSelected:">id</string>
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="removeSelected:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="addSelected:">
+							<string key="name">addSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeSelected:">
+							<string key="name">removeSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="categoryPopUpView">NSPopUpButton</string>
+						<string key="criteriaTableView">NSTableView</string>
+						<string key="prioritizationTableView">NSTableView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="categoryPopUpView">
+							<string key="name">categoryPopUpView</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="criteriaTableView">
+							<string key="name">criteriaTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="prioritizationTableView">
+							<string key="name">prioritizationTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PrioritizeDialog.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ProblemDialog</string>
 					<string key="superclassName">NSWindowController</string>
@@ -1852,10 +1921,9 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="changeOptions:">id</string>
 						<string key="copyMarked:">id</string>
-						<string key="deleteMarked:">id</string>
 						<string key="exportToXHTML:">id</string>
 						<string key="filter:">id</string>
-						<string key="hardlinkMarked:">id</string>
+						<string key="focusOnFilterField:">id</string>
 						<string key="ignoreSelected:">id</string>
 						<string key="invokeCustomCommand:">id</string>
 						<string key="markAll:">id</string>
@@ -1879,6 +1947,7 @@
 						<string key="toggleDetailsPanel:">id</string>
 						<string key="togglePowerMarker:">id</string>
 						<string key="toggleQuicklookPanel:">id</string>
+						<string key="trashMarked:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="changeOptions:">
@@ -1889,10 +1958,6 @@
 							<string key="name">copyMarked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="deleteMarked:">
-							<string key="name">deleteMarked:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="exportToXHTML:">
 							<string key="name">exportToXHTML:</string>
 							<string key="candidateClassName">id</string>
@@ -1901,8 +1966,8 @@
 							<string key="name">filter:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="hardlinkMarked:">
-							<string key="name">hardlinkMarked:</string>
+						<object class="IBActionInfo" key="focusOnFilterField:">
+							<string key="name">focusOnFilterField:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 						<object class="IBActionInfo" key="ignoreSelected:">
@@ -1997,11 +2062,16 @@
 							<string key="name">toggleQuicklookPanel:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="trashMarked:">
+							<string key="name">trashMarked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="filterField">NSSearchField</string>
 						<string key="matches">HSTableView</string>
 						<string key="optionsSwitch">NSSegmentedControl</string>
+						<string key="optionsToolbarItem">NSToolbarItem</string>
 						<string key="stats">NSTextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2017,6 +2087,10 @@
 							<string key="name">optionsSwitch</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="optionsToolbarItem">
+							<string key="name">optionsToolbarItem</string>
+							<string key="candidateClassName">NSToolbarItem</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="stats">
 							<string key="name">stats</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -2061,18 +2135,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/base/en.lproj/ResultWindow.strings

@@ -29,11 +29,8 @@
 /* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
 "19.paletteLabel" = "Directories";
 
-/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "27"; */
-"27.title" = "Delete Marked and Replace with Hardlinks";
-
-/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
-"29.title" = "Send Marked to Trash";
+/* Class = "NSMenuItem"; title = "Send Marked to Trash..."; ObjectID = "29"; */
+"29.title" = "Send Marked to Trash...";
 
 /* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
 "30.title" = "Move Marked to...";
@@ -94,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

@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.SystemVersion">11E53</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">2182</string>
@@ -161,7 +161,6 @@
 								<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">
@@ -219,7 +218,6 @@
 								<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">
@@ -312,7 +310,6 @@
 								<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>
@@ -380,7 +377,6 @@
 								<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">
@@ -422,17 +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="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="1054238029"/>
-												<reference key="NSMixedImage" ref="1014570658"/>
-												<string key="NSAction">_popUpItemAction:</string>
-												<reference key="NSTarget" ref="302095930"/>
-											</object>
-											<object class="NSMenuItem" id="104143636">
-												<reference key="NSMenu" ref="778415311"/>
-												<string key="NSTitle">Delete Marked and Replace with Hardlinks</string>
+												<string key="NSTitle">Send Marked to Trash...</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="1054238029"/>
@@ -560,6 +546,7 @@
 											</object>
 										</array>
 									</object>
+									<int key="NSSelectedIndex">1</int>
 									<bool key="NSPullDown">YES</bool>
 									<int key="NSPreferredEdge">3</int>
 									<bool key="NSUsesItemFromMenu">YES</bool>
@@ -834,22 +821,6 @@
 					</object>
 					<int key="connectionID">46</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deleteMarked:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="799999563"/>
-					</object>
-					<int key="connectionID">50</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hardlinkMarked:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="104143636"/>
-					</object>
-					<int key="connectionID">51</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">moveMarked:</string>
@@ -1042,6 +1013,14 @@
 					</object>
 					<int key="connectionID">82</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trashMarked:</string>
+						<reference key="source" ref="1003"/>
+						<reference key="destination" ref="799999563"/>
+					</object>
+					<int key="connectionID">93</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -1276,7 +1255,6 @@
 						<int key="objectID">26</int>
 						<reference key="object" ref="778415311"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="104143636"/>
 							<reference ref="764786770"/>
 							<reference ref="799999563"/>
 							<reference ref="294016844"/>
@@ -1358,11 +1336,6 @@
 						<reference key="object" ref="764786770"/>
 						<reference key="parent" ref="778415311"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">27</int>
-						<reference key="object" ref="104143636"/>
-						<reference key="parent" ref="778415311"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
 						<reference key="object" ref="695856706"/>
@@ -1451,7 +1424,6 @@
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1496,7 +1468,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">92</int>
+			<int key="maxID">93</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1588,13 +1560,13 @@
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">removeDeadTracks:</string>
+						<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">removeDeadTracks:</string>
+						<string key="NS.key.0">clearPictureCache:</string>
 						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">removeDeadTracks:</string>
+							<string key="name">clearPictureCache:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
@@ -1609,10 +1581,9 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="changeOptions:">id</string>
 						<string key="copyMarked:">id</string>
-						<string key="deleteMarked:">id</string>
 						<string key="exportToXHTML:">id</string>
 						<string key="filter:">id</string>
-						<string key="hardlinkMarked:">id</string>
+						<string key="focusOnFilterField:">id</string>
 						<string key="ignoreSelected:">id</string>
 						<string key="invokeCustomCommand:">id</string>
 						<string key="markAll:">id</string>
@@ -1636,6 +1607,7 @@
 						<string key="toggleDetailsPanel:">id</string>
 						<string key="togglePowerMarker:">id</string>
 						<string key="toggleQuicklookPanel:">id</string>
+						<string key="trashMarked:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="changeOptions:">
@@ -1646,10 +1618,6 @@
 							<string key="name">copyMarked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="deleteMarked:">
-							<string key="name">deleteMarked:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="exportToXHTML:">
 							<string key="name">exportToXHTML:</string>
 							<string key="candidateClassName">id</string>
@@ -1658,8 +1626,8 @@
 							<string key="name">filter:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="hardlinkMarked:">
-							<string key="name">hardlinkMarked:</string>
+						<object class="IBActionInfo" key="focusOnFilterField:">
+							<string key="name">focusOnFilterField:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 						<object class="IBActionInfo" key="ignoreSelected:">
@@ -1754,6 +1722,10 @@
 							<string key="name">toggleQuicklookPanel:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="trashMarked:">
+							<string key="name">trashMarked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="filterField">NSSearchField</string>
@@ -1793,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/all.py

@@ -0,0 +1,9 @@
+from .deletion_options import PyDeletionOptions
+from .details_panel import PyDetailsPanel
+from .directory_outline import PyDirectoryOutline
+from .prioritize_dialog import PyPrioritizeDialog
+from .prioritize_list import PyPrioritizeList
+from .problem_dialog import PyProblemDialog
+from .ignore_list_dialog import PyIgnoreListDialog
+from .result_table import PyResultTable
+from .stats_label import PyStatsLabel

cocoa/inter/app.py

@@ -54,6 +54,9 @@ class PyDupeGuruBase(PyFairware):
     def ignoreListDialog(self) -> pyref:
         return self.model.ignore_list_dialog
     
+    def deletionOptions(self) -> pyref:
+        return self.model.deletion_options
+    
     #---Directories
     def addDirectory_(self, directory: str) -> int:
         return self.model.add_directory(directory)
@@ -99,9 +102,6 @@ class PyDupeGuruBase(PyFairware):
     def deleteMarked(self):
         self.model.delete_marked()
     
-    def hardlinkMarked(self):
-        self.model.delete_marked(replace_with_hardlinks=True)
-    
     def applyFilter_(self, filter: str):
         self.model.apply_filter(filter)
     

cocoa/inter/app_me.py

@@ -83,7 +83,10 @@ def get_itunes_songs(plistpath):
     for song_data in plist['Tracks'].values():
         if song_data['Track Type'] != 'File':
             continue
-        song = ITunesSong(song_data)
+        try:
+            song = ITunesSong(song_data)
+        except KeyError: # No "Location" or "Track ID" key in track
+            continue
         if io.exists(song.path):
             result.append(song)
     return result
@@ -143,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"))
@@ -161,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

@@ -0,0 +1,30 @@
+# Created On: 2012-05-30
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# 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):
+    def updateMsg_(self, msg: str): pass
+    def show(self) -> bool: pass
+
+class PyDeletionOptions(PyGUIObject):
+    def setHardlink_(self, hardlink: bool):
+        self.model.hardlink = hardlink
+    
+    def setDirect_(self, direct: bool):
+        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/me/dg_cocoa.py

@@ -9,12 +9,5 @@ install_gettext_trans_under_cocoa()
 
 from cocoa.inter import PySelectableList, PyColumns, PyTable
 
-from inter.details_panel import PyDetailsPanel
-from inter.directory_outline import PyDirectoryOutline
-from inter.prioritize_dialog import PyPrioritizeDialog
-from inter.prioritize_list import PyPrioritizeList
-from inter.problem_dialog import PyProblemDialog
-from inter.ignore_list_dialog import PyIgnoreListDialog
-from inter.result_table import PyResultTable
-from inter.stats_label import PyStatsLabel
+from inter.all import *
 from inter.app_me import PyDupeGuru

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -40,14 +40,6 @@
 		CE11958F1510FF700063C8AF /* PyIgnoreListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE11958E1510FF700063C8AF /* PyIgnoreListDialog.m */; };
 		CE1195931510FF890063C8AF /* IgnoreListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1195921510FF890063C8AF /* IgnoreListDialog.m */; };
 		CE1195961510FFB20063C8AF /* IgnoreListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1195941510FFB20063C8AF /* IgnoreListDialog.xib */; };
-		CE11959F151100020063C8AF /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330D12E5D3ED0029EF25 /* DetailsPanel.xib */; };
-		CE1195A0151100020063C8AF /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330F12E5D3ED0029EF25 /* DirectoryPanel.xib */; };
-		CE1195A1151100020063C8AF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331112E5D3ED0029EF25 /* MainMenu.xib */; };
-		CE1195A2151100020063C8AF /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */; };
-		CE1195A3151100020063C8AF /* IgnoreListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1195941510FFB20063C8AF /* IgnoreListDialog.xib */; };
-		CE1195A4151100020063C8AF /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331512E5D3ED0029EF25 /* ResultWindow.xib */; };
-		CE1195A5151100020063C8AF /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05332112E5D4100029EF25 /* Preferences.xib */; };
-		CE1195A6151100020063C8AF /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE84C9BB1423AF200050A6AD /* PrioritizeDialog.xib */; };
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */; };
@@ -98,11 +90,23 @@
 		CE97060114C46F70007A28F6 /* dg_cocoa.py in Resources */ = {isa = PBXBuildFile; fileRef = CE97060014C46F70007A28F6 /* dg_cocoa.py */; };
 		CE97060314C471F2007A28F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CE97060214C471F2007A28F6 /* main.m */; };
 		CEA14F431461ED63007F01A5 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CEA14F421461ED63007F01A5 /* locale */; };
+		CEA39FA1157679FB00F294DE /* DeletionOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEA39F97157679FB00F294DE /* DeletionOptions.xib */; };
+		CEA39FA2157679FB00F294DE /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330D12E5D3ED0029EF25 /* DetailsPanel.xib */; };
+		CEA39FA3157679FB00F294DE /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330F12E5D3ED0029EF25 /* DirectoryPanel.xib */; };
+		CEA39FA4157679FB00F294DE /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331112E5D3ED0029EF25 /* MainMenu.xib */; };
+		CEA39FA5157679FB00F294DE /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */; };
+		CEA39FA6157679FB00F294DE /* IgnoreListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1195941510FFB20063C8AF /* IgnoreListDialog.xib */; };
+		CEA39FA7157679FB00F294DE /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331512E5D3ED0029EF25 /* ResultWindow.xib */; };
+		CEA39FA8157679FB00F294DE /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05332112E5D4100029EF25 /* Preferences.xib */; };
+		CEA39FA9157679FB00F294DE /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE84C9BB1423AF200050A6AD /* PrioritizeDialog.xib */; };
+		CEA39FAD15767A2900F294DE /* PyDeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEA39FAC15767A2900F294DE /* PyDeletionOptions.m */; };
+		CEA39FB015767A3A00F294DE /* DeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEA39FAF15767A3A00F294DE /* DeletionOptions.m */; };
 		CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB14D28124DFC2800FA7481 /* ResultTable.m */; };
 		CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEF3185913D8660000B8CDCA /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF3185513D8660000B8CDCA /* about.xib */; };
 		CEF3185A13D8660000B8CDCA /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF3185713D8660000B8CDCA /* ErrorReportWindow.xib */; };
+		CEF6BCAA1575769C00DACF6F /* HSPyUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF6BCA91575769C00DACF6F /* HSPyUtil.m */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 /* End PBXBuildFile section */
 
@@ -306,6 +310,19 @@
 		CE97060014C46F70007A28F6 /* dg_cocoa.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = dg_cocoa.py; path = ../../build/dg_cocoa.py; sourceTree = "<group>"; };
 		CE97060214C471F2007A28F6 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../base/main.m; sourceTree = "<group>"; };
 		CEA14F421461ED63007F01A5 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../build/locale; sourceTree = "<group>"; };
+		CEA39F98157679FB00F294DE /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F99157679FB00F294DE /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9A157679FB00F294DE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9B157679FB00F294DE /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9C157679FB00F294DE /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9D157679FB00F294DE /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9E157679FB00F294DE /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39F9F157679FB00F294DE /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39FA0157679FB00F294DE /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEA39FAB15767A2900F294DE /* PyDeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDeletionOptions.h; sourceTree = "<group>"; };
+		CEA39FAC15767A2900F294DE /* PyDeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDeletionOptions.m; sourceTree = "<group>"; };
+		CEA39FAE15767A3A00F294DE /* DeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeletionOptions.h; path = ../base/DeletionOptions.h; sourceTree = "<group>"; };
+		CEA39FAF15767A3A00F294DE /* DeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DeletionOptions.m; path = ../base/DeletionOptions.m; sourceTree = "<group>"; };
 		CEB14D27124DFC2800FA7481 /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
 		CEB14D28124DFC2800FA7481 /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
 		CEC3D37C14911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DetailsPanel.xib; sourceTree = "<group>"; };
@@ -348,6 +365,9 @@
 		CEF5770B13CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CEF5770C13CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
 		CEF5770D13CDFB310083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CEF6BCA71575769C00DACF6F /* HSFairwareProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareProtocol.h; path = ../../cocoalib/HSFairwareProtocol.h; sourceTree = "<group>"; };
+		CEF6BCA81575769C00DACF6F /* HSPyUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSPyUtil.h; path = ../../cocoalib/HSPyUtil.h; sourceTree = "<group>"; };
+		CEF6BCA91575769C00DACF6F /* HSPyUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSPyUtil.m; path = ../../cocoalib/HSPyUtil.m; sourceTree = "<group>"; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -496,6 +516,7 @@
 				CE05331512E5D3ED0029EF25 /* ResultWindow.xib */,
 				CE05332112E5D4100029EF25 /* Preferences.xib */,
 				CE84C9BB1423AF200050A6AD /* PrioritizeDialog.xib */,
+				CEA39F97157679FB00F294DE /* DeletionOptions.xib */,
 			);
 			name = xib;
 			sourceTree = "<group>";
@@ -520,6 +541,7 @@
 				CE4B59C41119919700C06C9E /* xib */,
 				CE515DE00FC6C12E00EC695D /* Dialogs.h */,
 				CE515DE10FC6C12E00EC695D /* Dialogs.m */,
+				CEF6BCA71575769C00DACF6F /* HSFairwareProtocol.h */,
 				CE74A12112537F06008A8DF0 /* HSFairwareReminder.h */,
 				CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */,
 				CE4F934712CCA96C0067A3AE /* HSAboutBox.h */,
@@ -534,6 +556,8 @@
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DEF0FC6C12E00EC695D /* Utils.h */,
 				CE515DF00FC6C12E00EC695D /* Utils.m */,
+				CEF6BCA81575769C00DACF6F /* HSPyUtil.h */,
+				CEF6BCA91575769C00DACF6F /* HSPyUtil.m */,
 				CE515DF10FC6C12E00EC695D /* ValueTransformers.h */,
 				CE515DF20FC6C12E00EC695D /* ValueTransformers.m */,
 			);
@@ -566,6 +590,8 @@
 				CE84C9AD1423ADFB0050A6AD /* PrioritizeDialog.m */,
 				CE84C9AE1423ADFB0050A6AD /* PrioritizeList.h */,
 				CE84C9AF1423ADFB0050A6AD /* PrioritizeList.m */,
+				CEA39FAE15767A3A00F294DE /* DeletionOptions.h */,
+				CEA39FAF15767A3A00F294DE /* DeletionOptions.m */,
 				CE97060214C471F2007A28F6 /* main.m */,
 			);
 			name = dgbase;
@@ -600,6 +626,8 @@
 				CE9705DD14C46E7D007A28F6 /* PyProblemDialog.m */,
 				CE11958D1510FF700063C8AF /* PyIgnoreListDialog.h */,
 				CE11958E1510FF700063C8AF /* PyIgnoreListDialog.m */,
+				CEA39FAB15767A2900F294DE /* PyDeletionOptions.h */,
+				CEA39FAC15767A2900F294DE /* PyDeletionOptions.m */,
 				CE9705DE14C46E7D007A28F6 /* PyResultTable.h */,
 				CE9705DF14C46E7D007A28F6 /* PyResultTable.m */,
 				CE9705E014C46E7D007A28F6 /* PySelectableList.h */,
@@ -705,14 +733,15 @@
 				CE9705FF14C46F60007A28F6 /* py in Resources */,
 				CE97060114C46F70007A28F6 /* dg_cocoa.py in Resources */,
 				CE1195961510FFB20063C8AF /* IgnoreListDialog.xib in Resources */,
-				CE11959F151100020063C8AF /* DetailsPanel.xib in Resources */,
-				CE1195A0151100020063C8AF /* DirectoryPanel.xib in Resources */,
-				CE1195A1151100020063C8AF /* MainMenu.xib in Resources */,
-				CE1195A2151100020063C8AF /* ProblemDialog.xib in Resources */,
-				CE1195A3151100020063C8AF /* IgnoreListDialog.xib in Resources */,
-				CE1195A4151100020063C8AF /* ResultWindow.xib in Resources */,
-				CE1195A5151100020063C8AF /* Preferences.xib in Resources */,
-				CE1195A6151100020063C8AF /* PrioritizeDialog.xib in Resources */,
+				CEA39FA1157679FB00F294DE /* DeletionOptions.xib in Resources */,
+				CEA39FA2157679FB00F294DE /* DetailsPanel.xib in Resources */,
+				CEA39FA3157679FB00F294DE /* DirectoryPanel.xib in Resources */,
+				CEA39FA4157679FB00F294DE /* MainMenu.xib in Resources */,
+				CEA39FA5157679FB00F294DE /* ProblemDialog.xib in Resources */,
+				CEA39FA6157679FB00F294DE /* IgnoreListDialog.xib in Resources */,
+				CEA39FA7157679FB00F294DE /* ResultWindow.xib in Resources */,
+				CEA39FA8157679FB00F294DE /* Preferences.xib in Resources */,
+				CEA39FA9157679FB00F294DE /* PrioritizeDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -774,6 +803,9 @@
 				CE97060314C471F2007A28F6 /* main.m in Sources */,
 				CE11958F1510FF700063C8AF /* PyIgnoreListDialog.m in Sources */,
 				CE1195931510FF890063C8AF /* IgnoreListDialog.m in Sources */,
+				CEF6BCAA1575769C00DACF6F /* HSPyUtil.m in Sources */,
+				CEA39FAD15767A2900F294DE /* PyDeletionOptions.m in Sources */,
+				CEA39FB015767A3A00F294DE /* DeletionOptions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -941,6 +973,22 @@
 			name = PrioritizeDialog.xib;
 			sourceTree = "<group>";
 		};
+		CEA39F97157679FB00F294DE /* DeletionOptions.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CEA39F9A157679FB00F294DE /* en */,
+                CEA39F98157679FB00F294DE /* cs */,
+                CEA39F99157679FB00F294DE /* de */,
+				CEA39F9B157679FB00F294DE /* fr */,
+				CEA39F9C157679FB00F294DE /* hy */,
+				CEA39F9D157679FB00F294DE /* it */,
+				CEA39F9E157679FB00F294DE /* ru */,
+				CEA39F9F157679FB00F294DE /* uk */,
+				CEA39FA0157679FB00F294DE /* zh_CN */,
+			);
+			name = DeletionOptions.xib;
+			sourceTree = "<group>";
+		};
 		CEF3185513D8660000B8CDCA /* about.xib */ = {
 			isa = PBXVariantGroup;
 			children = (

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

cocoa/pe/dg_cocoa.py

@@ -9,13 +9,6 @@ install_gettext_trans_under_cocoa()
 
 from cocoa.inter import PySelectableList, PyColumns, PyTable
 
-from inter.details_panel import PyDetailsPanel
-from inter.directory_outline import PyDirectoryOutline
-from inter.prioritize_dialog import PyPrioritizeDialog
-from inter.prioritize_list import PyPrioritizeList
-from inter.problem_dialog import PyProblemDialog
-from inter.ignore_list_dialog import PyIgnoreListDialog
-from inter.result_table import PyResultTable
-from inter.stats_label import PyStatsLabel
+from inter.all import *
 from inter.app_pe import PyDupeGuru
     

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -51,14 +51,6 @@
 		CE7501AD14C477B100E2A349 /* PyStatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75019B14C477B100E2A349 /* PyStatsLabel.m */; };
 		CE7501AE14C477B100E2A349 /* PyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75019D14C477B100E2A349 /* PyTable.m */; };
 		CE7857971511019400174D51 /* IgnoreListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7857951511019400174D51 /* IgnoreListDialog.xib */; };
-		CE78579B151101B000174D51 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339312E5DA350029EF25 /* DirectoryPanel.xib */; };
-		CE78579C151101B000174D51 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339512E5DA350029EF25 /* MainMenu.xib */; };
-		CE78579D151101B000174D51 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339712E5DA350029EF25 /* ProblemDialog.xib */; };
-		CE7857A1151101C900174D51 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339912E5DA350029EF25 /* ResultWindow.xib */; };
-		CE7857A2151101C900174D51 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */; };
-		CE7857A3151101C900174D51 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A512E5DA4D0029EF25 /* Preferences.xib */; };
-		CE7857A6151101DD00174D51 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339912E5DA350029EF25 /* ResultWindow.xib */; };
-		CE7857A7151101DD00174D51 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */; };
 		CE7857AA1511021200174D51 /* PyIgnoreListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7857A91511021200174D51 /* PyIgnoreListDialog.m */; };
 		CE7857AD1511022A00174D51 /* IgnoreListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7857AC1511022A00174D51 /* IgnoreListDialog.m */; };
 		CE7AC9191119911200D02F6C /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9161119911200D02F6C /* progress.xib */; };
@@ -90,7 +82,19 @@
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
 		CECB2AC513D867AD0081E295 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CECB2AC113D867AD0081E295 /* about.xib */; };
 		CECB2AC613D867AD0081E295 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CECB2AC313D867AD0081E295 /* ErrorReportWindow.xib */; };
+		CED3BC1515767AFB0028F3C9 /* PyDeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CED3BC1415767AFB0028F3C9 /* PyDeletionOptions.m */; };
+		CED3BC1915767B0E0028F3C9 /* DeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CED3BC1815767B0E0028F3C9 /* DeletionOptions.m */; };
+		CED3BC2415767B200028F3C9 /* DeletionOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = CED3BC1A15767B200028F3C9 /* DeletionOptions.xib */; };
+		CED3BC2515767B200028F3C9 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339312E5DA350029EF25 /* DirectoryPanel.xib */; };
+		CED3BC2615767B200028F3C9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339512E5DA350029EF25 /* MainMenu.xib */; };
+		CED3BC2715767B200028F3C9 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339712E5DA350029EF25 /* ProblemDialog.xib */; };
+		CED3BC2815767B200028F3C9 /* IgnoreListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7857951511019400174D51 /* IgnoreListDialog.xib */; };
+		CED3BC2915767B200028F3C9 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339912E5DA350029EF25 /* ResultWindow.xib */; };
+		CED3BC2A15767B200028F3C9 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */; };
+		CED3BC2B15767B200028F3C9 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A512E5DA4D0029EF25 /* Preferences.xib */; };
+		CED3BC2C15767B200028F3C9 /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7D24A71423B123002E2297 /* PrioritizeDialog.xib */; };
 		CEE6D562149113570087CDFC /* HSColumns.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE6D561149113570087CDFC /* HSColumns.m */; };
+		CEE8D3E2157576FD00E1A1B8 /* HSPyUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE8D3E1157576FD00E1A1B8 /* HSPyUtil.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEF12A7E124DFD400087B51D /* HSTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF12A7D124DFD400087B51D /* HSTableView.m */; };
 		CEF12A84124DFD620087B51D /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF12A83124DFD620087B51D /* ResultTable.m */; };
@@ -316,6 +320,19 @@
 		CECB2ACB13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/about.xib; sourceTree = "<group>"; };
 		CECB2ACC13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CECB2ACD13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/FairwareReminder.xib; sourceTree = "<group>"; };
+		CED3BC1315767AFB0028F3C9 /* PyDeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDeletionOptions.h; sourceTree = "<group>"; };
+		CED3BC1415767AFB0028F3C9 /* PyDeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDeletionOptions.m; sourceTree = "<group>"; };
+		CED3BC1715767B0E0028F3C9 /* DeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeletionOptions.h; path = ../base/DeletionOptions.h; sourceTree = "<group>"; };
+		CED3BC1815767B0E0028F3C9 /* DeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DeletionOptions.m; path = ../base/DeletionOptions.m; sourceTree = "<group>"; };
+		CED3BC1B15767B200028F3C9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC1C15767B200028F3C9 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC1D15767B200028F3C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC1E15767B200028F3C9 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC1F15767B200028F3C9 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC2015767B200028F3C9 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC2115767B200028F3C9 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC2215767B200028F3C9 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CED3BC2315767B200028F3C9 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
 		CEE6D5461491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DirectoryPanel.xib; sourceTree = "<group>"; };
 		CEE6D5481491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		CEE6D5491491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = "<group>"; };
@@ -329,6 +346,9 @@
 		CEE6D55B149113320087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../hy.lproj/FairwareReminder.xib; sourceTree = "<group>"; };
 		CEE6D560149113570087CDFC /* HSColumns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSColumns.h; sourceTree = "<group>"; };
 		CEE6D561149113570087CDFC /* HSColumns.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSColumns.m; sourceTree = "<group>"; };
+		CEE8D3DF157576FD00E1A1B8 /* HSFairwareProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareProtocol.h; path = ../../cocoalib/HSFairwareProtocol.h; sourceTree = "<group>"; };
+		CEE8D3E0157576FD00E1A1B8 /* HSPyUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSPyUtil.h; path = ../../cocoalib/HSPyUtil.h; sourceTree = "<group>"; };
+		CEE8D3E1157576FD00E1A1B8 /* HSPyUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSPyUtil.m; path = ../../cocoalib/HSPyUtil.m; sourceTree = "<group>"; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
 		CEEE156E1460325B00783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../cs.lproj/about.xib; sourceTree = "<group>"; };
 		CEEE156F1460325B00783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../cs.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
@@ -459,6 +479,7 @@
 				CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */,
 				CE0533A512E5DA4D0029EF25 /* Preferences.xib */,
 				CE7D24A71423B123002E2297 /* PrioritizeDialog.xib */,
+				CED3BC1A15767B200028F3C9 /* DeletionOptions.xib */,
 			);
 			name = xib;
 			sourceTree = "<group>";
@@ -492,6 +513,8 @@
 				CE7857A81511021200174D51 /* PyIgnoreListDialog.h */,
 				CE7857A91511021200174D51 /* PyIgnoreListDialog.m */,
 				CE75019514C477B100E2A349 /* PyProblemDialog.m */,
+				CED3BC1315767AFB0028F3C9 /* PyDeletionOptions.h */,
+				CED3BC1415767AFB0028F3C9 /* PyDeletionOptions.m */,
 				CE75019614C477B100E2A349 /* PyResultTable.h */,
 				CE75019714C477B100E2A349 /* PyResultTable.m */,
 				CE75019814C477B100E2A349 /* PySelectableList.h */,
@@ -531,6 +554,7 @@
 				CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */,
 				CE80DB1B0FC192D60086DCA6 /* Dialogs.h */,
 				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
+				CEE8D3DF157576FD00E1A1B8 /* HSFairwareProtocol.h */,
 				CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */,
 				CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */,
 				CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */,
@@ -543,6 +567,8 @@
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB2A0FC192D60086DCA6 /* Utils.h */,
 				CE80DB2B0FC192D60086DCA6 /* Utils.m */,
+				CEE8D3E0157576FD00E1A1B8 /* HSPyUtil.h */,
+				CEE8D3E1157576FD00E1A1B8 /* HSPyUtil.m */,
 				CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */,
 				CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */,
 			);
@@ -575,6 +601,8 @@
 				CE7D24A01423B106002E2297 /* PrioritizeDialog.m */,
 				CE7D24A11423B106002E2297 /* PrioritizeList.h */,
 				CE7D24A21423B106002E2297 /* PrioritizeList.m */,
+				CED3BC1715767B0E0028F3C9 /* DeletionOptions.h */,
+				CED3BC1815767B0E0028F3C9 /* DeletionOptions.m */,
 				CE75017214C4770500E2A349 /* main.m */,
 			);
 			name = dgbase;
@@ -707,14 +735,15 @@
 				CE75017514C4771800E2A349 /* py in Resources */,
 				CE75017714C4772100E2A349 /* dg_cocoa.py in Resources */,
 				CE7857971511019400174D51 /* IgnoreListDialog.xib in Resources */,
-				CE78579B151101B000174D51 /* DirectoryPanel.xib in Resources */,
-				CE78579C151101B000174D51 /* MainMenu.xib in Resources */,
-				CE78579D151101B000174D51 /* ProblemDialog.xib in Resources */,
-				CE7857A1151101C900174D51 /* ResultWindow.xib in Resources */,
-				CE7857A2151101C900174D51 /* DetailsPanel.xib in Resources */,
-				CE7857A3151101C900174D51 /* Preferences.xib in Resources */,
-				CE7857A6151101DD00174D51 /* ResultWindow.xib in Resources */,
-				CE7857A7151101DD00174D51 /* DetailsPanel.xib in Resources */,
+				CED3BC2415767B200028F3C9 /* DeletionOptions.xib in Resources */,
+				CED3BC2515767B200028F3C9 /* DirectoryPanel.xib in Resources */,
+				CED3BC2615767B200028F3C9 /* MainMenu.xib in Resources */,
+				CED3BC2715767B200028F3C9 /* ProblemDialog.xib in Resources */,
+				CED3BC2815767B200028F3C9 /* IgnoreListDialog.xib in Resources */,
+				CED3BC2915767B200028F3C9 /* ResultWindow.xib in Resources */,
+				CED3BC2A15767B200028F3C9 /* DetailsPanel.xib in Resources */,
+				CED3BC2B15767B200028F3C9 /* Preferences.xib in Resources */,
+				CED3BC2C15767B200028F3C9 /* PrioritizeDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -779,6 +808,9 @@
 				CE7501AE14C477B100E2A349 /* PyTable.m in Sources */,
 				CE7857AA1511021200174D51 /* PyIgnoreListDialog.m in Sources */,
 				CE7857AD1511022A00174D51 /* IgnoreListDialog.m in Sources */,
+				CEE8D3E2157576FD00E1A1B8 /* HSPyUtil.m in Sources */,
+				CED3BC1515767AFB0028F3C9 /* PyDeletionOptions.m in Sources */,
+				CED3BC1915767B0E0028F3C9 /* DeletionOptions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -978,6 +1010,22 @@
 			name = ErrorReportWindow.xib;
 			sourceTree = "<group>";
 		};
+		CED3BC1A15767B200028F3C9 /* DeletionOptions.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CED3BC1D15767B200028F3C9 /* en */,
+                CED3BC1B15767B200028F3C9 /* cs */,
+                CED3BC1C15767B200028F3C9 /* de */,
+				CED3BC1E15767B200028F3C9 /* fr */,
+				CED3BC1F15767B200028F3C9 /* hy */,
+				CED3BC2015767B200028F3C9 /* it */,
+				CED3BC2115767B200028F3C9 /* ru */,
+				CED3BC2215767B200028F3C9 /* uk */,
+				CED3BC2315767B200028F3C9 /* zh_CN */,
+			);
+			name = DeletionOptions.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

cocoa/se/ResultWindow.m

@@ -39,7 +39,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (void)setScanOptions
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setScanType:n2b([ud objectForKey:@"scanType"])];
+    [model setScanType:n2i([ud objectForKey:@"scanType"])];
     [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
     [model setWordWeighting:n2b([ud objectForKey:@"wordWeighting"])];
     [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];

cocoa/se/dg_cocoa.py

@@ -9,12 +9,5 @@ install_gettext_trans_under_cocoa()
 
 from cocoa.inter import PySelectableList, PyColumns, PyTable
 
-from inter.details_panel import PyDetailsPanel
-from inter.directory_outline import PyDirectoryOutline
-from inter.prioritize_dialog import PyPrioritizeDialog
-from inter.prioritize_list import PyPrioritizeList
-from inter.problem_dialog import PyProblemDialog
-from inter.ignore_list_dialog import PyIgnoreListDialog
-from inter.result_table import PyResultTable
-from inter.stats_label import PyStatsLabel
+from inter.all import *
 from inter.app_se import PyDupeGuru

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -9,10 +9,6 @@
 /* Begin PBXBuildFile section */
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
-		CE148035151100EC00CD5DAD /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE148038151100FB00CD5DAD /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE14803A1511010500CD5DAD /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE14803C1511011000CD5DAD /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
 		CE18004D14BDD837001B6329 /* Python in Frameworks */ = {isa = PBXBuildFile; fileRef = CE18004C14BDD837001B6329 /* Python */; };
 		CE18004F14BDD854001B6329 /* Python in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE18004C14BDD837001B6329 /* Python */; };
 		CE18005114BDD87B001B6329 /* py in Resources */ = {isa = PBXBuildFile; fileRef = CE18005014BDD87B001B6329 /* py */; };
@@ -24,10 +20,6 @@
 		CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE27D3C312CCA43800859E67 /* HSAboutBox.m */; };
 		CE31819D13D85D9B00B6D649 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE31819913D85D9B00B6D649 /* about.xib */; };
 		CE31819E13D85D9B00B6D649 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE31819B13D85D9B00B6D649 /* ErrorReportWindow.xib */; };
-		CE3491E3151100A40030B64C /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE3491E6151100AD0030B64C /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE3491E9151100BB0030B64C /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
-		CE3491EA151100BB0030B64C /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81135612E5CE6D00A36C80 /* Preferences.xib */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE3A3B4914BF19B8007898AB /* PyDetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3A3B4814BF19B8007898AB /* PyDetailsPanel.m */; };
@@ -71,6 +63,10 @@
 		CEA175CA1461E8E600776591 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CEA175C91461E8E600776591 /* locale */; };
 		CEA450B814BDDFD7002DAAF2 /* dg_cocoa.py in Resources */ = {isa = PBXBuildFile; fileRef = CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */; };
 		CEB2AF5614C49AC800F907A9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB2AF5514C49AC800F907A9 /* main.m */; };
+		CEBCE2D81573FE49000402E1 /* HSPyUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBCE2D71573FE49000402E1 /* HSPyUtil.m */; };
+		CEC3F8F815765F9F00B26F0C /* DeletionOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEC3F8F615765F9F00B26F0C /* DeletionOptions.xib */; };
+		CEC3F8FC157668A300B26F0C /* DeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC3F8FB157668A300B26F0C /* DeletionOptions.m */; };
+		CEC3F8FF1576697700B26F0C /* PyDeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC3F8FE1576697700B26F0C /* PyDeletionOptions.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEEF2A1814C0A5A60082545A /* PyDupeGuru.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEF2A1714C0A5A60082545A /* PyDupeGuru.m */; };
@@ -84,6 +80,14 @@
 		CEEF2A4114C0B9050082545A /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEF2A3B14C0B9050082545A /* HSTable.m */; };
 		CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
+		CEFC64DE157678A500664D8C /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CEFC64E1157678AF00664D8C /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CEFC64E3157678C000664D8C /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CEFC64E5157678CA00664D8C /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CEFC64EA157678DE00664D8C /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CEFC64EB157678DE00664D8C /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */; };
+		CEFC64EC157678DE00664D8C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134612E5CE4D00A36C80 /* MainMenu.xib */; };
+		CEFC64ED157678DE00664D8C /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134812E5CE4D00A36C80 /* ProblemDialog.xib */; };
 		CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
 		CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
 		CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9B0FC9517500CD5728 /* Utils.m */; };
@@ -255,6 +259,14 @@
 		CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = dg_cocoa.py; path = ../../build/dg_cocoa.py; sourceTree = "<group>"; };
 		CEB2AF5514C49AC800F907A9 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../base/main.m; sourceTree = "<group>"; };
 		CEB57990146ADC5100EDF7D7 /* HSConsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSConsts.h; path = ../../cocoalib/HSConsts.h; sourceTree = "<group>"; };
+		CEBCE2D61573FE49000402E1 /* HSPyUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSPyUtil.h; path = ../../cocoalib/HSPyUtil.h; sourceTree = "<group>"; };
+		CEBCE2D71573FE49000402E1 /* HSPyUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSPyUtil.m; path = ../../cocoalib/HSPyUtil.m; sourceTree = "<group>"; };
+		CEBCE2DA1573FEBF000402E1 /* HSFairwareProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareProtocol.h; path = ../../cocoalib/HSFairwareProtocol.h; sourceTree = "<group>"; };
+		CEC3F8F715765F9F00B26F0C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEC3F8FA157668A300B26F0C /* DeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeletionOptions.h; path = ../base/DeletionOptions.h; sourceTree = "<group>"; };
+		CEC3F8FB157668A300B26F0C /* DeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DeletionOptions.m; path = ../base/DeletionOptions.m; sourceTree = "<group>"; };
+		CEC3F8FD1576697700B26F0C /* PyDeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDeletionOptions.h; sourceTree = "<group>"; };
+		CEC3F8FE1576697700B26F0C /* PyDeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDeletionOptions.m; sourceTree = "<group>"; };
 		CECFFF1C13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; };
 		CECFFF1D13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
 		CECFFF1F13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
@@ -320,6 +332,14 @@
 		CEF27A9D1423EAD90048ADFA /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/PrioritizeDialog.xib; sourceTree = "<group>"; };
 		CEF27A9E1423EAD90048ADFA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/PrioritizeDialog.xib; sourceTree = "<group>"; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
+		CEFC64DD157678A500664D8C /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E0157678AF00664D8C /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E2157678C000664D8C /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E4157678CA00664D8C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E6157678DE00664D8C /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E7157678DE00664D8C /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E8157678DE00664D8C /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
+		CEFC64E9157678DE00664D8C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DeletionOptions.xib; sourceTree = "<group>"; };
 		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F900FC9517500CD5728 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
@@ -469,6 +489,8 @@
 				CE4746D214C09C12001A66DE /* PyProblemDialog.m */,
 				CE412C0B1510ECAA00484122 /* PyIgnoreListDialog.h */,
 				CE412C0C1510ECAA00484122 /* PyIgnoreListDialog.m */,
+				CEC3F8FD1576697700B26F0C /* PyDeletionOptions.h */,
+				CEC3F8FE1576697700B26F0C /* PyDeletionOptions.m */,
 				CE9FC23114C0866F005C31FD /* PyResultTable.h */,
 				CE9FC23214C0866F005C31FD /* PyResultTable.m */,
 				CE1D091614BE0C6400CA6B8C /* PyStatsLabel.h */,
@@ -533,6 +555,7 @@
 				CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */,
 				CE81135612E5CE6D00A36C80 /* Preferences.xib */,
 				CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */,
+				CEC3F8F615765F9F00B26F0C /* DeletionOptions.xib */,
 			);
 			name = xib;
 			sourceTree = "<group>";
@@ -556,6 +579,7 @@
 				CEB57990146ADC5100EDF7D7 /* HSConsts.h */,
 				CEFC7F8A0FC9517500CD5728 /* Dialogs.h */,
 				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
+				CEBCE2DA1573FEBF000402E1 /* HSFairwareProtocol.h */,
 				CE79638A12536F4E008D405B /* HSFairwareReminder.h */,
 				CE79638B12536F4E008D405B /* HSFairwareReminder.m */,
 				CE27D3C212CCA43800859E67 /* HSAboutBox.h */,
@@ -569,6 +593,8 @@
 				CEFC7F910FC9517500CD5728 /* ProgressController.m */,
 				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
 				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
+				CEBCE2D61573FE49000402E1 /* HSPyUtil.h */,
+				CEBCE2D71573FE49000402E1 /* HSPyUtil.m */,
 				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
 				CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */,
 			);
@@ -601,6 +627,8 @@
 				CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */,
 				CE89240614239CC30024CE4E /* PrioritizeList.h */,
 				CE89240714239CC30024CE4E /* PrioritizeList.m */,
+				CEC3F8FA157668A300B26F0C /* DeletionOptions.h */,
+				CEC3F8FB157668A300B26F0C /* DeletionOptions.m */,
 				CEB2AF5514C49AC800F907A9 /* main.m */,
 			);
 			name = dgbase;
@@ -690,14 +718,15 @@
 				CE18005114BDD87B001B6329 /* py in Resources */,
 				CEA450B814BDDFD7002DAAF2 /* dg_cocoa.py in Resources */,
 				CE412C111510ECCA00484122 /* IgnoreListDialog.xib in Resources */,
-				CE3491E3151100A40030B64C /* ResultWindow.xib in Resources */,
-				CE3491E6151100AD0030B64C /* ResultWindow.xib in Resources */,
-				CE3491E9151100BB0030B64C /* ResultWindow.xib in Resources */,
-				CE3491EA151100BB0030B64C /* Preferences.xib in Resources */,
-				CE148035151100EC00CD5DAD /* ResultWindow.xib in Resources */,
-				CE148038151100FB00CD5DAD /* ResultWindow.xib in Resources */,
-				CE14803A1511010500CD5DAD /* ResultWindow.xib in Resources */,
-				CE14803C1511011000CD5DAD /* ResultWindow.xib in Resources */,
+				CEC3F8F815765F9F00B26F0C /* DeletionOptions.xib in Resources */,
+				CEFC64DE157678A500664D8C /* DetailsPanel.xib in Resources */,
+				CEFC64E1157678AF00664D8C /* DetailsPanel.xib in Resources */,
+				CEFC64E3157678C000664D8C /* DetailsPanel.xib in Resources */,
+				CEFC64E5157678CA00664D8C /* DetailsPanel.xib in Resources */,
+				CEFC64EA157678DE00664D8C /* DetailsPanel.xib in Resources */,
+				CEFC64EB157678DE00664D8C /* DirectoryPanel.xib in Resources */,
+				CEFC64EC157678DE00664D8C /* MainMenu.xib in Resources */,
+				CEFC64ED157678DE00664D8C /* ProblemDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -758,6 +787,9 @@
 				CEB2AF5614C49AC800F907A9 /* main.m in Sources */,
 				CE412C0D1510ECAA00484122 /* PyIgnoreListDialog.m in Sources */,
 				CE412C141510ED2E00484122 /* IgnoreListDialog.m in Sources */,
+				CEBCE2D81573FE49000402E1 /* HSPyUtil.m in Sources */,
+				CEC3F8FC157668A300B26F0C /* DeletionOptions.m in Sources */,
+				CEC3F8FF1576697700B26F0C /* PyDeletionOptions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -957,6 +989,22 @@
 			name = PrioritizeDialog.xib;
 			sourceTree = "<group>";
 		};
+		CEC3F8F615765F9F00B26F0C /* DeletionOptions.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CEC3F8F715765F9F00B26F0C /* en */,
+				CEFC64DD157678A500664D8C /* de */,
+				CEFC64E0157678AF00664D8C /* cs */,
+				CEFC64E2157678C000664D8C /* fr */,
+				CEFC64E4157678CA00664D8C /* hy */,
+				CEFC64E6157678DE00664D8C /* it */,
+				CEFC64E7157678DE00664D8C /* ru */,
+				CEFC64E8157678DE00664D8C /* uk */,
+				CEFC64E9157678DE00664D8C /* zh_CN */,
+			);
+			name = DeletionOptions.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

core/app.py

@@ -12,6 +12,7 @@ import logging
 import subprocess
 import re
 import time
+import shutil
 
 from send2trash import send2trash
 from hscommon import io
@@ -24,6 +25,7 @@ from hscommon.util import (delete_if_empty, first, escape, nonone, format_time_d
 from hscommon.trans import tr
 
 from . import directories, results, scanner, export, fs
+from .gui.deletion_options import DeletionOptions
 from .gui.details_panel import DetailsPanel
 from .gui.directory_tree import DirectoryTree
 from .gui.ignore_list_dialog import IgnoreListDialog
@@ -118,6 +120,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         self.ignore_list_dialog = IgnoreListDialog(self)
         self.stats_label = StatsLabel(self)
         self.result_table = self._create_result_table()
+        self.deletion_options = DeletionOptions()
         children = [self.result_table, self.directory_tree, self.stats_label, self.details_panel]
         for child in children:
             child.connect()
@@ -155,23 +158,30 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             return len([dupe for dupe in group.dupes if self.results.is_marked(dupe)])
         return cmp_value(group.ref, key)
     
-    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)
         
         j.start_job(self.results.mark_count)
         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 not io.exists(dupe.path):
             return
         logging.debug("Sending '%s' to trash", dupe.path)
-        send2trash(str(dupe.path)) # Raises OSError when there's a problem
+        str_path = str(dupe.path)
+        if direct_deletion:
+            if op.isdir(str_path):
+                shutil.rmtree(str_path)
+            else:
+                os.remove(str_path)
+        else:
+            send2trash(str_path) # Raises OSError when there's a problem
         if replace_with_hardlinks:
             group = self.results.get_group_of_duplicate(dupe)
             ref = group.ref
-            os.link(str(ref.path), str(dupe.path))
+            os.link(str(ref.path), str_path)
         self.clean_empty_dirs(dupe.path[:-1])
     
     def _create_file(self, path):
@@ -334,19 +344,17 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             jobid = JobType.Copy if copy else JobType.Move
             self.view.start_job(jobid, do)
     
-    def delete_marked(self, replace_with_hardlinks=False):
+    def delete_marked(self):
         if not self._check_demo():
             return
         if not self.results.mark_count:
             self.view.show_message(MSG_NO_MARKED_DUPES)
             return
-        if replace_with_hardlinks:
-            msg = tr("You are about to send %d files to Trash (and hardlink them afterwards). Continue?")
-        else:
-            msg = tr("You are about to send %d files to Trash. Continue?")
-        if not self.view.ask_yes_no(msg % self.results.mark_count):
+        if not self.deletion_options.show(self.results.mark_count):
             return
-        self.view.start_job(JobType.Delete, self._do_delete, args=[replace_with_hardlinks])
+        args = [self.deletion_options.hardlink, self.deletion_options.direct]
+        logging.debug("Starting deletion job with args %r", args)
+        self.view.start_job(JobType.Delete, self._do_delete, args=args)
     
     def export_to_xhtml(self):
         columns = [col for col in self.result_table.columns.ordered_columns

core/fs.py

@@ -15,7 +15,9 @@ import hashlib
 import logging
 
 from hscommon import io
-from hscommon.util import nonone, flatten, get_file_ext
+from hscommon.util import nonone, get_file_ext
+
+NOT_SET = object()
 
 class FSError(Exception):
     cls_message = "An error has occured on '{name}' in '{parent}'"
@@ -55,29 +57,35 @@ class File:
         'md5': '',
         'md5partial': '',
     }
+    # Slots for File make us save quite a bit of memory. In a memory test I've made with a lot of
+    # files, I saved 35% memory usage with "unread" files (no _read_info() call) and gains become
+    # even greater when we take into account read attributes (70%!). Yeah, it's worth it.
+    __slots__ = ('path', 'is_ref', 'words') + tuple(INITIAL_INFO.keys())
     
     def __init__(self, path):
         self.path = path
-        #This offset is where we should start reading the file to get a partial md5
-        #For audio file, it should be where audio data starts
-        self._md5partial_offset = 0x4000 #16Kb
-        self._md5partial_size   = 0x4000 #16Kb
+        for attrname in self.INITIAL_INFO:
+            setattr(self, attrname, NOT_SET)
     
     def __repr__(self):
         return "<{} {}>".format(self.__class__.__name__, str(self.path))
     
-    def __getattr__(self, attrname):
-        # Only called when attr is not there
-        if attrname in self.INITIAL_INFO:
+    def __getattribute__(self, attrname):
+        result = object.__getattribute__(self, attrname)
+        if result is NOT_SET:
             try:
                 self._read_info(attrname)
             except Exception as e:
                 logging.warning("An error '%s' was raised while decoding '%s'", e, repr(self.path))
-            try:
-                return self.__dict__[attrname]
-            except KeyError:
-                return self.INITIAL_INFO[attrname]
-        raise AttributeError()
+            result = object.__getattribute__(self, attrname)
+            if result is NOT_SET:
+                result = self.INITIAL_INFO[attrname]
+        return result
+    
+    #This offset is where we should start reading the file to get a partial md5
+    #For audio file, it should be where audio data starts
+    def _get_md5partial_offset_and_size(self):
+        return (0x4000, 0x4000) #16Kb
     
     def _read_info(self, field):
         if field in ('size', 'mtime'):
@@ -87,8 +95,7 @@ class File:
         elif field == 'md5partial':
             try:
                 fp = io.open(self.path, 'rb')
-                offset = self._md5partial_offset
-                size = self._md5partial_size
+                offset, size = self._get_md5partial_offset_and_size()
                 fp.seek(offset)
                 partialdata = fp.read(size)
                 md5 = hashlib.md5(partialdata)
@@ -116,10 +123,9 @@ class File:
         If `attrnames` is not None, caches only attrnames.
         """
         if attrnames is None:
-            attrnames = list(self.INITIAL_INFO.keys())
+            attrnames = self.INITIAL_INFO.keys()
         for attrname in attrnames:
-            if attrname not in self.__dict__:
-                self._read_info(attrname)
+            getattr(self, attrname)
     
     #--- Public
     @classmethod
@@ -159,6 +165,8 @@ class Folder(File):
     
     It has the size/md5 info of a File, but it's value are the sum of its subitems.
     """
+    __slots__ = File.__slots__ + ('_subfolders', )
+    
     def __init__(self, path):
         File.__init__(self, path)
         self._subfolders = None

core/gui/deletion_options.py

@@ -0,0 +1,23 @@
+# Created On: 2012-05-30
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from hscommon.gui.base import GUIObject
+from hscommon.trans import tr
+
+class DeletionOptions(GUIObject):
+    #--- View interface
+    # update_msg(msg: str)
+    # show()
+    #
+    
+    def show(self, mark_count):
+        self.hardlink = False
+        self.direct = False
+        msg = tr("You are sending {} file(s) to the Trash.").format(mark_count)
+        self.view.update_msg(msg)
+        return self.view.show()
+    

core_me/__init__.py

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

core_me/fs.py

@@ -28,6 +28,7 @@ class MusicFile(fs.File):
         'year'    : '',
         'track'   : 0,
     })
+    __slots__ = fs.File.__slots__ + tuple(INITIAL_INFO.keys())
     
     @classmethod
     def can_handle(cls, path):
@@ -35,11 +36,11 @@ class MusicFile(fs.File):
             return False
         return get_file_ext(path[-1]) in auto.EXT2CLASS
     
+    def _get_md5partial_offset_and_size(self):
+        f = auto.File(str(self.path))
+        return (f.audio_offset, f.audio_size)
+    
     def _read_info(self, field):
-        if field == 'md5partial':
-            f = auto.File(str(self.path))
-            self._md5partial_offset = f.audio_offset
-            self._md5partial_size = f.audio_size
         fs.File._read_info(self, field)
         if field in TAG_FIELDS:
             f = auto.File(str(self.path))

core_me/tests/scanner_test.py

@@ -11,18 +11,9 @@ from hscommon import io
 from hscommon.path import Path
 
 from core.engine import getwords
+from core.tests.scanner_test import NamedObject, no
 from ..scanner import *
 
-class NamedObject:
-    def __init__(self, name="foobar", size=1):
-        self.name = name
-        self.size = size
-        self.path = Path('')
-        self.words = getwords(name)
-    
-
-no = NamedObject
-
 def pytest_funcarg__fake_fileexists(request):
     # This is a hack to avoid invalidating all previous tests since the scanner started to test
     # for file existence before doing the match grouping.
@@ -32,7 +23,7 @@ def pytest_funcarg__fake_fileexists(request):
 def test_priorize_me(fake_fileexists):
     # in ScannerME, bitrate goes first (right after is_ref) in priorization
     s = ScannerME()
-    o1, o2 = no('foo'), no('foo')
+    o1, o2 = no('foo', path='p1'), no('foo', path='p2')
     o1.bitrate = 1
     o2.bitrate = 2
     [group] = s.get_dupe_groups([o1, o2])

core_pe/__init__.py

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

core_pe/photo.py

@@ -16,6 +16,8 @@ class Photo(fs.File):
     INITIAL_INFO.update({
         'dimensions': (0,0),
     })
+    __slots__ = fs.File.__slots__ + tuple(INITIAL_INFO.keys())
+    
     # These extensions are supported on all platforms
     HANDLED_EXTS = {'png', 'jpg', 'jpeg', 'gif', 'bmp', 'tiff', 'tif'}
     

core_se/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.3.3'
+__version__ = '3.5.0'
 __appname__ = 'dupeGuru'

debian_me/control

@@ -7,6 +7,6 @@ Standards-Version: 3.8.1
 Homepage: http://www.hardcoded.net
 
 Package: dupeguru-me
-Architecture: any
-Depends: python3 (>=3.2), libqtgui4
+Architecture: all
+Depends: python3 (>=3.2), python3-pyqt4
 Description: dupeGuru Music Edition

debian_pe/control

@@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net
 
 Package: dupeguru-pe
 Architecture: any
-Depends: python3 (>=3.2), libqtgui4
+Depends: python3 (>=3.2), python3-pyqt4
 Description: dupeGuru Picture Edition

debian_se/control

@@ -7,6 +7,6 @@ Standards-Version: 3.8.1
 Homepage: http://www.hardcoded.net
 
 Package: dupeguru-se
-Architecture: any
-Depends: python3 (>=3.2), libqtgui4
+Architecture: all
+Depends: python3 (>=3.2), python3-pyqt4
 Description: dupeGuru

help/changelog_me

@@ -1,3 +1,19 @@
+=== 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]
+* Fixed localization issues. [Windows, Linux]
+
 === 6.3.0 (2012-03-27)
 
 * Improved iTunes support. [Mac]

help/changelog_pe

@@ -1,3 +1,23 @@
+=== 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]
+* Added a dialog to edit the Ignore List.
+* Added the ability to sort results by "marked" status.
+* Fixed "Open with default application". (#190)
+* Fixed a bug where there would be a false reporting of discarded matches. (#195)
+* Fixed various localization glitches.
+* Fixed hard crashes on crash reporting. (#196)
+* Fixed bug where the details panel would show up at inconvenient places in the screen. [Windows, Linux]
+
 === 2.4.1 (2012-01-23)
 
 * Fixed a crash on sorting by dimensions.

help/changelog_se

@@ -1,3 +1,26 @@
+=== 3.5.0 (2012-06-01)
+
+* 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)
+
+* Fixed the "Folders" scan type. [Mac]
+* Fixed localization issues. [Windows, Linux]
+
+=== 3.4.0 (2012-03-29)
+
+* Improved results window UI. [Windows, Linux]
+* Added a dialog to edit the Ignore List.
+* Added the ability to sort results by "marked" status.
+* Fixed "Open with default application". (#190)
+* Fixed a bug where there would be a false reporting of discarded matches. (#195)
+* Fixed various localization glitches.
+* Fixed hard crashes on crash reporting. (#196)
+* Fixed bug where the details panel would show up at inconvenient places in the screen. [Windows, Linux]
+
 === 3.3.3 (2012-02-01)
 
 * Fixed crash on adding some folders. [Mac OS X]

help/conf.tmpl

@@ -25,7 +25,7 @@ import sys, os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ['sphinx.ext.todo']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -173,51 +173,4 @@ html_show_sourcelink = False
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'dupeGurudoc'
 
-
-# -- 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)
-]
+todo_include_todos = True

help/de/credits.rst

@@ -20,6 +20,8 @@ Unten befindet sich die Liste aller Menschen, die direkt oder indirekt zu dupeGu
 
 | **Yuri Petrashko, Ukrainian localization**
 
+| **Nickolas Pohilets, Ukrainian localization**
+
 | **Python, Programming language** (`Website <http://www.python.org>`__)
 | The bestest of the bests
 

help/de/faq.rst

@@ -112,3 +112,4 @@ Häufig gestellte Fragen
 
     Wenn dies alles fehlschlägt, kontaktieren Sie `HS support <http://www.hardcoded.net/support>`_, wir werden das Problem lösen.
 
+.. todo:: This FAQ qestion is outdated, see english version.

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/de/results.rst

@@ -93,4 +93,5 @@ Aktionen Menü
 * **Eigenen Befehl ausführen:** Ruft die in den Einstellungen definierte externe Anwendung auf und nutzt die aktuelle Auswahl als Argumente für den Aufruf.
 * **Ausgewählte umbenennen:** Fragt nach einem neuen Namen und benennt die ausgewählte Datei um.
 
-.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add "Deletion Options" section.

help/en/credits.rst

@@ -22,6 +22,8 @@ Below is the list of people who contributed, directly or indirectly to dupeGuru.
 
 | **Yuri Petrashko, Ukrainian localization**
 
+| **Nickolas Pohilets, Ukrainian localization**
+
 | **Python, Programming language** (`Website <http://www.python.org>`__)
 | The bestest of the bests
 

help/en/faq.rst

@@ -103,13 +103,21 @@ Frequently Asked Questions
 
 .. topic:: I tried to send my duplicates to Trash, but dupeGuru is telling me it can't do it. Why? What can I do?
 
-    Most of the time, the reason why dupeGuru can't send files to Trash is because of file permissions. You need *write* permissions on files you want to send to Trash. If you're not familiar with the command line, you can use utilities such as `BatChmod <http://macchampion.com/arbysoft/BatchMod>`_ to fix your permissions.
+    Most of the time, the reason why dupeGuru can't send files to Trash is because of file
+    permissions. You need *write* permissions on files you want to send to Trash. If you're not
+    familiar with the command line, you can use utilities such as `BatChmod`_ to fix your
+    permissions.
 
-    If dupeGuru still gives you troubles after fixing your permissions, there have been some cases where using "Move Marked to..." as a workaround did the trick. So instead of sending your files to Trash, you send them to a temporary folder with the "Move Marked to..." action, and then you delete that temporary folder manually.
+    If dupeGuru still gives you troubles after fixing your permissions, try enabling the "Directly
+    delete files" option that is offered to you when you activate Send to Trash. This will not send
+    files to the Trash, but delete them immediately. In some cases, for example on network storage
+    (NAS), this has been known to work when normal deletion didn't.
 
     .. only:: edition_pe
 
         If you're trying to delete *iPhoto* pictures, then the reason for the failure is different. The deletion fails because dupeGuru can't communicate with iPhoto. Be aware that for the deletion to work correctly, you're not supposed to play around iPhoto while dupeGuru is working. Also, sometimes, the Applescript system doesn't seem to know where to find iPhoto to launch it. It might help in these cases to launch iPhoto *before* you send your duplicates to Trash.
 
-    If all of this fail, `contact HS support <http://www.hardcoded.net/support>`_, we'll figure it out.
+    If all of this fail, `contact HS support`_, we'll figure it out.
 
+.. _BatChmod: http://www.lagentesoft.com/batchmod/index.html
+.. _contact HS support: http://www.hardcoded.net/support

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/en/results.rst

@@ -78,21 +78,54 @@ You might notice that not all duplicates in the filtered results will match your
 Action Menu
 -----------
 
-* **Clear Ignore List:** Remove all ignored matches you added. You have to start a new scan for the newly cleared ignore list to be effective.
-* **Export Results to XHTML:** Take the current results, and create an XHTML file out of it. The columns that are visible when you click on this button will be the columns present in the XHTML file. The file will automatically be opened in your default browser.
-* **Send Marked to Trash:** Send all marked duplicates to trash, obviously.
-* **Delete Marked and Replace with Hardlinks:** Sends all marked duplicates to trash, but after having done that, the deleted files are replaced by a `hard link <http://en.wikipedia.org/wiki/Hard_link>`_ to the reference file. (Only for OS X and Linux)
-* **Move Marked to...:** Prompt you for a destination, and then move all marked files to that destination. Source file's path might be re-created in destination, depending on the "Copy and Move" preference.
-* **Copy Marked to...:** Prompt you for a destination, and then copy all marked files to that destination. Source file's path might be re-created in destination, depending on the "Copy and Move" preference.
-* **Remove Marked from Results:** Remove all marked duplicates from results. The actual files will not be touched and will stay where they are.
-* **Remove Selected from Results:** Remove all selected duplicates from results. Note that all selected reference files will be ignored, only duplicates can be removed with this action.
-* **Make Selected Reference:** Promote all selected duplicates to reference. If a duplicate is a part of a group having a reference file coming from a reference folder (in blue color), no action will be taken for this duplicate. If more than one duplicate among the same group are selected, only the first of each group will be promoted.
-* **Add Selected to Ignore List:** This first removes all selected duplicates from results, and then add the match of that duplicate and the current reference in the ignore list. This match will not come up again in further scan. The duplicate itself might come back, but it will be matched with another reference file. You can clear the ignore list with the Clear Ignore List command.
-* **Open Selected with Default Application:** Open the file with the application associated with selected file's type.
+* **Clear Ignore List:** Remove all ignored matches you added. You have to start a new scan for the
+  newly cleared ignore list to be effective.
+* **Export Results to XHTML:** Take the current results, and create an XHTML file out of it. The
+  columns that are visible when you click on this button will be the columns present in the XHTML
+  file. The file will automatically be opened in your default browser.
+* **Send Marked to Trash:** Send all marked duplicates to trash, obviously. Before proceeding,
+  you'll be presented deletion options (see below).
+* **Move Marked to...:** Prompt you for a destination, and then move all marked files to that
+  destination. Source file's path might be re-created in destination, depending on the
+  "Copy and Move" preference.
+* **Copy Marked to...:** Prompt you for a destination, and then copy all marked files to that
+  destination. Source file's path might be re-created in destination, depending on the
+  "Copy and Move" preference.
+* **Remove Marked from Results:** Remove all marked duplicates from results. The actual files will
+  not be touched and will stay where they are.
+* **Remove Selected from Results:** Remove all selected duplicates from results. Note that all
+  selected reference files will be ignored, only duplicates can be removed with this action.
+* **Make Selected Reference:** Promote all selected duplicates to reference. If a duplicate is a
+  part of a group having a reference file coming from a reference folder (in blue color), no action
+  will be taken for this duplicate. If more than one duplicate among the same group are selected,
+  only the first of each group will be promoted.
+* **Add Selected to Ignore List:** This first removes all selected duplicates from results, and
+  then add the match of that duplicate and the current reference in the ignore list. This match
+  will not come up again in further scan. The duplicate itself might come back, but it will be
+  matched with another reference file. You can clear the ignore list with the Clear Ignore List
+  command.
+* **Open Selected with Default Application:** Open the file with the application associated with
+  selected file's type.
 * **Reveal Selected in Finder:** Open the folder containing selected file.
-* **Invoke Custom Command:** Invokes the external application you've set up in your preferences using the current selection as arguments in the invocation.
+* **Invoke Custom Command:** Invokes the external application you've set up in your preferences
+  using the current selection as arguments in the invocation.
 * **Rename Selected:** Prompts you for a new name, and then rename the selected file.
 
 **Warning about moving files in iPhoto/iTunes:** When using the "Move Marked" action on duplicates 
 that come from iPhoto or iTunes, files are copied, not moved. dupeGuru cannot use the Move action
 on those files.
+
+Deletion Options
+----------------
+
+These options affect how duplicate deletion takes place. Most of the time, you don't need to enable
+any of them.
+
+* **Hardlink deleted files:** The deleted files are replaced by a `hard link`_ to the reference
+  file. (Only for OS X and Linux)
+* **Directly delete files:** Instead of sending files to trash, directly delete them. This is used
+  for troubleshooting and you normally don't need to enable this unless dupeGuru has problems
+  deleting files normally, something that can happens when you try to delete files on network
+  storage (NAS).
+
+.. _hard link: http://en.wikipedia.org/wiki/Hard_link

help/fr/credits.rst

@@ -21,6 +21,8 @@ Voici la liste des contributeurs de dupeGuru. Merci!
 
 | **Yuri Petrashko, localisation ukrainienne**
 
+| **Nickolas Pohilets, localisation ukrainienne**
+
 | **Python, Langage de programmation** (`Website <http://www.python.org>`__)
 | Le meilleur des meilleurs
 

help/fr/faq.rst

@@ -113,3 +113,5 @@ Foire aux questions
         Si vous essayez d'effacer des photos dans iPhoto, alors la raison du problème est différente. L'opération rate parce que dupeGuru ne peut pas communiquer avec iPhoto. Il faut garder à l'esprit qu'il ne faut pas toucher à iPhoto pendant l'opération parce que ça peut déranger la communication entre dupeGuru et iPhoto. Aussi, quelque fois, dupeGuru ne peut pas trouver l'application iPhoto. Il faut mieux alors démarrer iPhoto avant l'opération.
 
     Dans le pire des cas, `contactez le support HS <http://www.hardcoded.net/support>`_, on trouvera bien.
+
+.. todo:: This FAQ qestion is outdated, see english version.

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/fr/results.rst

@@ -93,4 +93,5 @@ Voici la liste des actions qu'il est possible d'appliquer aux résultats.
 * **Invoquer commande personnalisée:** Invoque la commande personnalisé que vous avez définie dans les :doc:`preferences`.
 * **Renommer sélectionné:** Renomme le fichier sélectionné après vous avoir demandé d'entrer un nouveau nom.
 
-.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add "Deletion Options" section.

help/hy/credits.rst

@@ -22,6 +22,8 @@
 
 | **Yuri Petrashko, Ukrainian localization**
 
+| **Nickolas Pohilets, Ukrainian localization**
+
 | **Python, Ծրագրավորման լեզուն** (`Վեբ կայքը <http://www.python.org>`__)
 | Լավագույներից լավագույնը
 

help/hy/faq.rst

@@ -110,4 +110,6 @@
 
         Եթե Դուք փորձում եք ջնջել *iPhoto* նկարները, ապա ձախողման պատճառը տարբեր է: Ջնջելը ձախողվել է, որովհետև dupeGuru-ը չի կարողանում համագործակցել iPhoto: Լինել տեղեկացված, որ ջնջումը նորմալ է աշխատում, Դուք չեք նախատեսում խաղարկել ձայն iPhoto-ին, քանսզի dupeGuru-ն աշխատում է: Նաև, երբեմն, Applescript համակարգը չի կողմնորոշվում որտեղ փնտրել iPhoto՝ բացելու համար: Հավանական է, այս դեպքերում պետք է բացել iPhoto-ն *մինչև* Դուք ուղարկեք Ձեր կրկնօրինակները Աղբարկղ:
 
-    Եթե այս ամենը ձախողվի, `կապնվեք HS աջակցության թիմի հետ <http://www.hardcoded.net/support>`_, մենք կփորձեք օգնել Ձեզ:
+    Եթե այս ամենը ձախողվի, `կապնվեք HS աջակցության թիմի հետ <http://www.hardcoded.net/support>`_, մենք կփորձեք օգնել Ձեզ:
+
+.. todo:: This FAQ qestion is outdated, see english version.

help/hy/folders.rst

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

help/hy/results.rst

@@ -93,4 +93,5 @@ dupeGuru-ն աջակցում է հետստուգման ֆիլտրում։ Սրա
 * **Կանչել Ընտրված հրամանը.** Բացում է կարգավորումներոմ Ձեր կողմից նշված արտաքին ծրագիրը։
 * **Անվանափոխել ընտրվածը.** Ձեզ հարցում կկատարվի նոր անվան համար, ապա ընտրված ֆայլը կանվանափոխվի։
 
-.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add "Deletion Options" section.

help/ru/credits.rst

@@ -22,6 +22,8 @@
 
 | **Yuri Petrashko, Ukrainian localization**
 
+| **Nickolas Pohilets, Ukrainian localization**
+
 | **Python, Язык программирования** (`Веб сайт  <http://www.python.org>`__)
 | Самая лучшая 
 

help/ru/faq.rst

@@ -113,3 +113,4 @@
 
     Если все это не так, `контакт с поддержки HS <http://www.hardcoded.net/support>`_, мы поможем Вас.
 
+.. todo:: This FAQ qestion is outdated, see english version.

help/ru/folders.rst

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

help/ru/results.rst

@@ -93,4 +93,5 @@ dupeGuru поддерживает после сканирования, филь
 * **Вызов специальной команды:** Вызывает внешнюю программу вы установили в настройках с использованием выделенного фрагмента в качестве аргументов в вызове.
 * **Переименования выбрано:** Запрашивает новое имя, а затем переименовать выбранный файл.
 
-.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add "Deletion Options" section.

help/uk/credits.rst

@@ -22,6 +22,8 @@
 
 | **Yuri Petrashko, Ukrainian localization**
 
+| **Nickolas Pohilets, Ukrainian localization**
+
 | **Python, Мова програмування** (`Веб-сайт <http://www.python.org>`__)
 | Кращі рекорди
 

help/uk/faq.rst

@@ -113,3 +113,5 @@
 
     Якщо все це не так, `контакт УГ підтримки <http://www.hardcoded.net/support>`_, ми зрозуміти це.
 
+.. todo:: This FAQ qestion is outdated, see english version.
+

help/uk/folders.rst

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

help/uk/results.rst

@@ -93,4 +93,5 @@ dupeGuru підтримує після сканування, фільтраці
 * **Викликати спеціальної команди:** Викликає зовнішню програму ви встановили в настройках з використанням виділеного фрагмента в якості аргументів у виклику.
 * **Перейменування обрано:** Запит нове ім'я, а потім перейменувати вибраний файл.
 
-.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add Move and iPhoto/iTunes warning
+.. todo:: Add "Deletion Options" section.

locale/core.pot

@@ -3,79 +3,71 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr ""
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr ""
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr ""
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr ""
 
-#: core/app.py:231
+#: core/app.py:258
 msgid "You cannot delete, move or copy more than 10 duplicates at once in demo mode."
 msgstr ""
 
-#: core/app.py:252
+#: core/app.py:279
 msgid "All selected %d matches are going to be ignored in all subsequent scans. Continue?"
 msgstr ""
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr ""
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr ""
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr ""
 
-#: core/app.py:327
-msgid "You are about to send %d files to Trash (and hardlink them afterwards). Continue?"
-msgstr ""
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr ""
-
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr ""
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr ""
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr ""
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr ""
 
@@ -95,6 +87,10 @@ msgstr ""
 msgid "Grouped %d/%d matches"
 msgstr ""
 
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
+msgstr ""
+
 #: core/gui/ignore_list_dialog.py:24
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr ""
@@ -155,15 +151,15 @@ msgstr ""
 msgid "Analyzed %d/%d pictures"
 msgstr ""
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr ""
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr ""
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr ""
 

locale/cs/LC_MESSAGES/core.po

@@ -2,25 +2,25 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
 msgstr ""
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Shromažďuji prohlížené soubory"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Vybrané adresáře neobsahují žádné soubory vhodné k prohledávání."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d vyřazeno)"
 
@@ -96,15 +96,15 @@ msgstr "Přiřazuji prioritu skupině"
 msgid "Analyzed %d/%d pictures"
 msgstr "Analyzováno %d/%d snímků"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "Provedeno %d/%d porovnání bloků"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Připravuji porovnávání"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "Ověřeno %d/%d shod"
 
@@ -112,31 +112,31 @@ msgstr "Ověřeno %d/%d shod"
 msgid "Read EXIF of %d/%d pictures"
 msgstr ""
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Nebyli nalezeny žádné duplicity."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr ""
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr ""
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr ""
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -148,35 +148,27 @@ msgstr ""
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr "Opravdu chcete odstranit všech %d položek ze seznamu výjimek?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 "Nedefinoval jste žádný uživatelský příkaz. Nadefinujete ho v předvolbách."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "Chystáte se z výsledků odstranit %d souborů. Pokračovat?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr ""
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr ""
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr ""
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
 msgstr ""
-"Chystáte se vyhodit %d souborů do koše (a následně na ně vytvořit "
-"hardlinky). Pokračovat?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "Chystáte se vyhodit %d souborů do koše. Pokračovat?"

locale/cs/LC_MESSAGES/ui.po

@@ -2,55 +2,55 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Vyhledávám duplicity"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Nahrávám"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Přesouvám"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Kopíruji"
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr ""
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr ""
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr ""
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "Nápověda dupeGuru"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "O aplikaci"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr ""
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr ""
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr ""
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -87,16 +87,16 @@ msgstr "Okno s výsledky"
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -255,135 +255,127 @@ msgstr "Problémy!"
 msgid "Reveal Selected"
 msgstr "Ukázat vybrané ve správci souborů"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Zavřít"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Označené nahradit pevnými odkazy"
-
-#: qt/base/result_window.py:53 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 "Označené přesunout..."
 
-#: qt/base/result_window.py:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:300 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ů"
 
@@ -496,16 +488,16 @@ msgstr "EXIF razítko"
 msgid "Match pictures of different dimensions"
 msgstr "Porovnávat snímky s různými rozměry"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Vyčistit cache snímků"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr "Opravdu chcete odstranit veškeré uložené analýzy snímků?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "Picture cache cleared."
 
@@ -538,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"
@@ -594,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"
@@ -652,6 +635,8 @@ msgstr "Změnit prioritu výsledků"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Zrušit"
@@ -690,7 +675,7 @@ msgstr "Akce"
 msgid "Directories"
 msgstr "Adresáře"
 
-#: qt/base/result_window.py:178 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"
 
@@ -789,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:154 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."
 
@@ -813,13 +798,13 @@ msgstr "'%@' does not exist."
 msgid "The name '%@' already exists."
 msgstr "The name '%@' already exists."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "You have no dead tracks in your iTunes Library"
 
@@ -835,36 +820,108 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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/core.po

@@ -2,25 +2,25 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
 msgstr ""
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Sammle Dateien zum Scannen"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Der ausgewählte Ordner enthält keine scannbare Dateien."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d verworfen)"
 
@@ -96,15 +96,15 @@ msgstr "Gruppenpriorisierung"
 msgid "Analyzed %d/%d pictures"
 msgstr "Analysiere %d/%d Bilder"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "Performed %d/%d chunk matches"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Vorbereitung auf den Vergleich"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "%d/%d verifizierte Paare"
 
@@ -112,31 +112,31 @@ msgstr "%d/%d verifizierte Paare"
 msgid "Read EXIF of %d/%d pictures"
 msgstr ""
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Keine Duplikate gefunden."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr ""
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr ""
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr ""
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -146,36 +146,28 @@ msgstr "%d Dateien werden in zukünftigen Scans ignoriert werden. Fortfahren?"
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr "Möchten Sie wirklich alle %d Einträge aus der Ignorier-Liste löschen?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 "Sie haben keinen eigenen Befehl erstellt. Bitte in den Einstellungen "
 "konfigurieren."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "%d Dateien werden aus der Ergebnisliste entfernt. Fortfahren?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr "kopieren"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr "verschieben"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr "Wählen sie einen Ordner zum {} der ausgewählten Dateien"
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
 msgstr ""
-"%d Dateien werden gelöscht und mit physikalischen Verknüpfungen ersetzt. "
-"Fortfahren?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "%d Dateien werden in den Mülleimer zu verschoben. Fortfahren?"

locale/de/LC_MESSAGES/ui.po

@@ -2,55 +2,55 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Suche nach Duplikaten"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Laden"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Verschieben"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Kopieren"
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "Sende Dateien in den Mülleimer"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "Beenden"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "dupeGuru Hilfe"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "Über dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr "Registriere dupeGuru"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "Auf Updates überprüfen"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr "Debug Log öffnen"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -87,16 +87,16 @@ msgstr "Ergebnisfenster"
 msgid "Add Folder..."
 msgstr "Ordner hinzufügen..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru Ergebnisse (*.dupeguru)"
 
@@ -264,135 +264,127 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr "Zeige Markierte"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Schließen"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Lösche Markierte und ersetze mit Hardlinks"
-
-#: qt/base/result_window.py:53 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 "Verschiebe Markierte nach..."
 
-#: qt/base/result_window.py:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize 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: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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Öffne beeinhaltenden Ordner der Ausgewählten"
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Exportiere als HTML"
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Auswählen"
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (Ergebnisse)"
 
-#: qt/base/result_window.py:300 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."
 
@@ -505,17 +497,17 @@ msgstr "EXIF Timestamp"
 msgid "Match pictures of different dimensions"
 msgstr "Vergleiche Bilder mit unterschiedlicher Auflösung"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Bildzwischenspeicher leeren"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr ""
 "Möchten Sie wirklich alle zwischengespeicherten Bildanalysen entfernen?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "Bildzwischenspeicher geleert."
 
@@ -548,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"
@@ -604,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"
@@ -662,6 +645,8 @@ msgstr "Re-Prioritize Results"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Cancel"
@@ -690,7 +675,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Directories"
 
-#: qt/base/result_window.py:178 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"
 
@@ -789,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:154 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."
 
@@ -813,13 +798,13 @@ msgstr "'%@' does not exist."
 msgid "The name '%@' already exists."
 msgstr "The name '%@' already exists."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "You have no dead tracks in your iTunes Library"
 
@@ -835,36 +820,108 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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/core.po

@@ -2,27 +2,27 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr "ne peut effacer, déplacer ou copier que  10 doublons à la fois"
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
 msgstr ""
-"Vous ne pouvez pas effacer, déplacer ou copier plus de 10 doublons à la "
-"fois en mode démo."
+"Vous ne pouvez pas effacer, déplacer ou copier plus de 10 doublons à la fois"
+" en mode démo."
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Collecte des fichiers à scanner"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Les dossiers sélectionnés ne contiennent pas de fichiers valides."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d hors-groupe)"
 
@@ -98,15 +98,15 @@ msgstr "Prioritization des groupes"
 msgid "Analyzed %d/%d pictures"
 msgstr "Analyzé %d/%d images"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "%d/%d blocs d'images comparés"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Préparation pour la comparaison"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "Vérifié %d/%d paires"
 
@@ -114,32 +114,32 @@ msgstr "Vérifié %d/%d paires"
 msgid "Read EXIF of %d/%d pictures"
 msgstr ""
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr "Aucun doublon marqué. Rien à faire."
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr "Aucun doublon sélectionné. Rien à faire."
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Aucun doublon trouvé."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr "Tous les fichiers marqués ont été copiés correctement."
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr "Tous les fichiers marqués ont été déplacés correctement."
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr ""
 "Tous les fichiers marqués ont été correctement envoyés à la corbeille."
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -151,34 +151,27 @@ msgstr ""
 "Voulez-vous vider la liste de fichiers ignorés des %d items qu'elle "
 "contient?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 "Vous n'avez pas de commande personnalisée. Ajoutez-la dans vos préférences."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "%d fichiers seront retirés des résultats. Continuer?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr "copier"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr "déplacer"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr "Sélectionnez un dossier vers lequel {} les fichiers marqués."
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
-msgstr ""
-"%d fichiers seront envoyés à la corbeille (puis 'hardlinkés'). Continuer?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "%d fichiers seront envoyés à la corbeille. Continuer?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
+msgstr "Vous envoyez {} fichier(s) à la corbeille."

locale/fr/LC_MESSAGES/ui.po

@@ -2,55 +2,55 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Scan de doublons en cours"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Chargement en cours"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Déplacement en cours"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Copie en cours"
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "Envoi de fichiers à la corbeille"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "Quitter"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr "Préférences"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "Aide dupeGuru"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "À propos de dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr "Enregistrer dupeGuru"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "Vérifier les mises à jour"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr "Ouvrir logs de déboguage"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -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:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "Résultats dupeGuru (*.dupeguru)"
 
@@ -266,135 +266,127 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr "Révéler Fichier"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Fermer"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Remplacer marqués par des hardlinks"
-
-#: qt/base/result_window.py:53 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 "Déplacer marqués vers..."
 
-#: qt/base/result_window.py:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Re-prioriser les résultats"
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: 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:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Exporter vers HTML"
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Marquer"
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (Résultats)"
 
-#: qt/base/result_window.py:300 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"
 
@@ -507,16 +499,16 @@ msgstr "EXIF Timestamp"
 msgid "Match pictures of different dimensions"
 msgstr "Comparer les images de tailles différentes"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Vider la cache d'images"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr "Voulez-vous vraiment vider la cache de vos analyses précédentes?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "La cache des analyses précédentes a été vidée."
 
@@ -549,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"
@@ -605,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"
@@ -663,6 +646,8 @@ msgstr "Re-prioriser les résultats"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Annuler"
@@ -701,7 +686,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Dossiers"
 
-#: qt/base/result_window.py:178 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."
 
@@ -800,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:154 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."
 
@@ -824,14 +809,14 @@ msgstr "'%@' n'existe pas."
 msgid "The name '%@' already exists."
 msgstr "Le nom '%@' existe déjà."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Votre librairie iTunes contient %d tracks mortes qui seront retirées. "
 "Continuer?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "Votre librairie iTunes ne contient aucune track morte."
 
@@ -847,36 +832,112 @@ msgstr "Non"
 msgid "OK"
 msgstr "OK"
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr "Liste de doublons ignorés"
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr "Effacer sélection"
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr "Vider"
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr "Options de suppression"
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+msgstr "Remplacer par des \"hardlinks\""
+
+#: 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 vers son "
+"fichier de référence."
+
+#: 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: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 option "
+"n'est généralement utilisée qu'en cas de problème."
+
+#: 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/core.po

@@ -13,12 +13,12 @@ msgstr ""
 "X-Poedit-Language: Armenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 "միաժամանակ հնարավոր է ջնջել, տեղափոխել կամ պատճենել միայն 10 օրինակներ"
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
@@ -26,15 +26,15 @@ msgstr ""
 "Չեք կարող ջնջել, տեղափձոխել կամ պատճենել ավելի քան 10 օրինակներ փորձնական "
 "եղանակում:"
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Հավաքվում են ֆայլեր՝ ստուգելու համար"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Ընտրված թղթապանակները պարունակում են չստուգվող ֆայլ:"
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d անպիտան)"
 
@@ -110,15 +110,15 @@ msgstr "Խմբի առաջնայնացում"
 msgid "Analyzed %d/%d pictures"
 msgstr "Ստուգվում է %d/%d նկարները"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "Կատարվում է %d/%d տվյալի համընկնում"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Նախապատրաստեցվում է համընկնումը"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "Ստուգում է %d/%d համընկնումները"
 
@@ -126,31 +126,31 @@ msgstr "Ստուգում է %d/%d համընկնումները"
 msgid "Read EXIF of %d/%d pictures"
 msgstr "Կարդալ EXIF-ը d/%d նկարներից"
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Կրկնօրինակներ չկան:"
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr "Բոլոր նշված ֆայլերը հաջողությամբ պատճենվել են:"
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr "Բոլոր նշված ֆայլերը հաջողությամբ տեղափոխվել են:"
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr "Բոլոր նշված ֆայլերը հաջողությամբ Ջնջվել են:"
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -161,32 +161,26 @@ msgstr ""
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr "Ցանկանու՞մ եք հեռացնել բոլոր %d ֆայլերը անտեսումների ցանկից:"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr "Դուք չեք կատարել Հրամանի ընտրություն: Կատարեք այն կարգավորումներում:"
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "Դուք պատրաստվում եք ջնջելու %d ֆայլեր: Շարունակե՞լ:"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr "պատճենել"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr "տեղափոխել"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr "Ընտրել թղթապանակ՝ {} նշված ֆայլերի համար"
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
-msgstr "Դուք ուղարկում եք %d ֆայլերը Աղբարկղ: Շարունակե՞լ:"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "%d ֆայլերը տեղափոխվելու են Աղբարկղ: Շարունակե՞լ:"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
+msgstr ""

locale/hy/LC_MESSAGES/ui.po

@@ -13,19 +13,19 @@ msgstr ""
 "X-Poedit-Language: Armenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Ստուգվում են կրկնօրինակները"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Բացվում է"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Տեղափոխվում է"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Պատճենվում է"
 
@@ -41,51 +41,51 @@ msgstr "Հեռացվում են վնասված շավիղները iTunes-ի Շտ
 msgid "Scanning the iTunes Library"
 msgstr "Ստուգվում է iTunes-ի Շտեմարանը"
 
-#: cocoa/inter/app_me.py:154 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 ծրագիրը չի գտնվել:"
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "Ֆայլերը ուղարկվում են Աղբարկղ"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "Փակել"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr "Կարգավորումներ"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "dupeGuru-ի Օգնությունը"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "dupeGuru-ի մասին"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr "Գրանցել dupeGuru-ն"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "Ստուգել թարմացումները"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr "Բացել Սխալների մատյանը"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -122,16 +122,16 @@ msgstr "Արդյունքի պատուհանը"
 msgid "Add Folder..."
 msgstr "Ավելացնել թղթապանակ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru-ի արդյունքները (*.dupeguru)"
 
@@ -299,135 +299,127 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr "Ցուցադրել ընտրվածը"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Փակել"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Ջնջել նշված և փոխարինված ըստ ձեռադրի"
-
-#: qt/base/result_window.py:53 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:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Վերաառաջնայնավորել արդյունքները..."
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Բացել ընտրվածը պարունակող թղթապանակը"
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Արտածել HTML-ով"
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Նշել"
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Արդյունքներ"
 
-#: qt/base/result_window.py:300 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 "Ընտրեք ֆայլը՝ պահպանելու արդյունքները՝"
 
@@ -540,16 +532,16 @@ msgstr "EXIF Timestamp"
 msgid "Match pictures of different dimensions"
 msgstr "Նկարների համընկնում տարբեր չափերով"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Մաքրել նկարի պահոցը"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr "Ցանկանու՞մ եք հեռացնել բոլոր պահված նկարները ստուգելուց:"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "Նկարի պահոցը մաքրվել է:"
 
@@ -594,21 +586,17 @@ msgstr "'%@'-ը գոյություն չունի:"
 msgid "The name '%@' already exists."
 msgstr "'%@' անունը արդեն առկա է:"
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Ձեր iTunes- Շտեմարանը պարունակում է %d մահացած շավիղներ, որոնք կարող են "
 "ջնջվել: Շարունակե՞լ:"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 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-ից"
@@ -673,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"
@@ -731,6 +714,8 @@ msgstr "Վերաառաջնայնավորել արդյունքները"
 msgid "Ok"
 msgstr "ԼԱՎ"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Չեղարկել"
@@ -759,7 +744,7 @@ msgstr "Գործողությունը"
 msgid "Directories"
 msgstr "Թղթապանակներ"
 
-#: qt/base/result_window.py:178 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Միայն կրկ."
 
@@ -846,36 +831,108 @@ msgstr "Ջնջել դատարկ թղթապանակները ջնջելուց կա
 msgid "dupeGuru PE Preferences"
 msgstr "dupeGuru PE կարգավորումները"
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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/core.po

@@ -2,25 +2,25 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
 msgstr ""
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Raccolta file da scansionare"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Le cartelle selezionate non contengono file da scansionare."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d scartati)"
 
@@ -97,15 +97,15 @@ msgstr "Applicazione delle priorità di gruppo"
 msgid "Analyzed %d/%d pictures"
 msgstr "Analizzate %d/%d immagini"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "Effettuate %d/%d comparazioni sui sottogruppi di immagini"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Preparazione per la comparazione"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "Verificate %d/%d somiglianze"
 
@@ -113,31 +113,31 @@ msgstr "Verificate %d/%d somiglianze"
 msgid "Read EXIF of %d/%d pictures"
 msgstr ""
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Non sono stati trovati dei duplicati."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr "Tutti i file marcati sono stati copiati correttamente."
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr "Tutti i file marcati sono stati spostati correttamente."
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr "Tutti i file marcati sono stati inviati nel cestino."
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -151,35 +151,28 @@ msgstr ""
 "Vuoi veramente rimuovere tutti i %d elementi dalla lista dei file da "
 "ignorare?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 "Non hai impostato nessun comando personalizzato. Impostalo nelle tue "
 "preferenze."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "Stai per rimuovere %d file dai risultati. Continuare?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr ""
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr ""
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr ""
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
 msgstr ""
-"Stai per inviare %d file nel cestino (compresi gli hardlink). Continuare?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "Stai per inviare %d file nel cestino. Continuare?"

locale/it/LC_MESSAGES/ui.po

@@ -2,19 +2,19 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Scansione per i duplicati"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Caricamento"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Spostamento"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Copia in corso"
 
@@ -30,51 +30,51 @@ 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:154 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."
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr ""
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr ""
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr ""
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "Aiuto di dupeGuru"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "Informazioni su dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr ""
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr ""
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr ""
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -111,16 +111,16 @@ msgstr "Finestra dei risultati"
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -292,135 +292,127 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr "Mostra i selezionati"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Chiudi"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Cancella gli elementi marcati e sostituiscili con degli Hardlinks"
-
-#: qt/base/result_window.py:53 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 "Sposta gli elementi marcati nel..."
 
-#: qt/base/result_window.py:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:300 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"
 
@@ -533,18 +525,18 @@ msgstr "Data e ora EXIF"
 msgid "Match pictures of different dimensions"
 msgstr "Includi immagini di dimensione differente"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Cancella la cache delle immagini"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr ""
 "Vuoi veramente rimuovere tutte le analisi delle immagini memorizzate nella "
 "cache?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr ""
 
@@ -577,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"
@@ -633,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"
@@ -691,6 +674,8 @@ msgstr "Cambia la priorità dei risultati"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Cancella"
@@ -729,7 +714,7 @@ msgstr "Azione"
 msgid "Directories"
 msgstr "Cartelle"
 
-#: qt/base/result_window.py:178 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"
 
@@ -829,14 +814,14 @@ msgstr "'%@' non esiste."
 msgid "The name '%@' already exists."
 msgstr "Il nome '%@' è già esistente."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "La tua libreria di iTunes contiene %d tracce inesistenti pronte per essere "
 "rimosse. Continuare?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "La tua libreria di iTunes non contiene tracce inesistenti"
 
@@ -852,36 +837,108 @@ msgstr "No"
 msgid "OK"
 msgstr ""
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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/core.po

@@ -12,12 +12,12 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 "сможете только для удаления, перемещения или копирования 10 копий сразу"
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
@@ -25,15 +25,15 @@ msgstr ""
 "Вы не можете удалять, перемещать или копировать более 10 дубликатов сразу в "
 "демонстрационном режиме."
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "Сбор файлов для сканирования"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "Выбранных директорий не содержат сканируемых файлов."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s. (%d отменено)"
 
@@ -109,15 +109,15 @@ msgstr "Делая группы приоритетов"
 msgid "Analyzed %d/%d pictures"
 msgstr "Анализируется %d/%d фотографии"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr "Исполняет %d/%d совпадениях кусоков"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "Подготовка для сравнения"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "Проверенные  %d/%d совпадениях"
 
@@ -125,31 +125,31 @@ msgstr "Проверенные  %d/%d совпадениях"
 msgid "Read EXIF of %d/%d pictures"
 msgstr "Прочитано EXIF %d/%d из фотографии"
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "Дубликаты не найдены."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr "Все выбранные файлы были скопированы успешно."
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr "Все выбранные файлы были перемещены успешно."
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr "Все выбранные файлы были успешно отправлены в корзину."
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -161,36 +161,28 @@ msgstr ""
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr "Вы действительно хотите удалить все элементы %d из черного списка?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr ""
 "У вас нет пользовательской команды создали. Установите его в ваших "
 "предпочтениях."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "Вы собираетесь удалить файлы %d из результата поиска. Продолжить?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr "копия"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr "перемещение"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr "Выберите каталог на {} отмеченные файлы"
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
 msgstr ""
-"Вы собираетесь отправить%d файлы в корзину (и жесткую них позже). "
-"Продолжить?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "Вы собираетесь отправить %d файлы в корзину. Продолжить?"

locale/ru/LC_MESSAGES/ui.po

@@ -12,19 +12,19 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "Проверка на наличие дубликатов"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "Загрузка"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Перемещение"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Копирование"
 
@@ -40,51 +40,51 @@ msgstr "Удаление мертвых треков из вашей библи
 msgid "Scanning the iTunes Library"
 msgstr "Сканирование ITunes библиотеки"
 
-#: cocoa/inter/app_me.py:154 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 приложение не может быть найдено."
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "Отправка файлов в корзину"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "Выход"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "Справка dupeGuru"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "О dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr "Регистрация dupeGuru"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "Проверить обновления"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr "Открыть журнал Debug"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -121,16 +121,16 @@ msgstr "Окно результатов"
 msgid "Add Folder..."
 msgstr "Добавить папку ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru результаты (*. dupeguru)"
 
@@ -302,135 +302,127 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr "Показать выбранное"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "Закрывать"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Удалить Помеченные и заменить с Жестким"
-
-#: qt/base/result_window.py:53 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:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "Изменить приоритеты Результатов ..."
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "Открыть содержащую папку выборных "
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Экспорт в HTML"
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "Отметить"
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Результаты"
 
-#: qt/base/result_window.py:300 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 "Выберите файл, чтобы сохранить ваши результаты"
 
@@ -543,16 +535,16 @@ msgstr "EXIF Timestamp"
 msgid "Match pictures of different dimensions"
 msgstr "Совпадения рисунков разных размеров"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "Очистить кэш фото"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr "Вы действительно хотите удалить все кэшированные анализ картины?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "Кэш-память изображений очищается."
 
@@ -597,21 +589,17 @@ msgstr "'%@' не существует."
 msgid "The name '%@' already exists."
 msgstr " Имя '%@' уже существует."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Ваш ITunes библиотека содержит %d мертвых треков готовы быть удалены. "
 "Продолжить?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 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"
@@ -676,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"
@@ -734,6 +717,8 @@ msgstr "Изменить приоритеты Результатов"
 msgid "Ok"
 msgstr "ОК"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Отменить"
@@ -762,7 +747,7 @@ msgstr "Действие"
 msgid "Directories"
 msgstr "Каталоги"
 
-#: qt/base/result_window.py:178 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
 msgstr "Только обманки"
 
@@ -849,36 +834,108 @@ msgstr "Удалить пустые папки после удаления и п
 msgid "dupeGuru PE Preferences"
 msgstr "dupeGuru PE предпочтения"
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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

@@ -2,19 +2,19 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr ""
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr ""
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr ""
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr ""
 
@@ -30,85 +30,137 @@ msgstr ""
 msgid "Scanning the iTunes Library"
 msgstr ""
 
-#: cocoa/inter/app_me.py:154 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_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 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 ""
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr ""
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr ""
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr ""
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr ""
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr ""
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr ""
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr ""
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
 msgstr ""
 
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+msgstr ""
+
+#: 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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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:52
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Proceed"
+msgstr ""
+
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+#: cocoa/base/en.lproj/PrioritizeDialog.strings:0
+msgid "Cancel"
+msgstr ""
+
 #: qt/base/details_table.py:16 cocoa/base/en.lproj/DetailsPanel.strings:0
 #: cocoa/pe/en.lproj/DetailsPanel.strings:0
 msgid "Attribute"
@@ -138,16 +190,16 @@ msgstr ""
 msgid "Add Folder..."
 msgstr ""
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr ""
@@ -191,7 +243,7 @@ msgstr ""
 msgid "All Files (*.*)"
 msgstr ""
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr ""
 
@@ -223,16 +275,22 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
 
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: cocoa/base/en.lproj/ProblemDialog.strings:0
+msgid "Close"
+msgstr ""
+
 #: qt/base/preferences_dialog.py:37
 msgid "Scan Type:"
 msgstr ""
@@ -320,143 +378,133 @@ msgstr ""
 msgid "Reveal Selected"
 msgstr ""
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
-#: cocoa/base/en.lproj/ProblemDialog.strings:0
-msgid "Close"
-msgstr ""
-
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-msgid "Send Marked to Recycle Bin"
+#: qt/base/result_window.py:48
+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 "Delete Marked and Replace with Hardlinks"
-msgstr ""
-
-#: qt/base/result_window.py:53 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:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr ""
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr ""
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr ""
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr ""
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr ""
 
-#: qt/base/result_window.py:178 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:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: qt/base/result_window.py:300 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 ""
 
@@ -569,16 +617,16 @@ msgstr ""
 msgid "Match pictures of different dimensions"
 msgstr ""
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr ""
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr ""
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr ""
 
@@ -624,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
@@ -635,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 ""
@@ -693,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
@@ -745,12 +797,17 @@ msgstr ""
 msgid "Re-Prioritize Results"
 msgstr ""
 
-#: cocoa/base/en.lproj/PrioritizeDialog.strings:0
-msgid "Ok"
+#: 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 "Cancel"
+msgid "Ok"
 msgstr ""
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0

locale/uk/LC_MESSAGES/columns.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Ukrainian\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Nickolas Pohilets <pohilets@gmail.com>\n"
 "Language-Team: Yuri  Petrashko <Petrashko@mail.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Повідомлення про помилку"
 #: core/prioritize.py:63 core_me/result_table.py:24 core_pe/result_table.py:21
 #: core_se/result_table.py:21
 msgid "Kind"
-msgstr "Вид"
+msgstr "Тип"
 
 #: core/prioritize.py:72 core_me/result_table.py:19 core_pe/result_table.py:19
 #: core_se/result_table.py:19
@@ -34,7 +34,7 @@ msgstr "Папка"
 #: core/prioritize.py:88 core_me/result_table.py:18 core_pe/result_table.py:18
 #: core_se/result_table.py:18
 msgid "Filename"
-msgstr "Файл"
+msgstr "Ім’я файлу"
 
 #: core/prioritize.py:132
 msgid "Size"
@@ -43,7 +43,7 @@ msgstr "Розмір"
 #: core/prioritize.py:138 core_me/result_table.py:25
 #: core_pe/result_table.py:23 core_se/result_table.py:22
 msgid "Modification"
-msgstr "Модифікація"
+msgstr "Дата модифікації"
 
 #: core_me/prioritize.py:16
 msgid "Duration"
@@ -75,7 +75,7 @@ msgstr "Назва"
 
 #: core_me/result_table.py:27
 msgid "Artist"
-msgstr "Назва художник"
+msgstr "Виконавець"
 
 #: core_me/result_table.py:28
 msgid "Album"
@@ -100,20 +100,20 @@ msgstr "Коментар"
 #: core_me/result_table.py:33 core_pe/result_table.py:24
 #: core_se/result_table.py:23
 msgid "Match %"
-msgstr "Збігатися %"
+msgstr "Збіг (%)"
 
 #: core_me/result_table.py:34 core_se/result_table.py:24
 msgid "Words Used"
-msgstr "Сслів, що використовуються"
+msgstr "Використані слова"
 
 #: core_me/result_table.py:35 core_pe/result_table.py:25
 #: core_se/result_table.py:25
 msgid "Dupe Count"
-msgstr "Dupe графа"
+msgstr "Кількість дублікатів"
 
 #: core_pe/prioritize.py:16 core_pe/result_table.py:22
 msgid "Dimensions"
-msgstr "Розміри"
+msgstr "Виміри"
 
 #: core_pe/result_table.py:20 core_se/result_table.py:20
 msgid "Size (KB)"

locale/uk/LC_MESSAGES/core.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Ukrainian\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Nickolas Pohilets <pohilets@gmail.com>\n"
 "Language-Team: YuriPetrashko <Petrashko@mail.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12,12 +12,11 @@ msgstr ""
 "X-Poedit-Country: UKRAINE\n"
 "X-Poedit-Language: Ukrainian\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
-msgstr ""
-"зможете тільки для видалення, переміщення або копіювання 10 копій відразу"
+msgstr "може видаляти, переміщувати або копіювати лише 10 копій відразу"
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
@@ -25,25 +24,25 @@ msgstr ""
 "Ви не можете видаляти, переміщати або копіювати більше 10 дублікатів відразу"
 " в демонстраційному режимі."
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
-msgstr "Збір файлів для сканування"
+msgstr "Збір файлів для пошуку"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
-msgstr "Вибраних директорій не містять сканованих файлів."
+msgstr "Обрані папки не містять файлів придатних для пошуку."
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
-msgstr "%s (%d відкидаються)"
+msgstr "%s (%d відкинуто)"
 
 #: core/engine.py:178 core/engine.py:215
 msgid "0 matches found"
-msgstr "0 зіставлень знайдено"
+msgstr "0 результатів знайдено"
 
 #: core/engine.py:196 core/engine.py:223
 msgid "%d matches found"
-msgstr "%d  знайдено"
+msgstr "%d результатів знайдено"
 
 #: core/engine.py:208 core/scanner.py:80
 msgid "Read size of %d/%d files"
@@ -51,7 +50,7 @@ msgstr "Прочитано розмір %d/%d файлів"
 
 #: core/engine.py:355
 msgid "Grouped %d/%d matches"
-msgstr "Угруповання %d/%d матчів"
+msgstr "Згруповано %d/%d результатів"
 
 #: core/prioritize.py:68
 msgid "None"
@@ -59,31 +58,35 @@ msgstr "Жоден"
 
 #: core/prioritize.py:94
 msgid "Ends with number"
-msgstr "Закінчується номер"
+msgstr "Закінчується номером"
 
 #: core/prioritize.py:96
 msgid "Doesn't end with number"
-msgstr "Не закінчується з номером"
+msgstr "Не закінчується номером"
 
 #: core/prioritize.py:117
+#, fuzzy
 msgid "Highest"
 msgstr "Найвищий"
 
 #: core/prioritize.py:117
+#, fuzzy
 msgid "Lowest"
-msgstr "Найнижча"
+msgstr "Найнижчий"
 
 #: core/prioritize.py:144
+#, fuzzy
 msgid "Newest"
-msgstr "Новітній"
+msgstr "Найновіший"
 
 #: core/prioritize.py:144
+#, fuzzy
 msgid "Oldest"
-msgstr "Найстарші"
+msgstr "Найстарший"
 
 #: core/results.py:113
 msgid "%d / %d (%s / %s) duplicates marked."
-msgstr "%d / %d (%s / %s) дублікати позначені."
+msgstr "%d / %d (%s / %s) дублікатів позначено."
 
 #: core/results.py:120
 msgid " filter: %s"
@@ -91,106 +94,96 @@ msgstr "фільтр: %s"
 
 #: core/scanner.py:100
 msgid "Read metadata of %d/%d files"
-msgstr "Прочитано метаданих %d/%d файли"
+msgstr "Прочитано метаданих з %d/%d файлів"
 
 #: core/scanner.py:131
 msgid "Removing false matches"
-msgstr "Видалення помилкових матчів"
+msgstr "Видалення помилкових результатів"
 
 #: core/scanner.py:149
 msgid "Processed %d/%d matches against the ignore list"
-msgstr "Опрацьовано %d/%d  матчів проти ігнор-лист"
+msgstr "Порівняно %d/%d результатів з чорним списком"
 
 #: core/scanner.py:171
 msgid "Doing group prioritization"
-msgstr "Роблячи групи пріоритетів"
+msgstr "Виконується пріорітизація груп"
 
 #: core_pe/matchblock.py:60
 msgid "Analyzed %d/%d pictures"
-msgstr "Аналізується %d/%d  фотографії"
+msgstr "Проаналізовано %d/%d фотографій"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
-msgstr "Виконує %d/%d  матчів шматок"
+msgstr "Виконано %d/%d порівнянь шматків"
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
-msgstr "Підготовка для порівняння"
+msgstr "Підготовка до порівняння"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
-msgstr "Перевірені %d/%d матчів"
+msgstr "Перевірено %d/%d результатів"
 
 #: core_pe/matchexif.py:21
 msgid "Read EXIF of %d/%d pictures"
-msgstr "Прочитано EXIF %d/%d фотографії"
+msgstr "Прочитано EXIF з %d/%d фотографій"
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
-msgstr ""
+msgstr "Немає позначених дублікатів - нічого робити."
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
-msgstr ""
+msgstr "Немає обраних дублікатів - нічого робити."
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
-msgstr "Ні дублікати знайдені."
+msgstr "Не знайдено жодного дублікату."
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
-msgstr "Всі вибрані файли були скопійовані успішно."
+msgstr "Усі позначені файли були скопійовані успішно."
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
-msgstr "Всі вибрані файли були переміщені успішно."
+msgstr "Усі позначені файли були переміщені успішно."
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
-msgstr "Всі вибрані файли були успішно відправлені в корзину."
+msgstr "Усі позначені файли були успішно відправлені до кошика."
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
 msgstr ""
-"Всі вибрані %d матчів будуть ігноруватися у всіх наступних перевірок. "
-"Продовжити?"
+"Усі обрані %d результатів будуть ігноруватися під час усіх наступних "
+"пошуків. Продовжити?"
 
 #: core/gui/ignore_list_dialog.py:24
 msgid "Do you really want to remove all %d items from the ignore list?"
-msgstr "Ви дійсно хочете видалити всі елементи %d з чорного списку?"
+msgstr "Ви дійсно хочете видалити всі %d елементів з чорного списку?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
-msgstr ""
-"У вас немає користувальницької команди створили. Встановіть його в ваші "
-"уподобання."
+msgstr "Власна команда не встановлена. Встановіть її у налаштуваннях."
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
-msgstr "Ви збираєтеся видалити файли %d результату пошуку. Продовжити?"
+msgstr "Ви збираєтеся видалити %d файлів з результату пошуку. Продовжити?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
-msgstr "копія"
+msgstr "копіювання"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
-msgstr "переміщати"
+msgstr "переміщення"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
-msgstr "Виберіть каталог на {} відмічені файли"
+msgstr "Оберіть цільову папку для {} позначених файлів"
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
 msgstr ""
-"Ви збираєтеся відправити %d файли до кошика (і жорстку них пізніше). "
-"Продовжити?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "Ви збираєтеся відправити %d файли в корзину. Продовжити?"

locale/uk/LC_MESSAGES/ui.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Ukrainian\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Nickolas Pohilets <pohilets@gmail.com>\n"
 "Language-Team: YuriPetrashko <Petrashko@mail.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12,85 +12,85 @@ msgstr ""
 "X-Poedit-Country: UKRAINE\n"
 "X-Poedit-Language: Ukrainian\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
-msgstr "Перевірка на наявність дублікатів"
+msgstr "Пошук дублікатів"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
-msgstr "Навантаження"
+msgstr "Завантаження"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "Переміщення"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "Копіювання"
 
 #: cocoa/inter/app.py:19
 msgid "Sending to Trash"
-msgstr "Отправка в корзину"
+msgstr "Відправка до кошику"
 
 #: cocoa/inter/app_me.py:33
 msgid "Removing dead tracks from your iTunes Library"
-msgstr "Видалення мертвих треки з вашої бібліотеки iTunes Library "
+msgstr "Видалення мертвих треків з вашої бібліотеки iTunes "
 
 #: cocoa/inter/app_me.py:34
 msgid "Scanning the iTunes Library"
-msgstr "Сканування ITunes Library"
+msgstr "Сканування бібліотеки iTunes"
 
-#: cocoa/inter/app_me.py:154 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 "Відправлення ошуканих в кошик"
+msgstr "Відправлення дублікатів до кошика"
 
-#: cocoa/inter/app_pe.py:146
+#: cocoa/inter/app_pe.py:188
 msgid "Talking to iPhoto. Don't touch it!"
-msgstr "У бесіді з iPhoto. Не чіпайте його!"
+msgstr "Виконується взаємодія з програмою iPhoto. Не чіпайте її!"
 
-#: cocoa/inter/app_pe.py:201
+#: cocoa/inter/app_pe.py:296
 msgid "The iPhoto application couldn't be found."
-msgstr "iPhoto програма не може бути знайдене."
+msgstr "Не вдалося знайти програму iPhoto."
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "Відправлення файлів до кошика"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "Вихід"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
-msgstr "Уподобання"
+msgstr "Налаштування"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
-msgstr "dupeGuru Довідка"
+msgstr "Довідка dupeGuru"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "Про dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
-msgstr "Реєстрація dupeGuru"
+msgstr "Зареєструвати dupeGuru"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "Перевірити оновлення"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
-msgstr "Відкрити журнал Debug"
+msgstr "Відкрити журнал налагодження"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
 msgstr ""
-"Попереднє дію до сих пір висить там. Ви не можете створити нову ще. "
-"Зачекайте кілька секунд, потім повторіть спробу."
+"Попередню дію ще не закінчено. Ви покищо не можете розпочаті нову. Зачекайте"
+" кілька секунд, потім повторіть спробу."
 
 #: qt/base/details_table.py:16 cocoa/base/en.lproj/DetailsPanel.strings:0
 #: cocoa/pe/en.lproj/DetailsPanel.strings:0
@@ -111,7 +111,7 @@ msgstr "Посилання"
 
 #: qt/base/directories_dialog.py:57 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Load Results..."
-msgstr "Результати навантаження ..."
+msgstr "Завантажити результати ..."
 
 #: qt/base/directories_dialog.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Results Window"
@@ -121,38 +121,38 @@ msgstr "Вікно результатів"
 msgid "Add Folder..."
 msgstr "Додати папку ..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: qt/base/directories_dialog.py:71 qt/base/result_window.py:85
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Help"
 msgstr "Допомога"
 
 #: qt/base/directories_dialog.py:73 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Load Recent Results"
-msgstr "Навантаження Останні результати"
+msgstr "Завантажити нещодавні результати"
 
 #: qt/base/directories_dialog.py:108
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
 msgid "Select folders to scan and press \"Scan\"."
-msgstr "Вибір папок для сканування і натисніть \"Scan\"."
+msgstr "Оберіть папки для пошуку і натисніть \"Шукати\"."
 
 #: qt/base/directories_dialog.py:132
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
 msgid "Load Results"
-msgstr "Навантаження Результати"
+msgstr "Завантажити результати"
 
 #: qt/base/directories_dialog.py:135
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
 msgid "Scan"
-msgstr "Сканування"
+msgstr "Шукати"
 
 #: qt/base/directories_dialog.py:179
 msgid "Unsaved results"
@@ -160,11 +160,11 @@ msgstr "Незбережені результати"
 
 #: qt/base/directories_dialog.py:180 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have unsaved results, do you really want to quit?"
-msgstr "Ви зробили якісь результати, ви дійсно хочете вийти?"
+msgstr "Ви маєте незбережені результати, ви дійсно хочете вийти?"
 
 #: qt/base/directories_dialog.py:188 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a folder to add to the scanning list"
-msgstr "Виберіть папку для додавання в список сканування"
+msgstr "Оберіть папку для додання в список пошуку"
 
 #: qt/base/directories_dialog.py:205 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Select a results file to load"
@@ -174,27 +174,27 @@ msgstr "Виберіть файл результатів для завантаж
 msgid "All Files (*.*)"
 msgstr "Всі файли (*.*)"
 
-#: qt/base/directories_dialog.py:206 qt/base/result_window.py:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
-msgstr "dupeGuru Результати (*.dupeguru) "
+msgstr "Результати dupeGuru (*.dupeguru) "
 
 #: qt/base/directories_dialog.py:217
 msgid "Start a new scan"
-msgstr "Почати нову перевірку"
+msgstr "Почати новий пошук"
 
 #: qt/base/directories_dialog.py:218 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have unsaved results, do you really want to continue?"
-msgstr "Ви зробили якісь результати, ви дійсно хочете продовжити?"
+msgstr "Ви маєте незбережені результати, ви дійсно хочете продовжити?"
 
 #: qt/base/directories_model.py:20
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
 msgid "Name"
-msgstr "ім'я"
+msgstr "Ім'я"
 
 #: qt/base/directories_model.py:20
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
 msgid "State"
-msgstr "Положення"
+msgstr "Стан"
 
 #: qt/base/directories_model.py:21
 #: cocoa/base/en.lproj/DirectoryPanel.strings:0
@@ -208,15 +208,15 @@ msgstr "Нормальний"
 
 #: qt/base/preferences_dialog.py:37
 msgid "Scan Type:"
-msgstr "Тип сканування:"
+msgstr "Тип пошуку:"
 
 #: qt/base/preferences_dialog.py:50
 msgid "Filter Hardness:"
-msgstr "Фільтри Твердість:"
+msgstr "Жорсткість фільтру:"
 
 #: qt/base/preferences_dialog.py:76
 msgid "More Results"
-msgstr "Додаткові результати"
+msgstr "Більше результатів"
 
 #: qt/base/preferences_dialog.py:81
 msgid "Fewer Results"
@@ -242,28 +242,28 @@ msgstr "Копіювання і переміщення:"
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Right in destination"
-msgstr "Прямо в ціль"
+msgstr "Прямо у цільову папку"
 
 #: qt/base/preferences_dialog.py:102 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Recreate relative path"
-msgstr "Повторне відносний шлях"
+msgstr "Відтворити відносний шлях"
 
 #: qt/base/preferences_dialog.py:103 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Recreate absolute path"
-msgstr "Повторне абсолютний шлях"
+msgstr "Відтворити абсолютний шлях"
 
 #: qt/base/preferences_dialog.py:106 cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Custom Command (arguments: %d for dupe, %r for ref):"
-msgstr "Спеціальної команди (аргументи: %d для обдурити,%r для посилань):"
+msgstr "Власна команда (аргументи: %d для дублікату, %r для посиланя):"
 
 #: qt/base/preferences_dialog.py:184
 msgid "dupeGuru has to restart for language changes to take effect."
-msgstr "dupeGuru необхідно перезапустити для мовного зміни вступили в силу."
+msgstr "dupeGuru необхідно перезапустити для застосування зміни мови."
 
 #: qt/base/prioritize_dialog.py:71
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
@@ -277,9 +277,10 @@ msgid ""
 " the best to these criteria to their respective group's reference position. "
 "Read the help file for more information."
 msgstr ""
-"Додати критерії в праве поле і натисніть кнопку ОК, щоб відправити ошуканих,"
-" які відповідають кращим для цих критеріїв до вихідної позиції відповідних "
-"груп. Прочитайте файл довідки для отримання додаткової інформації."
+"Додайте критерії в праве поле і натисніть кнопку ОК, щоб відправити "
+"дублікати, які найкраще відповідають цим критеріям, до вихідної позиції "
+"відповідних груп. Прочитайте файл довідки для отримання додаткової "
+"інформації."
 
 #: qt/base/problem_dialog.py:31 cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Problems!"
@@ -291,158 +292,151 @@ msgid ""
 "these problems are described in the table below. Those files were not "
 "removed from your results."
 msgstr ""
-"Були проблеми обробки деякі (або всі) файли. Причиною цих проблем описані в "
-"таблиці нижче. Ці файли не були видалені з результатів пошуку."
+"Виникли проблеми під час обробки деяких (або всіх) файлів. Причини цих "
+"проблем описані в таблиці нижче. Ці файли не були видалені з результатів "
+"пошуку."
 
 #: qt/base/problem_dialog.py:52 cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Reveal Selected"
-msgstr "Показати вибраного"
+msgstr "Показати вибрані"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
-msgstr "Закриття"
+msgstr "Закрити"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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 "Показати тільки ошукані"
+msgstr "Показати тільки дуплікати"
+
+#: qt/base/result_window.py:47 cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Show Delta Values"
+msgstr "Показати різницю"
+
+#: 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:50 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Show Delta Values"
-msgstr "Показати Дельта значення"
-
-#: qt/base/result_window.py:51
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "Видалити Помічені і заміна з Жорсткі"
+msgid "Copy Marked to..."
+msgstr "Скопіювати позначене до ..."
+
+#: 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:52
+msgid "Re-Prioritize Results..."
+msgstr "Змінити пріоритети результатів ..."
 
 #: qt/base/result_window.py:53 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Move Marked to..."
-msgstr "Переміщення Позначено в к ..."
+msgid "Remove Selected from Results"
+msgstr "Видалити обране з результатів"
 
 #: qt/base/result_window.py:54 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Copy Marked to..."
-msgstr "Скопіюйте Позначено в к ..."
+msgid "Add Selected to Ignore List"
+msgstr "Додати обране в чорний список"
 
 #: qt/base/result_window.py:55 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Remove Marked from Results"
-msgstr "Видалити Помічені від результатів"
+msgid "Make Selected Reference"
+msgstr "Зробити обране посиланням"
 
-#: qt/base/result_window.py:56
-msgid "Re-Prioritize Results..."
-msgstr "Змінити пріоритети Результати ..."
-
-#: qt/base/result_window.py:57 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 "Remove Selected from Results"
-msgstr "Видалити вибрані з результатів"
+msgid "Open Selected with Default Application"
+msgstr "Відкрити обране програмою за умовчанням"
+
+#: qt/base/result_window.py:57
+msgid "Open Containing Folder of Selected"
+msgstr "Відкрити папку, що містить обране"
 
 #: qt/base/result_window.py:58 cocoa/base/en.lproj/MainMenu.strings:0
 #: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Add Selected to Ignore List"
-msgstr "Додати обрані в чорний список"
+msgid "Rename Selected"
+msgstr "Перейменувати обране"
 
 #: qt/base/result_window.py:59 cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Make Selected Reference"
-msgstr "Зробити вибраної посилання"
+msgid "Mark All"
+msgstr "Позначити всі"
 
 #: qt/base/result_window.py:60 cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Open Selected with Default Application"
-msgstr "Відкрити вибраний з додатків за умовчанням"
+msgid "Mark None"
+msgstr "Скинути позначення"
 
-#: qt/base/result_window.py:61
-msgid "Open Containing Folder of Selected"
-msgstr "Відкрити містить папку вибіркових"
+#: qt/base/result_window.py:61 cocoa/base/en.lproj/MainMenu.strings:0
+msgid "Invert Marking"
+msgstr "Інвертувати позначення"
 
 #: qt/base/result_window.py:62 cocoa/base/en.lproj/MainMenu.strings:0
-#: cocoa/base/en.lproj/ResultWindow.strings:0
-msgid "Rename Selected"
-msgstr "Перейменувати вибраного"
-
-#: qt/base/result_window.py:63 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Mark All"
-msgstr "Відзначити всі"
-
-#: qt/base/result_window.py:64 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Mark None"
-msgstr "Ні Марк"
-
-#: qt/base/result_window.py:65 cocoa/base/en.lproj/MainMenu.strings:0
-msgid "Invert Marking"
-msgstr "Звернути Маркування"
-
-#: qt/base/result_window.py:66 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Mark Selected"
-msgstr "Марк Обраний"
+msgstr "Позначити обране"
 
-#: qt/base/result_window.py:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "Експорт в HTML"
 
-#: qt/base/result_window.py:68 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:69 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 "Викликати спеціальної команди"
+msgstr "Викликати власну команду"
 
-#: qt/base/result_window.py:84
+#: qt/base/result_window.py:77
 msgid "Mark"
-msgstr "Марк"
+msgstr "Позначити"
 
-#: qt/base/result_window.py:88 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/result_window.py:81 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Columns"
-msgstr "Колони"
+msgstr "Колонки"
 
-#: qt/base/result_window.py:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} Результати"
 
-#: qt/base/result_window.py:300 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 "Виберіть файл, щоб зберегти ваші результати"
+msgstr "Оберіть файл у який слід зберегти ваші результати"
 
 #: qt/me/preferences_dialog.py:39 qt/se/preferences_dialog.py:39
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "Filename"
-msgstr "Файл"
+msgstr "Ім’я файлу"
 
 #: qt/me/preferences_dialog.py:40 cocoa/me/en.lproj/Preferences.strings:0
 msgid "Filename - Fields"
-msgstr "Файл - Поля"
+msgstr "Ім’я файлу розбите на поля"
 
 #: qt/me/preferences_dialog.py:41 cocoa/me/en.lproj/Preferences.strings:0
 msgid "Filename - Fields (No Order)"
-msgstr "Файл - Поля (нема наказу)"
+msgstr "Ім’я файлу розбите на поля (У довільному порядку)"
 
 #: qt/me/preferences_dialog.py:42 cocoa/me/en.lproj/Preferences.strings:0
 msgid "Tags"
@@ -455,11 +449,11 @@ msgstr "Зміст"
 
 #: qt/me/preferences_dialog.py:44
 msgid "Audio Contents"
-msgstr "Аудіо Зміст"
+msgstr "Аудіо зміст"
 
 #: qt/me/preferences_dialog.py:55 cocoa/me/en.lproj/Preferences.strings:0
 msgid "Tags to scan:"
-msgstr "Теги для перевірки:"
+msgstr "Теги для пошуку:"
 
 #: qt/me/preferences_dialog.py:61 cocoa/me/en.lproj/Preferences.strings:0
 msgid "Track"
@@ -489,68 +483,68 @@ msgstr "Рік"
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "Word weighting"
-msgstr "Слово зважування"
+msgstr "Порівнювати за словами"
 
 #: qt/me/preferences_dialog.py:77 qt/se/preferences_dialog.py:51
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "Match similar words"
-msgstr "Матч схожі слова"
+msgstr "Вважати схожі слова однаковими"
 
 #: qt/me/preferences_dialog.py:79 qt/pe/preferences_dialog.py:41
 #: qt/se/preferences_dialog.py:53 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Can mix file kind"
-msgstr "Можна змішувати файл роду"
+msgstr "Можна змішувати типи файлів"
 
 #: qt/me/preferences_dialog.py:81 qt/pe/preferences_dialog.py:43
 #: qt/se/preferences_dialog.py:55 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Use regular expressions when filtering"
-msgstr "Використання регулярних виразів при фільтрації"
+msgstr "Використовувати регулярних виразів при фільтрації"
 
 #: qt/me/preferences_dialog.py:83 qt/pe/preferences_dialog.py:45
 #: qt/se/preferences_dialog.py:57 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Remove empty folders on delete or move"
-msgstr "Видалити порожні папки на видаляти або переміщати"
+msgstr "Видалити порожні папки під час видалення чи переміщення"
 
 #: qt/me/preferences_dialog.py:85 qt/pe/preferences_dialog.py:47
 #: qt/se/preferences_dialog.py:76 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Ignore duplicates hardlinking to the same file"
-msgstr "Ігнорувати дублікати hardlinking в той же файл"
+msgstr "Ігнорувати дублікати, що є жорсткими посиланнями на той самий файл"
 
 #: qt/me/preferences_dialog.py:87 qt/pe/preferences_dialog.py:49
 #: qt/se/preferences_dialog.py:78 cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Debug mode (restart required)"
-msgstr "Режим налагодження (потрібно перезапуск)"
+msgstr "Режим налагодження (потрібен перезапуск)"
 
 #: qt/pe/preferences_dialog.py:34 cocoa/pe/en.lproj/Preferences.strings:0
 msgid "EXIF Timestamp"
-msgstr "EXIF Timestamp"
+msgstr "Часова мітка EXIF"
 
 #: qt/pe/preferences_dialog.py:39 cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Match pictures of different dimensions"
-msgstr "Матч малюнки різних розмірів"
+msgstr "Порівнювати малюнки різних розмірів"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
-msgstr "Очистити кеш фото"
+msgstr "Очистити кеш зображень"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
-msgstr "Ви дійсно хочете видалити всі кешовані аналіз картини?"
+msgstr "Ви дійсно хочете видалити всі кешовані результати аналізу зображень?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
-msgstr "Кеш-пам'ять зображень очищається."
+msgstr "Кеш зображень очищено."
 
 #: qt/se/preferences_dialog.py:41 cocoa/se/en.lproj/Preferences.strings:0
 msgid "Folders"
@@ -558,7 +552,7 @@ msgstr "Папки"
 
 #: qt/se/preferences_dialog.py:60
 msgid "Ignore files smaller than"
-msgstr "Ігнорувати файли менше, ніж"
+msgstr "Ігнорувати файли менші ніж"
 
 #: qt/se/preferences_dialog.py:71 cocoa/se/en.lproj/Preferences.strings:0
 msgid "KB"
@@ -567,7 +561,7 @@ msgstr "КБ"
 #: cocoa/base/en.lproj/DetailsPanel.strings:0
 #: cocoa/pe/en.lproj/DetailsPanel.strings:0
 msgid "Details of Selected File"
-msgstr "Інформація про вибрану"
+msgstr "Інформація про обраний файл"
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Add New Folder..."
@@ -583,7 +577,7 @@ msgstr "Відновити налаштування за замовчуванн
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "'%@' already is in the list."
-msgstr "'%@' Вже є в списку."
+msgstr "'%@' вже є в списку."
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "'%@' does not exist."
@@ -591,38 +585,34 @@ msgstr "'%@' не існує."
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "The name '%@' already exists."
-msgstr "'%@' Іменем вже існує."
+msgstr "Ім’я '%@' вже існує."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
-"Ваш  iTunes Library  містить %d мертвих треків готові бути видалені. "
+"Ваша бібліотека iTunes містить %d мертвих треків, які готові до видалення. "
 "Продовжити?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
-msgstr "У вас немає мертвих треки у вашій iTunes Library"
-
-#: cocoa/base/en.lproj/Localizable.strings:0
-msgid "Add iTunes Directory"
-msgstr "Додати iTunes каталозі"
+msgstr "У вашій бібліотеці iTunes немає мертвих треків "
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Remove Dead Tracks in iTunes"
-msgstr "Видалити Мертвого треків в iTunes"
+msgstr "Видалити мертві треки в iTunes"
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Add iPhoto Library"
-msgstr "Додати Iphoto бібліотека"
+msgstr "Додати бібліотеку iPhoto"
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Yes"
-msgstr "Та"
+msgstr "Так"
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "No"
-msgstr "Немає"
+msgstr "Ні"
 
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "OK"
@@ -630,7 +620,7 @@ msgstr "ОК"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Bring All to Front"
-msgstr "Принесіть все для фронту"
+msgstr "Всі на передній план"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Window"
@@ -646,7 +636,7 @@ msgstr "Приховати dupeGuru"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Quit dupeGuru"
-msgstr "Вихід dupeGuru"
+msgstr "Вийти з dupeGuru"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Hide Others"
@@ -654,7 +644,7 @@ msgstr "Сховати інші"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Show All"
-msgstr "Показати всіх"
+msgstr "Показати всі"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Zoom"
@@ -662,21 +652,16 @@ msgstr "Збільшити"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Details Panel"
-msgstr "Детальніше групи"
+msgstr "Панель інформації"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Preferences..."
-msgstr "Установки ..."
+msgstr "Налаштування ..."
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 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"
@@ -688,7 +673,7 @@ msgstr "Закрити вікно"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Start Duplicate Scan"
-msgstr "Початок Дублюйте сканування"
+msgstr "Почати пошук дублікатів"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Export Results to XHTML"
@@ -712,15 +697,15 @@ msgstr "Вирізати"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Copy"
-msgstr "Копія"
+msgstr "Копіювати"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Paste"
-msgstr "Паста"
+msgstr "Вставити"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Website"
-msgstr "dupeGuru сайту"
+msgstr "Веб-сайт dupeGuru"
 
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Re-Prioritize Results"
@@ -730,13 +715,15 @@ msgstr "Змінити пріоритети Результати"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Скасувати"
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "dupeGuru Results"
-msgstr "dupeGuru Результати"
+msgstr "Результати dupeGuru"
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Marked: 0 files, 0 B. Total: 0 files, 0 B."
@@ -756,15 +743,15 @@ msgstr "Дія"
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Directories"
-msgstr "Каталоги"
+msgstr "Папки"
 
-#: qt/base/result_window.py:178 cocoa/base/en.lproj/ResultWindow.strings:0
+#: qt/base/result_window.py:169 cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Dupes Only"
-msgstr "Тільки ошукані"
+msgstr "Тільки дублікати"
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Delta"
-msgstr "Дельта"
+msgstr "Різниця"
 
 #: cocoa/base/en.lproj/ResultWindow.strings:0
 msgid "Menu"
@@ -772,13 +759,13 @@ msgstr "Меню"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 msgid "dupeGuru Preferences"
-msgstr "dupeGuru переваги"
+msgstr "Налаштування dupeGuru"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "More results"
-msgstr "Інші результати"
+msgstr "Більше результатів"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
@@ -790,13 +777,13 @@ msgstr "Менше результатів"
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Filter hardness:"
-msgstr "Фільтри твердість:"
+msgstr "Жорсткість фільтру:"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Scan type:"
-msgstr "Тип сканування:"
+msgstr "Тип пошуку:"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
@@ -811,31 +798,31 @@ msgstr "Автоматично перевіряти наявність онов
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 msgid "Ignore files smaller than:"
-msgstr "Ігнорувати файли менше, ніж:"
+msgstr "Ігнорувати файли менші ніж:"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Basic"
-msgstr "Основний"
+msgstr "Основні"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 #: cocoa/me/en.lproj/Preferences.strings:0
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "Advanced"
-msgstr "Передовий"
+msgstr "Розширені"
 
 #: cocoa/se/en.lproj/Preferences.strings:0
 msgid "Custom command (arguments: %d for dupe, %r for ref):"
-msgstr "Користувальницькі команди (аргументи: %d для обдурити,%r при роботі):"
+msgstr "Власна комада (аргументи: %d для дублікату, %r для посилання):"
 
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "dupeGuru ME Preferences"
-msgstr "dupeGuru ME переваги"
+msgstr "Налаштування dupeGuru ME"
 
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "Audio Content"
-msgstr "Аудіо-контенту"
+msgstr "Аудіо-контент"
 
 #: cocoa/me/en.lproj/Preferences.strings:0
 msgid "Remove empty folders after delete and move"
@@ -843,38 +830,110 @@ msgstr "Видалити порожні папки після видалення
 
 #: cocoa/pe/en.lproj/Preferences.strings:0
 msgid "dupeGuru PE Preferences"
-msgstr "dupeGuru PE переваги"
+msgstr "Налаштування dupeGuru PE"
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
-msgstr ""
+msgstr "Виконується взаємодія з програмою iTunes. Не чіпайте її!"
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
-msgstr ""
+msgstr "Не можливо знайти програму iTunes"
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
-msgstr ""
+msgstr "Різниця"
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
-msgstr ""
+msgstr "Виникла проблема зв'язку з iTunes. Операція не може бути завершена."
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
-msgstr ""
-
-#: qt/base/ignore_list_dialog.py:44
-#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
-msgid "Remove Selected"
-msgstr ""
+msgstr "Чорний список"
 
 #: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
+msgid "Remove Selected"
+msgstr "Видалити обрані"
+
+#: qt/base/ignore_list_dialog.py:46
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
+msgstr "Очистити"
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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/core.po

@@ -2,25 +2,25 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: core/app.py:94
+#: core/app.py:96
 msgid "will only be able to delete, move or copy 10 duplicates at once"
 msgstr ""
 
-#: core/app.py:231
+#: core/app.py:258
 msgid ""
 "You cannot delete, move or copy more than 10 duplicates at once in demo "
 "mode."
 msgstr ""
 
-#: core/app.py:501
+#: core/app.py:526
 msgid "Collecting files to scan"
 msgstr "收集文件以备扫描"
 
-#: core/app.py:512
+#: core/app.py:537
 msgid "The selected directories contain no scannable file."
 msgstr "所选文件夹中不包含可供扫描的文件。"
 
-#: core/app.py:551
+#: core/app.py:576
 msgid "%s (%d discarded)"
 msgstr "%s (%d 无效)"
 
@@ -96,15 +96,15 @@ msgstr "优化分组"
 msgid "Analyzed %d/%d pictures"
 msgstr "分析 %d/%d 图像"
 
-#: core_pe/matchblock.py:144
+#: core_pe/matchblock.py:152
 msgid "Performed %d/%d chunk matches"
 msgstr ""
 
-#: core_pe/matchblock.py:149
+#: core_pe/matchblock.py:157
 msgid "Preparing for matching"
 msgstr "准备进行匹配"
 
-#: core_pe/matchblock.py:184
+#: core_pe/matchblock.py:192
 msgid "Verified %d/%d matches"
 msgstr "验证 %d/%d 匹配项"
 
@@ -112,31 +112,31 @@ msgstr "验证 %d/%d 匹配项"
 msgid "Read EXIF of %d/%d pictures"
 msgstr ""
 
-#: core/app.py:36
+#: core/app.py:38
 msgid "There are no marked duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:37
+#: core/app.py:39
 msgid "There are no selected duplicates. Nothing has been done."
 msgstr ""
 
-#: core/app.py:189
+#: core/app.py:216
 msgid "No duplicates found."
 msgstr "没有找到重复文件。"
 
-#: core/app.py:202
+#: core/app.py:229
 msgid "All marked files were copied sucessfully."
 msgstr ""
 
-#: core/app.py:203
+#: core/app.py:230
 msgid "All marked files were moved sucessfully."
 msgstr ""
 
-#: core/app.py:204
+#: core/app.py:231
 msgid "All marked files were sucessfully sent to Trash."
 msgstr ""
 
-#: core/app.py:252
+#: core/app.py:279
 msgid ""
 "All selected %d matches are going to be ignored in all subsequent scans. "
 "Continue?"
@@ -146,32 +146,26 @@ msgstr "目前已选的 %d 个匹配项将在后续的扫描中被忽略。继
 msgid "Do you really want to remove all %d items from the ignore list?"
 msgstr "确定要从忽略列表中移除 %d 项吗?"
 
-#: core/app.py:367
+#: core/app.py:392
 msgid "You have no custom command set up. Set it up in your preferences."
 msgstr "你没有设定自定义命令。请在首选项中进行设定。"
 
-#: core/app.py:454 core/app.py:465
+#: core/app.py:479 core/app.py:490
 msgid "You are about to remove %d files from results. Continue?"
 msgstr "你将从结果中移除 %d 个文件。继续吗?"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "copy"
 msgstr "复制"
 
-#: core/app.py:312
+#: core/app.py:339
 msgid "move"
 msgstr "移动"
 
-#: core/app.py:313
+#: core/app.py:340
 msgid "Select a directory to {} marked files to"
 msgstr "选择一个文件夹将标记的 {} 个文件进行..."
 
-#: core/app.py:327
-msgid ""
-"You are about to send %d files to Trash (and hardlink them afterwards). "
-"Continue?"
-msgstr "即将有 %d 个文件被移动垃圾桶并删除硬盘上的文件。继续吗?"
-
-#: core/app.py:329
-msgid "You are about to send %d files to Trash. Continue?"
-msgstr "即将有 %d 个文件被移到回收站。继续吗?"
+#: core/gui/deletion_options.py:20
+msgid "You are sending {} file(s) to the Trash."
+msgstr ""

locale/zh_CN/LC_MESSAGES/ui.po

@@ -2,55 +2,55 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#: cocoa/inter/app.py:15 qt/base/app.py:39
+#: cocoa/inter/app.py:15 qt/base/app.py:40
 msgid "Scanning for duplicates"
 msgstr "重复文件扫描中"
 
-#: cocoa/inter/app.py:16 qt/base/app.py:40
+#: cocoa/inter/app.py:16 qt/base/app.py:41
 msgid "Loading"
 msgstr "载入中"
 
-#: cocoa/inter/app.py:17 qt/base/app.py:41
+#: cocoa/inter/app.py:17 qt/base/app.py:42
 msgid "Moving"
 msgstr "移动中"
 
-#: cocoa/inter/app.py:18 qt/base/app.py:42
+#: cocoa/inter/app.py:18 qt/base/app.py:43
 msgid "Copying"
 msgstr "复制中"
 
-#: qt/base/app.py:43
+#: qt/base/app.py:44
 msgid "Sending files to the recycle bin"
 msgstr "将文件移到回收站"
 
-#: qt/base/app.py:110
+#: qt/base/app.py:112
 msgid "Quit"
 msgstr "退出"
 
-#: qt/base/app.py:111 qt/base/preferences_dialog.py:123
+#: qt/base/app.py:113 qt/base/preferences_dialog.py:123
 msgid "Preferences"
 msgstr "首选项"
 
-#: qt/base/app.py:113 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:115 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "dupeGuru Help"
 msgstr "dupeGuru帮助"
 
-#: qt/base/app.py:114 cocoa/base/en.lproj/MainMenu.strings:0
+#: qt/base/app.py:116 cocoa/base/en.lproj/MainMenu.strings:0
 msgid "About dupeGuru"
 msgstr "关于dupeGuru"
 
-#: qt/base/app.py:115
+#: qt/base/app.py:117
 msgid "Register dupeGuru"
 msgstr "注册dupeGuru"
 
-#: qt/base/app.py:116
+#: qt/base/app.py:118
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: qt/base/app.py:117
+#: qt/base/app.py:119
 msgid "Open Debug Log"
 msgstr "打开调试记录"
 
-#: qt/base/app.py:232 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/base/app.py:234 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "A previous action is still hanging in there. You can't start a new one yet. "
 "Wait a few seconds, then try again."
@@ -85,16 +85,16 @@ msgstr "结果窗口"
 msgid "Add Folder..."
 msgstr "增加文件夹..."
 
-#: qt/base/directories_dialog.py:67 qt/base/result_window.py:82
+#: 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:90
+#: 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:92
+#: 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:301
+#: qt/base/directories_dialog.py:206 qt/base/result_window.py:293
 msgid "dupeGuru Results (*.dupeguru)"
 msgstr "dupeGuru结果 (*.dupeguru)"
 
@@ -260,135 +260,127 @@ msgstr "在处理部分或全部文件时发现问题。产生问题的原因在
 msgid "Reveal Selected"
 msgstr "显示选择"
 
-#: qt/base/problem_dialog.py:57 cocoa/base/en.lproj/IgnoreListDialog.strings:0
+#: qt/base/ignore_list_dialog.py:47 qt/base/problem_dialog.py:57
+#: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/ProblemDialog.strings:0
 msgid "Close"
 msgstr "关闭"
 
-#: qt/base/result_window.py:47 qt/base/result_window.py:177
+#: 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:86
-#: qt/base/result_window.py:151 qt/base/result_window.py:176
+#: qt/base/result_window.py:45 qt/base/result_window.py:79
+#: 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
-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 "Delete Marked and Replace with Hardlinks"
-msgstr "删除标记文件并用硬连接进行替换"
-
-#: qt/base/result_window.py:53 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:54 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:55 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:56
+#: qt/base/result_window.py:52
 msgid "Re-Prioritize Results..."
 msgstr "从结果中移除所选的文件"
 
-#: qt/base/result_window.py:57 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:58 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:59 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:60 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:61
+#: qt/base/result_window.py:57
 msgid "Open Containing Folder of Selected"
 msgstr "打开所选文件所在的文件夹"
 
-#: qt/base/result_window.py:62 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:63 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:64 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:65 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:66 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:67
+#: qt/base/result_window.py:63
 msgid "Export To HTML"
 msgstr "导出为 HTML"
 
-#: qt/base/result_window.py:68 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:69 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:84
+#: qt/base/result_window.py:77
 msgid "Mark"
 msgstr "标记"
 
-#: qt/base/result_window.py:88 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:147 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:170
+#: qt/base/result_window.py:161
 msgid "{} Results"
 msgstr "{} (结果)"
 
-#: qt/base/result_window.py:300 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 "将结果保存为..."
 
@@ -501,16 +493,16 @@ msgstr "EXIF Timestamp"
 msgid "Match pictures of different dimensions"
 msgstr "匹配不同规格的图像"
 
-#: qt/pe/result_window.py:20 qt/pe/result_window.py:25
+#: qt/pe/result_window.py:19 qt/pe/result_window.py:24
 #: cocoa/base/en.lproj/Localizable.strings:0
 msgid "Clear Picture Cache"
 msgstr "清空图片缓存"
 
-#: qt/pe/result_window.py:26 cocoa/base/en.lproj/Localizable.strings:0
+#: qt/pe/result_window.py:25 cocoa/base/en.lproj/Localizable.strings:0
 msgid "Do you really want to remove all your cached picture analysis?"
 msgstr "确定要移除所有缓存图片?"
 
-#: qt/pe/result_window.py:29
+#: qt/pe/result_window.py:28
 msgid "Picture cache cleared."
 msgstr "图片缓存已清空。"
 
@@ -543,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"
@@ -599,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"
@@ -657,6 +640,8 @@ msgstr "Re-Prioritize Results"
 msgid "Ok"
 msgstr "Ok"
 
+#: qt/base/deletion_options.py:53
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
 #: cocoa/base/en.lproj/PrioritizeDialog.strings:0
 msgid "Cancel"
 msgstr "Cancel"
@@ -695,7 +680,7 @@ msgstr "Action"
 msgid "Directories"
 msgstr "Directories"
 
-#: qt/base/result_window.py:178 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"
 
@@ -794,15 +779,15 @@ msgstr "从你的iTunes库中移除无效的音轨"
 msgid "Scanning the iTunes Library"
 msgstr "正在扫描iTunes库"
 
-#: cocoa/inter/app_me.py:154 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."
 
@@ -818,13 +803,13 @@ msgstr "'%@' does not exist."
 msgid "The name '%@' already exists."
 msgstr "The name '%@' already exists."
 
-#: cocoa/inter/app_me.py:182 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:191 cocoa/base/en.lproj/Localizable.strings:0
 msgid ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 msgstr ""
 "Your iTunes Library contains %d dead tracks ready to be removed. Continue?"
 
-#: cocoa/inter/app_me.py:186 cocoa/base/en.lproj/Localizable.strings:0
+#: cocoa/inter/app_me.py:195 cocoa/base/en.lproj/Localizable.strings:0
 msgid "You have no dead tracks in your iTunes Library"
 msgstr "You have no dead tracks in your iTunes Library"
 
@@ -840,36 +825,108 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: cocoa/inter/app_me.py:156
+#: cocoa/inter/app_me.py:159
 msgid "Talking to iTunes. Don't touch it!"
 msgstr ""
 
-#: cocoa/inter/app_me.py:200
+#: cocoa/inter/app_me.py:213
 msgid "The iTunes application couldn't be found."
 msgstr ""
 
-#: qt/base/result_window.py:179
+#: qt/base/result_window.py:170
 msgid "Delta Values"
 msgstr ""
 
-#: cocoa/inter/app_me.py:176
+#: cocoa/inter/app_me.py:185
 msgid ""
 "There were communication problems with iTunes. The operation couldn't be "
 "completed."
 msgstr ""
 
-#: qt/base/app.py:112 qt/base/ignore_list_dialog.py:31
+#: qt/base/app.py:114 qt/base/ignore_list_dialog.py:32
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 #: cocoa/base/en.lproj/MainMenu.strings:0
 msgid "Ignore List"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:44
+#: qt/base/ignore_list_dialog.py:45
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Remove Selected"
 msgstr ""
 
-#: qt/base/ignore_list_dialog.py:45
+#: qt/base/ignore_list_dialog.py:46
 #: cocoa/base/en.lproj/IgnoreListDialog.strings:0
 msgid "Clear"
 msgstr ""
+
+#: qt/base/deletion_options.py:29
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Deletion Options"
+msgstr ""
+
+#: qt/base/deletion_options.py:34
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Hardlink deleted files"
+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:44
+#: cocoa/base/en.lproj/DeletionOptions.strings:0
+msgid "Directly delete files"
+msgstr ""
+
+#: 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: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 ""

package.py

@@ -6,23 +6,38 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-import sys
 import os
 import os.path as op
 import compileall
 import shutil
 import json
+from argparse import ArgumentParser
 
 from hscommon.plat import ISWINDOWS, ISLINUX
 from hscommon.build import (build_dmg, add_to_pythonpath, print_and_do, copy_packages,
     build_debian_changelog, copy_qt_plugins, get_module_version)
 
-def package_cocoa(edition):
+def parse_args():
+    parser = ArgumentParser()
+    parser.add_argument('--sign', dest='sign_identity',
+        help="Sign app under specified identity before packaging (OS X only)")
+    args = parser.parse_args()
+    return args
+
+def package_cocoa(edition, sign_identity):
     app_path = {
         'se': 'cocoa/se/dupeGuru.app',
         'me': 'cocoa/me/dupeGuru ME.app',
         'pe': 'cocoa/pe/dupeGuru PE.app',
     }[edition]
+    # Rather than signing our app in XCode during the build phase, we sign it during the package
+    # phase because running the app before packaging can modify it and we want to be sure to have
+    # a valid signature.
+    if sign_identity:
+        sign_identity = "Developer ID Application: {}".format(sign_identity)
+        print_and_do('codesign --force --sign "{}" "{}"'.format(sign_identity, app_path))
+    else:
+        print("WARNING: packaging an unsigned application")
     build_dmg(app_path, '.')
 
 def package_windows(edition, dev):
@@ -84,15 +99,6 @@ def package_debian(edition):
     if edition == 'me':
         packages.append('hsaudiotag')
     copy_packages(packages, srcpath)
-    import sip, PyQt4
-    shutil.copy(sip.__file__, srcpath)
-    qtsrcpath = op.dirname(PyQt4.__file__)
-    qtdestpath = op.join(srcpath, 'PyQt4')
-    os.makedirs(qtdestpath)
-    shutil.copy(op.join(qtsrcpath, '__init__.py'), qtdestpath)
-    shutil.copy(op.join(qtsrcpath, 'Qt.so'), qtdestpath)
-    shutil.copy(op.join(qtsrcpath, 'QtCore.so'), qtdestpath)
-    shutil.copy(op.join(qtsrcpath, 'QtGui.so'), qtdestpath)
     shutil.copytree(ed('debian_{0}'), op.join(destpath, 'debian'))
     changelogpath = op.join('help', ed('changelog_{}'))
     changelog_dest = op.join(destpath, 'debian', 'changelog')
@@ -107,13 +113,14 @@ def package_debian(edition):
     os.system("dpkg-buildpackage")
 
 def main():
+    args = parse_args()
     conf = json.load(open('conf.json'))
     edition = conf['edition']
     ui = conf['ui']
     dev = conf['dev']
     print("Packaging dupeGuru {0} with UI {1}".format(edition.upper(), ui))
     if ui == 'cocoa':
-        package_cocoa(edition)
+        package_cocoa(edition, args.sign_identity)
     elif ui == 'qt':
         if ISWINDOWS:
             package_windows(edition, dev)

qt/base/app.py

@@ -32,6 +32,7 @@ from .result_window import ResultWindow
 from .directories_dialog import DirectoriesDialog
 from .problem_dialog import ProblemDialog
 from .ignore_list_dialog import IgnoreListDialog
+from .deletion_options import DeletionOptions
 
 tr = trget('ui')
 
@@ -89,6 +90,7 @@ class DupeGuru(QObject):
         self.details_dialog = self.DETAILS_DIALOG_CLASS(self.resultWindow, self)
         self.problemDialog = ProblemDialog(parent=self.resultWindow, model=self.model.problem_dialog)
         self.ignoreListDialog = IgnoreListDialog(parent=self.resultWindow, model=self.model.ignore_list_dialog)
+        self.deletionOptions = DeletionOptions(parent=self.resultWindow, model=self.model.deletion_options)
         self.preferences_dialog = self.PREFERENCES_DIALOG_CLASS(self.resultWindow, self)
         self.about_box = AboutBox(self.resultWindow, self)
                 

qt/base/deletion_options.py

@@ -0,0 +1,67 @@
+# Created By: Virgil Dupras
+# Created On: 2012-05-30
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QDialog, QVBoxLayout, QLabel, QCheckBox, QDialogButtonBox
+
+from hscommon.plat import ISOSX, ISLINUX
+from hscommon.trans import trget
+
+tr = trget('ui')
+
+class DeletionOptions(QDialog):
+    def __init__(self, parent, model):
+        flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint
+        QDialog.__init__(self, parent, flags)
+        self._setupUi()
+        self.model = model
+        self.model.view = self
+        
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.rejected.connect(self.reject)
+    
+    def _setupUi(self):
+        self.setWindowTitle(tr("Deletion Options"))
+        self.resize(400, 250)
+        self.verticalLayout = QVBoxLayout(self)
+        self.msgLabel = QLabel()
+        self.verticalLayout.addWidget(self.msgLabel)
+        self.hardlinkCheckbox = QCheckBox(tr("Hardlink deleted files"))
+        if not (ISOSX or ISLINUX):
+            self.hardlinkCheckbox.setEnabled(False)
+            self.hardlinkCheckbox.setText(self.hardlinkCheckbox.text() + tr(" (Mac OS X or Linux only)"))
+        self.verticalLayout.addWidget(self.hardlinkCheckbox)
+        text = tr("After having deleted a duplicate, place a hardlink targeting the reference file "
+            "to replace the deleted file.")
+        self.hardlinkMessageLabel = QLabel(text)
+        self.hardlinkMessageLabel.setWordWrap(True)
+        self.verticalLayout.addWidget(self.hardlinkMessageLabel)
+        self.directCheckbox = QCheckBox(tr("Directly delete files"))
+        self.verticalLayout.addWidget(self.directCheckbox)
+        text = tr("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.")
+        self.directMessageLabel = QLabel(text)
+        self.directMessageLabel.setWordWrap(True)
+        self.verticalLayout.addWidget(self.directMessageLabel)
+        self.buttonBox = QDialogButtonBox()
+        self.buttonBox.addButton(tr("Proceed"), QDialogButtonBox.AcceptRole)
+        self.buttonBox.addButton(tr("Cancel"), QDialogButtonBox.RejectRole)
+        self.verticalLayout.addWidget(self.buttonBox)
+    
+    #--- model --> view
+    def update_msg(self, msg):
+        self.msgLabel.setText(msg)
+    
+    def show(self):
+        self.hardlinkCheckbox.setChecked(self.model.hardlink)
+        self.directCheckbox.setChecked(self.model.direct)
+        result = self.exec()
+        self.model.hardlink = self.hardlinkCheckbox.isChecked()
+        self.model.direct = self.directCheckbox.isChecked()
+        return result == QDialog.Accepted
+    

qt/base/result_window.py

@@ -7,13 +7,10 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from PyQt4.QtCore import Qt, QUrl, QRect
-from PyQt4.QtGui import (QMainWindow, QMenu, QLabel, QMessageBox, QInputDialog, QLineEdit,
-    QDesktopServices, QFileDialog, QMenuBar, QWidget, QVBoxLayout, QAbstractItemView, QStatusBar,
-    QDialog, QAction, QPushButton, QCheckBox)
+from PyQt4.QtGui import (QMainWindow, QMenu, QLabel, QDesktopServices, QFileDialog, QMenuBar,
+    QWidget, QVBoxLayout, QAbstractItemView, QStatusBar, QDialog, QAction, QPushButton, QCheckBox)
 
-from hscommon.plat import ISOSX, ISLINUX
 from hscommon.trans import trget
-from hscommon.util import nonone
 from qtlib.util import moveToScreenCenter, horizontalWrap, createActions
 from qtlib.search_edit import SearchEdit
 
@@ -48,8 +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),
-            ('actionHardlinkMarked', 'Ctrl+Shift+D', '', tr("Delete Marked and Replace with Hardlinks"), self.hardlinkTriggered),
+            ('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),
@@ -72,9 +68,6 @@ class ResultWindow(QMainWindow):
         self.actionDelta.setCheckable(True)
         self.actionPowerMarker.setCheckable(True)
         
-        if (not ISOSX) and (not ISLINUX):
-            self.actionHardlinkMarked.setVisible(False)
-    
     def _setupMenu(self):
         self.menubar = QMenuBar(self)
         self.menubar.setGeometry(QRect(0, 0, 630, 22))
@@ -93,7 +86,6 @@ class ResultWindow(QMainWindow):
         self.setMenuBar(self.menubar)
         
         self.menuActions.addAction(self.actionDeleteMarked)
-        self.menuActions.addAction(self.actionHardlinkMarked)
         self.menuActions.addAction(self.actionMoveMarked)
         self.menuActions.addAction(self.actionCopyMarked)
         self.menuActions.addAction(self.actionRemoveMarked)
@@ -150,7 +142,6 @@ class ResultWindow(QMainWindow):
         # Action menu
         actionMenu = QMenu(tr("Actions"), self.menubar)
         actionMenu.addAction(self.actionDeleteMarked)
-        actionMenu.addAction(self.actionHardlinkMarked)
         actionMenu.addAction(self.actionMoveMarked)
         actionMenu.addAction(self.actionCopyMarked)
         actionMenu.addAction(self.actionRemoveMarked)
@@ -245,9 +236,6 @@ class ResultWindow(QMainWindow):
         url = QUrl.fromLocalFile(exported_path)
         QDesktopServices.openUrl(url)
     
-    def hardlinkTriggered(self):
-        self.app.model.delete_marked(replace_with_hardlinks=True)
-    
     def makeReferenceTriggered(self):
         self.app.model.make_selected_reference()
     

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 */
-        pi = PyObject_CallMethod(sipptr, "__int__", NULL);
+        bits_capsule = PyObject_CallMethod(sipptr, "ascapsule", NULL);
         Py_DECREF(sipptr);
-        s = (char *)PyLong_AsLong(pi);
-        Py_DECREF(pi);
+        s = (char *)PyCapsule_GetPointer(bits_capsule, NULL);
+        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

qt/pe/result_window.py

@@ -6,7 +6,6 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import SIGNAL
 from PyQt4.QtGui import QMessageBox, QAction
 
 from hscommon.trans import trget
@@ -15,11 +14,11 @@ from ..base.result_window import ResultWindow as ResultWindowBase
 tr = trget('ui')
 
 class ResultWindow(ResultWindowBase):
-    def _setupUi(self):
-        ResultWindowBase._setupUi(self)
+    def _setupMenu(self):
+        ResultWindowBase._setupMenu(self)
         self.actionClearPictureCache = QAction(tr("Clear Picture Cache"), self)
-        self.menuFile.insertAction(self.actionClearIgnoreList, self.actionClearPictureCache)
-        self.connect(self.actionClearPictureCache, SIGNAL("triggered()"), self.clearPictureCacheTriggered)
+        self.menuFile.insertAction(self.actionSaveResults, self.actionClearPictureCache)
+        self.actionClearPictureCache.triggered.connect(self.clearPictureCacheTriggered)
     
     def clearPictureCacheTriggered(self):
         title = tr("Clear Picture Cache")

qt/se/installer.aip

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT type="Advanced Installer" CreateVersion="4.4.1" version="7.5.2" modules="professional" RootPath="." Language="en">
+<DOCUMENT Type="Advanced Installer" CreateVersion="4.4.1" version="8.0.2" Modules="professional" RootPath="." Language="en">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_FINDEXE_TITLE" Value="Select the installation package for [|ProductName]" ValueLocId="AI.Property.FindExeTitle"/>
     <ROW Property="AI_SHORTCUTSREG" Value="0|0|0|"/>
@@ -20,80 +20,34 @@
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{33E0D6C8-D7C6-46ED-B1A9-ECFE409EC9D5}"/>
-    <ROW Property="WindowsFamily9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows NT 4.0, Windows NT 4.0 Service Pack 1, Windows NT 4.0 Service Pack 2, Windows NT 4.0 Service Pack 3, Windows NT 4.0 Service Pack 4, Windows NT 4.0 Service Pack 5, Windows NT 4.0 Service Pack 6" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
     <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
     <ROW Directory="DesktopFolder" Directory_Parent="TARGETDIR" DefaultDir="Deskto~1|DesktopFolder" IsPseudoRoot="1"/>
     <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
     <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="accessible_DIR" Directory_Parent="qt4_plugins_DIR" DefaultDir="access~1|accessible"/>
-    <ROW Directory="codecs_DIR" Directory_Parent="qt4_plugins_DIR" DefaultDir="codecs"/>
-    <ROW Directory="iconengines_DIR" Directory_Parent="qt4_plugins_DIR" DefaultDir="iconen~1|iconengines"/>
-    <ROW Directory="imageformats_DIR" Directory_Parent="qt4_plugins_DIR" DefaultDir="imagef~1|imageformats"/>
-    <ROW Directory="qt4_plugins_DIR" Directory_Parent="APPDIR" DefaultDir="qt4_pl~1|qt4_plugins"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="AIShRegAnswer" ComponentId="{775090B3-2E56-40F5-9DD8-24A2F82DA601}" Directory_="APPDIR" Attributes="4" KeyPath="AIShRegAnswer"/>
     <ROW Component="AI_ExePath" ComponentId="{56EC90C1-F906-4F6E-95B2-1876CAA651C2}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
     <ROW Component="CurrentVersion" ComponentId="{398CD484-F093-4CEC-BE84-1BD0DD461942}" Directory_="APPDIR" Attributes="4" KeyPath="CurrentVersion"/>
-    <ROW Component="QtCore4.dll" ComponentId="{F517476C-BC6D-40B6-A063-5A10680ECA05}" Directory_="APPDIR" Attributes="0" KeyPath="QtCore4.dll"/>
-    <ROW Component="QtGui4.dll" ComponentId="{4915BAC4-AFB0-42E1-BF2E-D4C3E58D4BEE}" Directory_="APPDIR" Attributes="0" KeyPath="QtGui4.dll"/>
-    <ROW Component="bz2.pyd" ComponentId="{E03E8F51-0E8D-40A2-9ED0-A8EA0ED4CD19}" Directory_="APPDIR" Attributes="0" KeyPath="bz2.pyd" Type="0"/>
     <ROW Component="dupeGuru.exe" ComponentId="{A8FFC84F-B54B-4883-B9FD-5C545AF0E51C}" Directory_="APPDIR" Attributes="0" KeyPath="dupeGuru.exe"/>
-    <ROW Component="python26.dll" ComponentId="{C47E3AEB-FCE1-4A7D-90AF-26D52100756F}" Directory_="APPDIR" Attributes="0" KeyPath="python26.dll"/>
-    <ROW Component="qcncodecs4.dll" ComponentId="{1FA15E05-79B4-490E-8BE7-2915DAFECDA0}" Directory_="codecs_DIR" Attributes="0" KeyPath="qcncodecs4.dll"/>
-    <ROW Component="qgif4.dll" ComponentId="{12390BD7-63E5-4BAE-A760-84D6E47387F3}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qgif4.dll"/>
-    <ROW Component="qico4.dll" ComponentId="{7EC94828-5141-4383-BB9C-89C6AE543237}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qico4.dll"/>
-    <ROW Component="qjpcodecs4.dll" ComponentId="{A607689B-97DD-4F1F-9655-7EEC2D934A75}" Directory_="codecs_DIR" Attributes="0" KeyPath="qjpcodecs4.dll"/>
-    <ROW Component="qjpeg4.dll" ComponentId="{58EB6546-1E7D-48E3-A407-08B945D68317}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qjpeg4.dll"/>
-    <ROW Component="qkrcodecs4.dll" ComponentId="{3D322ADA-9D38-4B5F-8335-44BDE935D5D7}" Directory_="codecs_DIR" Attributes="0" KeyPath="qkrcodecs4.dll"/>
-    <ROW Component="qmng4.dll" ComponentId="{11B243B6-A6E5-4282-A58B-5A4F5A2CB253}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qmng4.dll"/>
-    <ROW Component="qsvg4.dll" ComponentId="{D689DDEB-D4E9-4DE0-B32B-85FD25C40726}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qsvg4.dll"/>
-    <ROW Component="qsvgicon4.dll" ComponentId="{6EF94FDD-3E92-4886-925F-B264C962E7EF}" Directory_="iconengines_DIR" Attributes="0" KeyPath="qsvgicon4.dll"/>
-    <ROW Component="qtaccessiblewidgets4.dll" ComponentId="{0DB9EE4C-922F-42AC-80CC-4EA3CBBB1629}" Directory_="accessible_DIR" Attributes="0" KeyPath="qtaccessiblewidgets4.dll"/>
-    <ROW Component="qtiff4.dll" ComponentId="{660F482B-9508-4A26-BC1A-610E84829CA4}" Directory_="imageformats_DIR" Attributes="0" KeyPath="qtiff4.dll"/>
-    <ROW Component="qtwcodecs4.dll" ComponentId="{68610953-B652-4340-BBB9-B1EEB3A6AF7A}" Directory_="codecs_DIR" Attributes="0" KeyPath="qtwcodecs4.dll"/>
     <ROW Component="updater.exe" ComponentId="{CB63C33D-EB1B-420A-8BAA-CD380923F12B}" Directory_="APPDIR" Attributes="0" KeyPath="updater.exe"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="updater.exe dupeGuru.exe AIShRegAnswer python26.dll QtCore4.dll QtGui4.dll bz2.pyd qtaccessiblewidgets4.dll qcncodecs4.dll qjpcodecs4.dll qkrcodecs4.dll qtwcodecs4.dll qsvgicon4.dll qgif4.dll qico4.dll qjpeg4.dll qmng4.dll qsvg4.dll qtiff4.dll AI_ExePath CurrentVersion"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="updater.exe dupeGuru.exe AIShRegAnswer AI_ExePath CurrentVersion"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="PyQt4.QtCore.pyd" Component_="bz2.pyd" FileName="PyQt4Q~1.pyd|PyQt4.QtCore.pyd" Attributes="0" SourcePath="dist\PyQt4.QtCore.pyd" SelfReg="false" Sequence="7"/>
-    <ROW File="PyQt4.QtGui.pyd" Component_="bz2.pyd" FileName="PyQt4Q~2.pyd|PyQt4.QtGui.pyd" Attributes="0" SourcePath="dist\PyQt4.QtGui.pyd" SelfReg="false" Sequence="8"/>
-    <ROW File="QtCore4.dll" Component_="QtCore4.dll" FileName="QtCore4.dll" Attributes="0" SourcePath="dist\QtCore4.dll" SelfReg="false" Sequence="4"/>
-    <ROW File="QtGui4.dll" Component_="QtGui4.dll" FileName="QtGui4.dll" Attributes="0" SourcePath="dist\QtGui4.dll" SelfReg="false" Sequence="5"/>
-    <ROW File="bz2.pyd" Component_="bz2.pyd" FileName="bz2.pyd" Attributes="0" SourcePath="dist\bz2.pyd" SelfReg="false" Sequence="6"/>
     <ROW File="dupeGuru.exe" Component_="dupeGuru.exe" FileName="dupeGuru.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="dist\dupeGuru.exe" SelfReg="false" Sequence="2"/>
-    <ROW File="dupeGuru.upx" Component_="bz2.pyd" FileName="dupeGuru.upx" Attributes="0" SourcePath="dist\dupeGuru.upx" SelfReg="false" Sequence="27"/>
-    <ROW File="hashlib.pyd" Component_="bz2.pyd" FileName="_hashlib.pyd" Attributes="0" SourcePath="dist\_hashlib.pyd" SelfReg="false" Sequence="24"/>
-    <ROW File="lxml.etree.pyd" Component_="bz2.pyd" FileName="lxmlet~1.pyd|lxml.etree.pyd" Attributes="0" SourcePath="dist\lxml.etree.pyd" SelfReg="false" Sequence="28"/>
-    <ROW File="python26.dll" Component_="python26.dll" FileName="python26.dll" Attributes="0" SourcePath="dist\python26.dll" SelfReg="false" Sequence="3"/>
-    <ROW File="qcncodecs4.dll" Component_="qcncodecs4.dll" FileName="qcncod~1.dll|qcncodecs4.dll" Attributes="0" SourcePath="dist\qt4_plugins\codecs\qcncodecs4.dll" SelfReg="false" Sequence="10"/>
-    <ROW File="qgif4.dll" Component_="qgif4.dll" FileName="qgif4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qgif4.dll" SelfReg="false" Sequence="15"/>
-    <ROW File="qico4.dll" Component_="qico4.dll" FileName="qico4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qico4.dll" SelfReg="false" Sequence="16"/>
-    <ROW File="qjpcodecs4.dll" Component_="qjpcodecs4.dll" FileName="qjpcod~1.dll|qjpcodecs4.dll" Attributes="0" SourcePath="dist\qt4_plugins\codecs\qjpcodecs4.dll" SelfReg="false" Sequence="11"/>
-    <ROW File="qjpeg4.dll" Component_="qjpeg4.dll" FileName="qjpeg4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qjpeg4.dll" SelfReg="false" Sequence="17"/>
-    <ROW File="qkrcodecs4.dll" Component_="qkrcodecs4.dll" FileName="qkrcod~1.dll|qkrcodecs4.dll" Attributes="0" SourcePath="dist\qt4_plugins\codecs\qkrcodecs4.dll" SelfReg="false" Sequence="12"/>
-    <ROW File="qmng4.dll" Component_="qmng4.dll" FileName="qmng4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qmng4.dll" SelfReg="false" Sequence="18"/>
-    <ROW File="qsvg4.dll" Component_="qsvg4.dll" FileName="qsvg4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qsvg4.dll" SelfReg="false" Sequence="19"/>
-    <ROW File="qsvgicon4.dll" Component_="qsvgicon4.dll" FileName="qsvgic~1.dll|qsvgicon4.dll" Attributes="0" SourcePath="dist\qt4_plugins\iconengines\qsvgicon4.dll" SelfReg="false" Sequence="14"/>
-    <ROW File="qtaccessiblewidgets4.dll" Component_="qtaccessiblewidgets4.dll" FileName="qtacce~2.dll|qtaccessiblewidgets4.dll" Attributes="0" SourcePath="dist\qt4_plugins\accessible\qtaccessiblewidgets4.dll" SelfReg="false" Sequence="9"/>
-    <ROW File="qtiff4.dll" Component_="qtiff4.dll" FileName="qtiff4.dll" Attributes="0" SourcePath="dist\qt4_plugins\imageformats\qtiff4.dll" SelfReg="false" Sequence="20"/>
-    <ROW File="qtwcodecs4.dll" Component_="qtwcodecs4.dll" FileName="qtwcod~1.dll|qtwcodecs4.dll" Attributes="0" SourcePath="dist\qt4_plugins\codecs\qtwcodecs4.dll" SelfReg="false" Sequence="13"/>
-    <ROW File="select.pyd" Component_="bz2.pyd" FileName="select.pyd" Attributes="0" SourcePath="dist\select.pyd" SelfReg="false" Sequence="21"/>
-    <ROW File="send2trash_win.pyd" Component_="bz2.pyd" FileName="_send2~1.pyd|_send2trash_win.pyd" Attributes="0" SourcePath="dist\_send2trash_win.pyd" SelfReg="false" Sequence="29"/>
-    <ROW File="sip.pyd" Component_="bz2.pyd" FileName="sip.pyd" Attributes="0" SourcePath="dist\sip.pyd" SelfReg="false" Sequence="22"/>
-    <ROW File="socket.pyd" Component_="bz2.pyd" FileName="_socket.pyd" Attributes="0" SourcePath="dist\_socket.pyd" SelfReg="false" Sequence="25"/>
-    <ROW File="ssl.pyd" Component_="bz2.pyd" FileName="_ssl.pyd" Attributes="0" SourcePath="dist\_ssl.pyd" SelfReg="false" Sequence="26"/>
-    <ROW File="unicodedata.pyd" Component_="bz2.pyd" FileName="unicod~1.pyd|unicodedata.pyd" Attributes="0" SourcePath="dist\unicodedata.pyd" SelfReg="false" Sequence="23"/>
-    <ROW File="updater.exe" Component_="updater.exe" FileName="updater.exe" Attributes="0" SourcePath="&lt;AI_HOME&gt;updater.exe" SelfReg="false" Sequence="1"/>
+    <ROW File="updater.exe" Component_="updater.exe" FileName="updater.exe" Attributes="0" SourcePath="&lt;AI_STUBS&gt;updater.exe" SelfReg="false" Sequence="1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageName="install\dupeguru_win_[|ProductVersion]" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" CreateMd5="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\install" ExtUI="true" ExeName="dupeguru_win_[|ProductVersion]"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="install" PackageFileName="dupeguru_win_[|ProductVersion]" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" CreateMd5="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\install" ExtUI="true" ExeName="dupeguru_win_[|ProductVersion]"/>
     <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
@@ -148,6 +102,14 @@
     <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="3"/>
     <ROW Dialog_="ShortcutsDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
     <ROW Dialog_="ShortcutsDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="301"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="197"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="201"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
@@ -205,8 +167,8 @@
     <ROW Action="AI_ResolveKnownFolders" Sequence="51"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
-    <ROW Condition="Version9X OR VersionNT64 OR (VersionNT &gt;= 500 )" Description="[ProductName] cannot be installed on systems earlier than [WindowsTypeNT]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsFamily9X]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &gt;= 1))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 1))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 2))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 3))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 4))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 5))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 6))) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
     <ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>

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