pe v2.0.0

--HG--
rename : help/en/changelog.rst => help/en/changelog.tmpl
rename : help/en/conf.py => help/en/conf.tmpl
rename : help/fr/changelog.rst => help/fr/changelog.tmpl
rename : help/fr/conf.py => help/fr/conf.tmpl

.hgignore

@@ -1,25 +1,23 @@
 syntax: glob
 
 .DS_Store
+run.py
 *.pyc
 *.so
 *.mode1v3
 *.pbxuser
 *.tm_build_errors
 *.pyd
-conf.yaml
+conf.json
 build
+dist
+install
+installer_tmp-cache
 cocoa/*/Info.plist
 cocoa/*/build
 cocoa/*/dg_cocoa.plugin
 qt/base/*_rc.py
-qt/base/*_ui.py
-qt/*/*_ui.py
-qt/*/build
-qt/*/dist
-qt/*/install
-qt/*/logdict*.log
-qt/*/warn*.txt
-help_se/dupeguru_help
-help_me/dupeguru_me_help
-help_pe/dupeguru_pe_help
+qt/lang/fr.qm
+qt/lang/en.qm
+help/*/conf.py
+help/*/changelog.rst

.hgtags

@@ -12,3 +12,33 @@ cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
 7b7c5a66ebee4e4b8125330d24fe9ce1a070ff25 se2.9.2
 1cef6d39855f85d4be728646bc78b860e6d4e398 pe1.8.3
 90ed56ee602666db2f267f73eac6f824347039b5 me5.7.2
+4c3cb1e671a333eabde1151c7c6ffb3609cab025 pe1.8.4
+0a71306434bca51bea9a5d5ae54fe1bf0e4900d8 pe1.8.5
+556baf4a410779e9bbf43129de133e4c4b26d679 pe1.8.6
+9149024283959a50fe9a47a5f175b905d1672c19 se2.10.0
+388a7e5aef6385e515189f4a15b4c4fed3ae2fcf me5.8.0
+27501167e3b9262ecb60c967941294f36d77eb25 pe1.9.0
+cb0a860430bacd712820bce426bcf47a4135efe1 se2.10.1
+cb0a860430bacd712820bce426bcf47a4135efe1 se2.10.1
+f71d405e62badcfdc1b037facaac043cece40ee5 se2.10.1
+3742e83edd9eadf44e1a501859f5e2462b1ef6fd me5.8.1
+724ff565dd785fb739774588c6ee652cfc0612d5 pe1.9.1
+634b66415c6529f46ae4f837318027cc9d70c3b5 before-py3k
+2b67955db2b0580a8b0854dc918b6ab0d1fa3b88 se2.11.0
+b56fe4dd8c95bca270b078a09e86848df77e2b2d me5.9.0
+618a7365457d56fdc6920c70843a244762e2ea00 pe1.10.0
+95b3a4b564c6222b414f2b40182dde2bd6d0e8a4 me5.9.1
+9735a5218d2b5b3b1e1dfe17f2f874177cf8f61c se2.11.1
+dbfee3ee2fa5cbb9e7ab36570659c17cd5b8561f se2.12.0
+d3fe0d0dcda1e0bf1100d02f117503d3bf6baacf me5.10.0
+b07ac1398703dd358912c1f3d20bd995633db9fe pe1.11.0
+96b6aee668398d663b04eafc8d5dae05e18500ee before-fairware
+22239f94589baf2a9fad2123045b8a718dbd68f5 se2.12.2
+f9cae82a0752191276b24ffb2cc4e4a8afb5d754 me5.10.2
+154c8cb6f018d446d88fa099490c900906e86386 pe1.11.2
+ca93352ce35184853ad9fcb881935a43a8b1e249 me5.10.3
+44f6ff67066c083f79daa18a9d2f1ab909e0a62e me5.10.4
+3f71a8f5bf8f6d0729748a27af9163e013723294 pe1.11.3
+0056293b0dade8b8230f68c1fe6f0c2d1e0b74d8 se2.12.3
+8d12cab3b12b723e3a86d02cf8002731a0f73f95 se3.0.0
+778876a8a9787658aa6adf6944b53aebcb7faeea se3.0.1

LICENSE

@@ -6,6 +6,5 @@ Redistribution and use in source and binary forms, with or without modification,
     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
     * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-    * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README

@@ -1,20 +1,20 @@
 Contents
 =====
 
-This package contains the source for dupeGuru. To learns how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
+This package contains the source for dupeGuru. To learn how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
 
 - core: Contains the core logic code for dupeGuru. It's Python code written in TDD style.
 - core_*: Edition-specific-cross-toolkit code written in Python.
 - cocoa: UI code for the Cocoa toolkit. It's Objective-C code.
-- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt. Before redistributing changes in this part of the code, read the "qt/WARNING" file.
+- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt.
 - images: Images used by the different UI codebases.
+- debian_*: Skeleton files required to create a .deb package
+- help: Help document, written for Sphinx.
 
 There are also other sub-folder that comes from external repositories (automatically checked out
-with svn:externals):
+with as mercurial subrepos):
 
-- hsutil: A collection of helpers used across HS applications.
-- hsdocgen: An ad-hoc document generation used across HS project (used for help files)
-- hsmedia: A library to read audio file metadata, used in dupeGuru ME.
+- hscommon: A collection of helpers used across HS applications.
 - cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
 - qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
@@ -26,26 +26,32 @@ Before being able to build dupeGuru, a few dependencies have to be installed:
 General dependencies
 -----
 
-- Python 2.6 (http://www.python.org)
-- Mako, to generate help files. (http://www.makotemplates.org/)
-- PyYaml, for help files and the build system. (http://pyyaml.org/)
-- Nose, to run unit tests. (http://somethingaboutorange.com/mrl/projects/nose/)
+- Python 3.1 (http://www.python.org)
+- Send2Trash3k (http://hg.hardcoded.net/send2trash)
+- hsaudiotag3k 1.1.0 (for ME) (http://hg.hardcoded.net/hsaudiotag)
+- jobprogress (http://hg.hardcoded.net/jobprogress)
+- Sphinx 1.0.6 (http://sphinx.pocoo.org/)
+- pytest 2.0.0, to run unit tests. (http://pytest.org/)
+
+Note: Sphinx doesn't officially support Python 3.x yet, but it doesn't matter because it is invoked
+by the build system through command line, so you can build dupeGuru even if Sphinx is installed in
+your Python 2.x install.
 
 OS X prerequisites
 -----
 
 - XCode 3.1 (http://developer.apple.com/TOOLS/xcode/)
 - Sparkle (http://sparkle.andymatuschak.org/)
-- PyObjC 2.2. (http://pyobjc.sourceforge.net/)
-- py2app (http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html)
+- PyObjC 2.3 (http://pyobjc.sourceforge.net/)
+- py2app 0.5.4 (http://bitbucket.org/ronaldoussoren/py2app)
+- appscript 0.22.0 for ME and PE (http://appscript.sourceforge.net/)
 
 Windows prerequisites
 ---
 
 - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
-- PyQt 4.6 (http://www.riverbankcomputing.co.uk/news)
-- Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
-- PyInstaller, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://www.pyinstaller.org/)
+- PyQt 4.7.5 (http://www.riverbankcomputing.co.uk/news)
+- cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
 - Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
 
 Building dupeGuru
@@ -65,8 +71,3 @@ Then, just build the thing and then run it with:
 If you want to create ready-to-upload package, run:
 
 	python package.py
-
-64-bit on OS X
----
-
-The "release" configuration of dupeGuru's XCode project build with archs "i386 x86_64 ppc". However there are currently problems with py2app and 64 bit. If you want to correctly build 64-bit apps, refer to http://www.hardcoded.net/articles/building-64-bit-pyobjc-applications-with-py2app.htm .

build.py

@@ -3,37 +3,46 @@
 # Created On: 2009-12-30
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
-import sys
 import os
 import os.path as op
+from optparse import OptionParser
 import shutil
+import json
 
 from setuptools import setup
-import yaml
+from distutils.extension import Extension
 
-from hsdocgen import generate_help, filters
-from hsutil.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages
+from hscommon import sphinxgen
+from hscommon.build import (add_to_pythonpath, print_and_do, copy_packages,
+    filereplace, get_module_version, build_all_cocoa_locs, build_all_qt_locs)
 
-def build_cocoa(edition, dev, help_destpath):
-    if not dev:
-        print "Building help index"
-        os.system('open -a /Developer/Applications/Utilities/Help\\ Indexer.app {0}'.format(help_destpath))
+def parse_args():
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    parser.add_option('--clean', action='store_true', dest='clean',
+        help="Clean build folder before building")
+    parser.add_option('--only-help', action='store_true', dest='only_help',
+        help="Build only help file")
+    (options, args) = parser.parse_args()
+    return options
+
+def build_cocoa(edition, dev):
+    build_all_cocoa_locs('cocoalib')
+    build_all_cocoa_locs(op.join('cocoa', 'base'))
+    build_all_cocoa_locs(op.join('cocoa', edition))
     
-    print "Building dg_cocoa.plugin"
-    if op.exists('build'):
-        shutil.rmtree('build')
-    os.mkdir('build')
+    print("Building dg_cocoa.plugin")
     if not dev:
         specific_packages = {
             'se': ['core_se'],
-            'me': ['core_me', 'hsmedia'],
+            'me': ['core_me'],
             'pe': ['core_pe'],
         }[edition]
-        copy_packages(['core', 'hsutil'] + specific_packages, 'build')
+        copy_packages(['core', 'hscommon'] + specific_packages, 'build')
     cocoa_project_path = 'cocoa/{0}'.format(edition)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
     os.chdir('build')
@@ -54,7 +63,10 @@ def build_cocoa(edition, dev, help_destpath):
         pthpath = op.join(pluginpath, 'Contents/Resources/dev.pth')
         open(pthpath, 'w').write(op.abspath('.'))
     os.chdir(cocoa_project_path)
-    print "Building the XCode project"
+    print('Generating Info.plist')
+    app_version = get_module_version('core_{}'.format(edition))
+    filereplace('InfoTemplate.plist', 'Info.plist', version=app_version)
+    print("Building the XCode project")
     args = []
     if dev:
         args.append('-configuration dev')
@@ -62,45 +74,105 @@ def build_cocoa(edition, dev, help_destpath):
         args.append('-configuration release')
     args = ' '.join(args)
     os.system('xcodebuild {0}'.format(args))
-    os.chdir('..')
+    os.chdir('../..')
+    print("Creating the run.py file")
+    subfolder = 'dev' if dev else 'release'
+    app_path = {
+        'se': 'cocoa/se/build/{0}/dupeGuru.app',
+        'me': 'cocoa/me/build/{0}/dupeGuru\\ ME.app',
+        'pe': 'cocoa/pe/build/{0}/dupeGuru\\ PE.app',
+    }[edition].format(subfolder)
+    tmpl = open('run_template_cocoa.py', 'rt').read()
+    run_contents = tmpl.replace('{{app_path}}', app_path)
+    open('run.py', 'wt').write(run_contents)
 
 def build_qt(edition, dev):
-    build_all_qt_ui(op.join('qtlib', 'ui'))
-    build_all_qt_ui(op.join('qt', 'base'))
-    build_all_qt_ui(op.join('qt', edition))
-    print_and_do("pyrcc4 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
-    if edition == 'pe':
-        os.chdir(op.join('qt', edition))
-        os.system('python gen.py')
-        os.chdir(op.join('..', '..'))
+    print("Building .ts files")
+    build_all_qt_locs(op.join('qt', 'lang'), extradirs=[op.join('qtlib', 'lang')])
+    print("Building Qt stuff")
+    print_and_do("pyrcc4 -py3 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
+    print("Creating the run.py file")
+    tmpl = open('run_template_qt.py', 'rt').read()
+    run_contents = tmpl.replace('{{edition}}', edition)
+    open('run.py', 'wt').write(run_contents)
 
-def main():
-    conf = yaml.load(open('conf.yaml'))
-    edition = conf['edition']
-    ui = conf['ui']
-    dev = conf['dev']
-    print "Building dupeGuru {0} with UI {1}".format(edition.upper(), ui)
-    if dev:
-        print "Building in Dev mode"
-    add_to_pythonpath('.')
-    print "Generating Help"
-    windows = sys.platform == 'win32'
-    tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
-    help_dir = 'help_{0}'.format(edition)
-    dest_dir = 'dupeguru_{0}_help'.format(edition) if edition != 'se' else 'dupeguru_help'
-    help_basepath = op.abspath(help_dir)
-    help_destpath = op.abspath(op.join(help_dir, dest_dir))
-    generate_help.main(help_basepath, help_destpath, force_render=not dev, tix=tix, windows=windows)
+def build_help(edition):
+    print("Generating Help")
+    current_path = op.abspath('.')
+    help_basepath = op.join(current_path, 'help', 'en')
+    help_destpath = op.join(current_path, 'build', 'help'.format(edition))
+    changelog_path = op.join(current_path, 'help', 'changelog_{}'.format(edition))
+    tixurl = "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}"
+    appname = {'se': 'dupeGuru', 'me': 'dupeGuru Music Edition', 'pe': 'dupeGuru Picture Edition'}[edition]
+    homepage = 'http://www.hardcoded.net/dupeguru{}/'.format('_' + edition if edition != 'se' else '')
+    confrepl = {'edition': edition, 'appname': appname, 'homepage': homepage}
+    sphinxgen.gen(help_basepath, help_destpath, changelog_path, tixurl, confrepl)
+
+def build_pe_modules(ui):
+    def move(src, dst):
+        if not op.exists(src):
+            return
+        if op.exists(dst):
+            os.remove(dst)
+        print('Moving %s --> %s' % (src, dst))
+        os.rename(src, dst)
     
-    print "Building dupeGuru"
+    print("Building PE Modules")
+    exts = [
+        Extension("_block", [op.join('core_pe', 'modules', 'block.c'), op.join('core_pe', 'modules', 'common.c')]),
+        Extension("_cache", [op.join('core_pe', 'modules', 'cache.c'), op.join('core_pe', 'modules', 'common.c')]),
+    ]
+    if ui == 'qt':
+        exts.append(Extension("_block_qt", [op.join('qt', 'pe', 'modules', 'block.c')]))
+    elif ui == 'cocoa':
+        exts.append(Extension(
+            "_block_osx", [op.join('core_pe', 'modules', 'block_osx.m'), op.join('core_pe', 'modules', 'common.c')],
+            extra_link_args=[
+                "-framework", "CoreFoundation",
+                "-framework", "Foundation",
+                "-framework", "ApplicationServices",]
+        ))
+    setup(
+        script_args = ['build_ext', '--inplace'],
+        ext_modules = exts,
+    )
+    move('_block.so', op.join('core_pe', '_block.so'))
+    move('_block.pyd', op.join('core_pe', '_block.pyd'))
+    move('_block_osx.so', op.join('core_pe', '_block_osx.so'))
+    move('_cache.so', op.join('core_pe', '_cache.so'))
+    move('_cache.pyd', op.join('core_pe', '_cache.pyd'))
+    move('_block_qt.so', op.join('qt', 'pe', '_block_qt.so'))
+    move('_block_qt.pyd', op.join('qt', 'pe', '_block_qt.pyd'))
+
+def build_normal(edition, ui, dev):
+    print("Building dupeGuru {0} with UI {1}".format(edition.upper(), ui))
+    add_to_pythonpath('.')
+    build_help(edition)
+    print("Building dupeGuru")
     if edition == 'pe':
-        os.chdir('core_pe')
-        os.system('python gen.py')
-        os.chdir('..')
+        build_pe_modules(ui)
     if ui == 'cocoa':
-        build_cocoa(edition, dev, help_destpath)
+        build_cocoa(edition, dev)
     elif ui == 'qt':
         build_qt(edition, dev)
 
+def main():
+    options = parse_args()
+    conf = json.load(open('conf.json'))
+    edition = conf['edition']
+    ui = conf['ui']
+    dev = conf['dev']
+    if dev:
+        print("Building in Dev mode")
+    if options.clean:
+        if op.exists('build'):
+            shutil.rmtree('build')
+    if not op.exists('build'):
+        os.mkdir('build')
+    if options.only_help:
+        build_help(edition)
+    else:
+        build_normal(edition, ui, dev)
+
 if __name__ == '__main__':
     main()

cocoa/base/AppDelegate.h

@@ -1,34 +1,55 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "PyDupeGuru.h"
 #import "ResultWindow.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "HSAboutBox.h"
+#import "HSRecentFiles.h"
 
 @interface AppDelegateBase : NSObject
 {
     IBOutlet PyDupeGuruBase *py;
-    IBOutlet RecentDirectories *recentDirectories;
-    IBOutlet NSMenuItem *unlockMenuItem;
-    IBOutlet ResultWindowBase *result;
+    IBOutlet NSMenu *recentResultsMenu;
+    IBOutlet NSMenu *actionsMenu;
+    IBOutlet NSMenu *columnsMenu;
     
+    ResultWindowBase *_resultWindow;
     DirectoryPanel *_directoryPanel;
     DetailsPanel *_detailsPanel;
-    BOOL _savedResults;
+    NSWindowController *_preferencesPanel;
+    HSAboutBox *_aboutBox;
+    HSRecentFiles *_recentResults;
 }
-- (IBAction)unlockApp:(id)sender;
 
+/* Virtual */
 - (PyDupeGuruBase *)py;
-- (RecentDirectories *)recentDirectories;
+- (ResultWindowBase *)createResultWindow;
+- (DirectoryPanel *)createDirectoryPanel;
+- (DetailsPanel *)createDetailsPanel;
+- (NSString *)homepageURL;
+
+/* Public */
+- (ResultWindowBase *)resultWindow;
 - (DirectoryPanel *)directoryPanel;
 - (DetailsPanel *)detailsPanel;
-- (void)saveResults;
+- (HSRecentFiles *)recentResults;
+- (NSMenu *)columnsMenu;
+
+/* Actions */
+- (IBAction)loadResults:(id)sender;
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)openHelp:(id)sender;
+- (IBAction)showAboutBox:(id)sender;
+- (IBAction)showDirectoryWindow:(id)sender;
+- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)showResultWindow:(id)sender;
+- (IBAction)startScanning:(id)sender;
 @end

cocoa/base/AppDelegate.m

@@ -1,58 +1,150 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
+#import "HSFairwareReminder.h"
 #import "Utils.h"
 #import "Consts.h"
+#import "Dialogs.h"
 #import <Sparkle/SUUpdater.h>
 
 @implementation AppDelegateBase
-- (IBAction)unlockApp:(id)sender
+- (void)awakeFromNib
 {
-    if ([[self py] isRegistered])
-        return;
-    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py]];
-    if ([ri enterCode] == NSOKButton)
-    {
-        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",[py appName]];
-        [unlockMenuItem setTitle:menuTitle];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    /* Because the pref pane is lazily loaded, we have to manually do the update check if the
+       preference is set.
+    */
+    if ([ud boolForKey:@"SUEnableAutomaticChecks"]) {
+        [[SUUpdater sharedUpdater] checkForUpdatesInBackground];
     }
-    [ri release];
+    _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
+    [_recentResults setDelegate:self];
+    _resultWindow = [self createResultWindow];
+    _directoryPanel = [self createDirectoryPanel];
+    _detailsPanel = nil; // Lazily loaded
+    _aboutBox = nil; // Lazily loaded
+    _preferencesPanel = nil; // Lazily loaded
+    [[[self directoryPanel] window] makeKeyAndOrderFront:self];
 }
 
+/* Virtual */
+
 - (PyDupeGuruBase *)py { return py; }
-- (RecentDirectories *)recentDirectories { return recentDirectories; }
+
+- (ResultWindowBase *)createResultWindow
+{
+    return nil; // must be overriden by all editions
+}
+
+- (DirectoryPanel *)createDirectoryPanel
+{
+    return [[DirectoryPanel alloc] initWithParentApp:self];
+}
+
+- (DetailsPanel *)createDetailsPanel
+{
+    return [[DetailsPanel alloc] initWithPy:py];
+}
+
+- (NSString *)homepageURL
+{
+    return @""; // must be overriden by all editions
+}
+
+/* Public */
+- (ResultWindowBase *)resultWindow
+{
+    return _resultWindow;
+}
+
 - (DirectoryPanel *)directoryPanel
 {
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
     return _directoryPanel;
 }
 
 - (DetailsPanel *)detailsPanel
 {
     if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+        _detailsPanel = [self createDetailsPanel];
     return _detailsPanel;
 }
 
-- (void)saveResults
+- (HSRecentFiles *)recentResults
 {
-    if (_savedResults) {
-        return;
-    }
-    [py saveIgnoreList];
-    [py saveResults];
-    _savedResults = YES;
+    return _recentResults;
 }
 
+- (NSMenu *)columnsMenu { return columnsMenu; }
+
+/* Actions */
+- (IBAction)loadResults:(id)sender
+{
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:YES];
+    [op setCanChooseDirectories:NO];
+    [op setCanCreateDirectories:NO];
+    [op setAllowsMultipleSelection:NO];
+    [op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
+    [op setTitle:TR(@"SelectResultToLoadMsg")];
+    if ([op runModal] == NSOKButton) {
+        NSString *filename = [[op filenames] objectAtIndex:0];
+        [py loadResultsFrom:filename];
+        [[self recentResults] addFile:filename];
+    }
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[self homepageURL]]];
+}
+
+- (IBAction)openHelp:(id)sender
+{
+    NSBundle *b = [NSBundle mainBundle];
+    NSString *p = [b pathForResource:@"index" ofType:@"html" inDirectory:@"help"];
+    NSURL *u = [NSURL fileURLWithPath:p];
+    [[NSWorkspace sharedWorkspace] openURL:u];
+}
+
+- (IBAction)showAboutBox:(id)sender
+{
+    if (_aboutBox == nil) {
+        _aboutBox = [[HSAboutBox alloc] initWithApp:py];
+    }
+    [[_aboutBox window] makeKeyAndOrderFront:sender];
+}
+
+- (IBAction)showDirectoryWindow:(id)sender
+{
+    [[[self directoryPanel] window] makeKeyAndOrderFront:nil];
+}
+
+- (IBAction)showPreferencesPanel:(id)sender
+{
+    if (_preferencesPanel == nil) {
+        _preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    }
+    [_preferencesPanel showWindow:sender];
+}
+
+- (IBAction)showResultWindow:(id)sender
+{
+    [[[self resultWindow] window] makeKeyAndOrderFront:nil];
+}
+
+- (IBAction)startScanning:(id)sender
+{
+    [[self resultWindow] startDuplicateScan:sender];
+}
+
+
 /* Delegate */
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
@@ -62,56 +154,53 @@ http://www.hardcoded.net/licenses/hs_license
     NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
     NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
     if ([columnsOrder count])
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
+        [[self resultWindow] restoreColumnsPosition:columnsOrder widths:columnsWidth];
     else
-        [result resetColumnsToDefault:nil];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py]])
-        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",[py appName]]];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
-    _savedResults = NO;
+        [[self resultWindow] resetColumnsToDefault:nil];
+    [HSFairwareReminder showNagWithApp:[self py]];
+    [py loadSession];
 }
 
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
-    if (![[result window] isVisible])
-        [result showWindow:NSApp];
+    if (![[[self directoryPanel] window] isVisible]) {
+        [[self directoryPanel] showWindow:NSApp];
+    }
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    if ([py resultsAreModified]) {
+        NSString *msg = TR(@"ReallyWantToQuitMsg");
+        if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) { // NO
+            return NSTerminateCancel;
+        }
+    }
+    return NSTerminateNow;
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [self saveResults];
+    [ud setObject: [[self resultWindow] getColumnsOrder] forKey:@"columnsOrder"];
+    [ud setObject: [[self resultWindow] getColumnsWidth] forKey:@"columnsWidth"];
     NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
-    {
+    if (sc >= 10) {
         sc = -1;
         [py purgeIgnoreList];
     }
     sc++;
+    [py saveSession];
     [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
     // NSApplication does not release nib instances objects, we must do it manually
     // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
-    [recentDirectories release];
+    // But I need to release HSRecentFiles so it saves the user defaults
+    [_directoryPanel release];
+    [_recentResults release];
 }
 
-- (void)recentDirecoryClicked:(NSString *)directory
+- (void)recentFileClicked:(NSString *)path
 {
-    [[self directoryPanel] addDirectory:directory];
-}
-
-/* SUUpdater delegate */
-
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
-{
-    /* If results aren't saved now, we might get a weird utf-8 lookup error when saving later.
-    **/
-    [self saveResults];
-    return NO;
+    [py loadResultsFrom:path];
 }
 @end

cocoa/base/Consts.h

@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 
-#define RegistrationRequired @"RegistrationRequired"
 #define JobStarted @"JobStarted"
 #define JobInProgress @"JobInProgress"
 
@@ -16,4 +15,6 @@ http://www.hardcoded.net/licenses/hs_license
 #define jobScan @"job_scan"
 #define jobCopy @"job_copy"
 #define jobMove @"job_move"
-#define jobDelete @"job_delete"
+#define jobDelete @"job_delete"
+
+#define TR(s) NSLocalizedString(s, @"")

cocoa/base/DetailsPanel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -18,6 +18,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (id)initWithPy:(PyApp *)aPy;
 - (PyDetailsPanel *)py;
 
+- (BOOL)isVisible;
 - (void)toggleVisibility;
 
 /* Python --> Cocoa */

cocoa/base/DetailsPanel.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DetailsPanel.h"
@@ -34,9 +34,14 @@ http://www.hardcoded.net/licenses/hs_license
     [detailsTable reloadData];
 }
 
+- (BOOL)isVisible
+{
+    return [[self window] isVisible];
+}
+
 - (void)toggleVisibility
 {
-    if ([[self window] isVisible]) {
+    if ([self isVisible]) {
         [[self window] close];
     }
     else {

cocoa/base/DirectoryOutline.h

@@ -1,15 +1,17 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "HSOutline.h"
 #import "PyDirectoryOutline.h"
 
+#define DGAddedFoldersNotification @"DGAddedFoldersNotification"
+
 @interface DirectoryOutline : HSOutline {}
 - (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
 - (PyDirectoryOutline *)py;

cocoa/base/DirectoryOutline.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryOutline.h"
@@ -49,12 +49,15 @@ http://www.hardcoded.net/licenses/hs_license
     sourceDragMask = [info draggingSourceOperationMask];
     pboard = [info draggingPasteboard];
     if ([[pboard types] containsObject:NSFilenamesPboardType]) {
-        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+        NSArray *foldernames = [pboard propertyListForType:NSFilenamesPboardType];
         if (!(sourceDragMask & NSDragOperationLink))
             return NO;
-        for (NSString *filename in filenames) {
-            [[self py] addDirectory:filename];
+        for (NSString *foldername in foldernames) {
+            [[self py] addDirectory:foldername];
         }
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObject:foldernames forKey:@"foldernames"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:DGAddedFoldersNotification
+            object:self userInfo:userInfo];
     }
     return YES;
 }

cocoa/base/DirectoryPanel.h

@@ -1,33 +1,40 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "HSOutlineView.h"
+#import "HSRecentFiles.h"
 #import "DirectoryOutline.h"
 #import "PyDupeGuru.h"
 
+@class AppDelegateBase;
+
 @interface DirectoryPanel : NSWindowController
 {
     IBOutlet NSPopUpButton *addButtonPopUp;
+    IBOutlet NSPopUpButton *loadRecentButtonPopUp;
     IBOutlet HSOutlineView *outlineView;
     IBOutlet NSButton *removeButton;
     
+    AppDelegateBase *_app;
     PyDupeGuruBase *_py;
-    RecentDirectories *_recentDirectories;
+    HSRecentFiles *_recentDirectories;
     DirectoryOutline *outline;
+    BOOL _alwaysShowPopUp;
 }
-- (id)initWithParentApp:(id)aParentApp;
+- (id)initWithParentApp:(AppDelegateBase *)aParentApp;
+
+- (void)fillPopUpMenu; // Virtual
 
 - (IBAction)askForDirectory:(id)sender;
 - (IBAction)popupAddDirectoryMenu:(id)sender;
+- (IBAction)popupLoadRecentMenu:(id)sender;
 - (IBAction)removeSelectedDirectory:(id)sender;
-- (IBAction)toggleVisible:(id)sender;
 
 - (void)addDirectory:(NSString *)directory;
 - (void)refreshRemoveButtonText;

cocoa/base/DirectoryPanel.m

@@ -1,37 +1,54 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
 #import "Dialogs.h"
 #import "Utils.h"
 #import "AppDelegate.h"
+#import "Consts.h"
 
 @implementation DirectoryPanel
-- (id)initWithParentApp:(id)aParentApp
+- (id)initWithParentApp:(AppDelegateBase *)aParentApp
 {
     self = [super initWithWindowNibName:@"DirectoryPanel"];
     [self window];
-    AppDelegateBase *app = aParentApp;
-    _py = [app py];
-    _recentDirectories = [app recentDirectories];
+    _app = aParentApp;
+    _py = [_app py];
+    _alwaysShowPopUp = NO;
+    [self fillPopUpMenu];
+    _recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
+    [_recentDirectories setDelegate:self];
     outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
     [self refreshRemoveButtonText];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
         name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outlineAddedFolders:)
+        name:DGAddedFoldersNotification object:outline];
     return self;
 }
 
 - (void)dealloc
 {
     [outline release];
+    [_recentDirectories release];
     [super dealloc];
 }
 
+/* Virtual */
+
+- (void)fillPopUpMenu
+{
+    NSMenu *m = [addButtonPopUp menu];
+    NSMenuItem *mi = [m addItemWithTitle:TR(@"Add New Folder...") action:@selector(askForDirectory:) keyEquivalent:@""];
+    [mi setTarget:self];
+    [m addItem:[NSMenuItem separatorItem]];
+}
+
 /* Actions */
 
 - (IBAction)askForDirectory:(id)sender
@@ -39,32 +56,44 @@ http://www.hardcoded.net/licenses/hs_license
     NSOpenPanel *op = [NSOpenPanel openPanel];
     [op setCanChooseFiles:YES];
     [op setCanChooseDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to add to the scanning list"];
+    [op setAllowsMultipleSelection:YES];
+    [op setTitle:TR(@"SelectFolderToAddMsg")];
     [op setDelegate:self];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
-        NSString *directory = [[op filenames] objectAtIndex:0];
-        [self addDirectory:directory];
+    if ([op runModal] == NSOKButton) {
+        for (NSString *directory in [op filenames]) {
+            [self addDirectory:directory];
+        }
     }
 }
 
 - (IBAction)popupAddDirectoryMenu:(id)sender
 {
-    if ([[_recentDirectories directories] count] == 0)
-    {
+    if ((!_alwaysShowPopUp) && ([[_recentDirectories filepaths] count] == 0)) {
         [self askForDirectory:sender];
-        return;
     }
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    else {
+        [addButtonPopUp selectItem:nil];
+        [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    }
+}
+
+- (IBAction)popupLoadRecentMenu:(id)sender
+{
+    if ([[[_app recentResults] filepaths] count] > 0) {
+        NSMenu *m = [loadRecentButtonPopUp menu];
+        while ([m numberOfItems] > 0) {
+            [m removeItemAtIndex:0];
+        }
+        NSMenuItem *mi = [m addItemWithTitle:TR(@"Load from file...") action:@selector(loadResults:) keyEquivalent:@""];
+        [mi setTarget:_app];
+        [m addItem:[NSMenuItem separatorItem]];
+        [[_app recentResults] fillMenu:m];
+        [loadRecentButtonPopUp selectItem:nil];
+        [[loadRecentButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    }
+    else {
+        [_app loadResults:nil];
+    }
 }
 
 - (IBAction)removeSelectedDirectory:(id)sender
@@ -85,30 +114,21 @@ http://www.hardcoded.net/licenses/hs_license
     [self refreshRemoveButtonText];
 }
 
-- (IBAction)toggleVisible:(id)sender
-{
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
 /* Public */
 - (void)addDirectory:(NSString *)directory
 {
     NSInteger r = [[_py addDirectory:directory] intValue];
     if (r) {
-        NSString *m;
-        switch (r) {
-            case 1: {
-                m = @"This directory already is in the list.";
-                break;
-            }
-            case 2: {
-                m = @"This directory does not exist.";
-                break;
-            }
+        NSString *m = @"";
+        if (r == 1) {
+            m = TR(@"FolderAlreadyInListMsg");
         }
-        [Dialogs showMessage:m];
+        else if (r == 2) {
+            m = TR(@"FolderDoesNotExistMsg");
+        }
+        [Dialogs showMessage:[NSString stringWithFormat:m,directory]];
     }
-    [_recentDirectories addDirectory:directory];
+    [_recentDirectories addFile:directory];
     [[self window] makeKeyAndOrderFront:nil];
 }
 
@@ -120,8 +140,8 @@ http://www.hardcoded.net/licenses/hs_license
     }
     [removeButton setEnabled:YES];
     NSInteger state = [outline intProperty:@"state" valueAtPath:[outline selectedIndexPath]];
-    NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
-    [removeButton setTitle:buttonText];
+    NSString *imgName = state == 2 ? @"NSGoLeftTemplate" : @"NSRemoveTemplate";
+    [removeButton setImage:[NSImage imageNamed:imgName]];
 }
 
 /* Delegate */
@@ -132,6 +152,11 @@ http://www.hardcoded.net/licenses/hs_license
     return isdir;
 }
 
+- (void)recentFileClicked:(NSString *)path
+{
+    [self addDirectory:path];
+}
+
 /* Notifications */
 
 - (void)directorySelectionChanged:(NSNotification *)aNotification
@@ -139,4 +164,12 @@ http://www.hardcoded.net/licenses/hs_license
     [self refreshRemoveButtonText];
 }
 
+- (void)outlineAddedFolders:(NSNotification *)aNotification
+{
+    NSArray *foldernames = [[aNotification userInfo] objectForKey:@"foldernames"];
+    for (NSString *foldername in foldernames) {
+        [_recentDirectories addFile:foldername];
+    }
+}
+
 @end

cocoa/base/ProblemDialog.h

@@ -0,0 +1,25 @@
+/* 
+Copyright 2010 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 "HSWindowController.h"
+#import "PyApp.h"
+#import "PyProblemDialog.h"
+#import "HSTable.h"
+
+@interface ProblemDialog : HSWindowController
+{
+    IBOutlet NSTableView *problemTableView;
+    
+    HSTable *problemTable;
+}
+- (id)initWithPy:(PyApp *)aPy;
+- (PyProblemDialog *)py;
+
+- (IBAction)revealSelected:(id)sender;
+@end

cocoa/base/ProblemDialog.m

@@ -0,0 +1,40 @@
+/* 
+Copyright 2010 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 "ProblemDialog.h"
+#import "Utils.h"
+
+@implementation ProblemDialog
+- (id)initWithPy:(PyApp *)aPy
+{
+    self = [super initWithNibName:@"ProblemDialog" pyClassName:@"PyProblemDialog" pyParent:aPy];
+    [self window]; //So the detailsTable is initialized.
+    problemTable = [[HSTable alloc] initWithPyClassName:@"PyProblemTable" pyParent:[self py] view:problemTableView];
+    [self connect];
+    [problemTable connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [problemTable disconnect];
+    [self disconnect];
+    [problemTable release];
+    [super dealloc];
+}
+
+- (PyProblemDialog *)py
+{
+    return (PyProblemDialog *)py;
+}
+
+- (IBAction)revealSelected:(id)sender
+{
+    [[self py] revealSelected];
+}
+@end

cocoa/base/PyDetailsPanel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/base/PyDirectoryOutline.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/base/PyDupeGuru.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -13,13 +13,14 @@ http://www.hardcoded.net/licenses/hs_license
 //Actions
 - (NSNumber *)addDirectory:(NSString *)name;
 - (void)removeDirectory:(NSNumber *)index;
-- (void)loadResults;
-- (void)saveResults;
-- (void)loadIgnoreList;
-- (void)saveIgnoreList;
+- (void)loadResultsFrom:(NSString *)filename;
+- (void)saveResultsAs:(NSString *)filename;
+- (void)loadSession;
+- (void)saveSession;
 - (void)clearIgnoreList;
 - (void)purgeIgnoreList;
 - (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
+- (void)invokeCommand:(NSString *)cmd;
 
 - (NSNumber *)doScan;
 
@@ -36,17 +37,21 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
 - (void)deleteMarked;
+- (void)hardlinkMarked;
 - (void)removeMarked;
 
 //Data
 - (NSNumber *)getIgnoreListCount;
 - (NSNumber *)getMarkCount;
-- (NSNumber *)getOperationalErrorCount;
+- (BOOL)scanWasProblematic;
+- (BOOL)resultsAreModified;
+- (NSArray *)deltaColumns;
 
 //Scanning options
 - (void)setMinMatchPercentage:(NSNumber *)percentage;
-- (void)setMixFileKind:(NSNumber *)mix_file_kind;
-- (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
-- (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
+- (void)setMixFileKind:(BOOL)mix_file_kind;
+- (void)setEscapeFilterRegexp:(BOOL)escape_filter_regexp;
+- (void)setRemoveEmptyFolders:(BOOL)remove_empty_folders;
+- (void)setIgnoreHardlinkMatches:(BOOL)ignore_hardlink_matches;
 - (void)setSizeThreshold:(NSInteger)size_threshold;
 @end

cocoa/base/PyProblemDialog.h

@@ -0,0 +1,14 @@
+/* 
+Copyright 2010 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 "PyGUI.h"
+
+@interface PyProblemDialog : PyGUI
+- (void)revealSelected;
+@end

cocoa/base/PyResultTable.h

@@ -1,24 +1,24 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "PyOutline.h"
+#import "PyTable.h"
 
-@interface PyResultTree : PyOutline
+@interface PyResultTable : PyTable
 - (BOOL)powerMarkerMode;
 - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
 - (BOOL)deltaValuesMode;
 - (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
 
-- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
+- (NSString *)valueForRow:(NSInteger)rowIndex column:(NSInteger)aColumn;
 - (BOOL)renameSelected:(NSString *)aNewName;
 - (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
 - (void)markSelected;
 - (void)removeSelected;
-- (NSArray *)rootChildrenCounts;
+- (NSInteger)selectedDupeCount;
 @end

cocoa/base/PyStatsLabel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/base/ResultOutline.m

@@ -1,207 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import "ResultOutline.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "Consts.h"
-
-@implementation ResultOutline
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
-{
-    self = [super initWithPyClassName:@"PyResultOutline" pyParent:aPyParent view:aOutlineView];
-    _rootChildrenCounts = nil;
-    [self connect];
-    return self;
-}
-
-- (void)dealloc
-{
-    [self disconnect];
-    [_deltaColumns release];
-    [super dealloc];
-}
-
-- (PyResultTree *)py
-{
-    return (PyResultTree *)py;
-}
-
-/* Public */
-- (BOOL)powerMarkerMode
-{
-    return [[self py] powerMarkerMode];
-}
-
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
-{
-    [[self py] setPowerMarkerMode:aPowerMarkerMode];
-}
-
-- (BOOL)deltaValuesMode
-{
-    return [[self py] deltaValuesMode];
-}
-
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
-{
-    [[self py] setDeltaValuesMode:aDeltaValuesMode];
-}
-
-- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
-{
-    [_deltaColumns release];
-    _deltaColumns = [aDeltaColumns retain];
-}
-
-- (NSInteger)selectedDupeCount
-{
-    NSArray *selected = [self selectedIndexPaths];
-    if ([self powerMarkerMode]) {
-        return [selected count];
-    }
-    else {
-        NSInteger r = 0;
-        for (NSIndexPath *path in selected) {
-            if ([path length] == 2) {
-                r++;
-            }
-        }
-        return r;
-    }
-}
-
-- (void)removeSelected
-{
-    NSInteger selectedDupeCount = [self selectedDupeCount];
-    if (!selectedDupeCount)
-        return;
-    NSString *msg = [NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",selectedDupeCount];
-    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
-        return;
-    [[self py] removeSelected];
-}
-
-/* Datasource */
-- (NSInteger)outlineView:(NSOutlineView *)aOutlineView numberOfChildrenOfItem:(id)item
-{
-    NSIndexPath *path = item;
-    if ((path != nil) && ([path length] == 1)) {
-        if (_rootChildrenCounts == nil) {
-            _rootChildrenCounts = [[[self py] rootChildrenCounts] retain];
-        }
-        NSInteger index = [path indexAtPosition:0];
-        return n2i([_rootChildrenCounts objectAtIndex:index]);
-    }
-    return [super outlineView:aOutlineView numberOfChildrenOfItem:item];
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)column byItem:(id)item
-{
-    NSIndexPath *path = item;
-    NSString *identifier = [column identifier];
-    if ([identifier isEqual:@"marked"]) {
-        return b2n([self boolProperty:@"marked" valueAtPath:path]);
-    }
-    NSInteger columnId = [identifier integerValue];
-    return [[self py] valueForPath:p2a(path) column:columnId];
-}
-
-- (void)outlineView:(NSOutlineView *)aOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-    if ([[tableColumn identifier] isEqual:@"0"]) {
-        NSIndexPath *path = item;
-        NSString *oldName = [[self py] valueForPath:p2a(path) column:0];
-        NSString *newName = object;
-        if (![newName isEqual:oldName]) {
-            BOOL renamed = [[self py] renameSelected:newName];
-            if (!renamed) {
-                [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.", newName]];
-            }
-            else {
-                [self refreshItemAtPath:path];
-            }
-        }
-    }
-    else {
-        [super outlineView:aOutlineView setObjectValue:object forTableColumn:tableColumn byItem:item];
-    }
-}
-
-/* Delegate */
-- (void)outlineView:(NSOutlineView *)aOutlineView didClickTableColumn:(NSTableColumn *)tableColumn
-{
-    if ([[outlineView sortDescriptors] count] < 1)
-        return;
-    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
-    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    NSIndexPath *path = item;
-    BOOL isMarkable = [self boolProperty:@"markable" valueAtPath:path];
-    if ([[tableColumn identifier] isEqual:@"marked"]) {
-        [cell setEnabled:isMarkable];
-    }
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        // Determine if the text color will be blue due to directory being reference.
-        NSTextFieldCell *textCell = cell;
-        if (isMarkable) {
-            [textCell setTextColor:[NSColor blackColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blueColor]];
-        }
-        if (([self deltaValuesMode]) && ([self powerMarkerMode] || ([path length] > 1))) {
-            NSInteger i = [[tableColumn identifier] integerValue];
-            if ([_deltaColumns containsIndex:i]) {
-                [textCell setTextColor:[NSColor orangeColor]];
-            }
-        }
-    }
-}
-
-- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
-{
-    [self removeSelected];
-    return YES;
-}
-
-- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
-{
-    [[self py] markSelected];
-    return YES;
-}
-
-/* don't calls saveEdits and cancelEdits */
-- (void)outlineViewDidEndEditing:(HSOutlineView *)outlineView
-{
-}
-
-- (void)outlineViewCancelsEdition:(HSOutlineView *)outlineView
-{
-}
-
-/* Python --> Cocoa */
-- (void)refresh /* Override */
-{
-    [_rootChildrenCounts release];
-    _rootChildrenCounts = nil;
-    [super refresh];
-    [outlineView expandItem:nil expandChildren:YES];
-}
-
-- (void)invalidateMarkings
-{
-    for (NSMutableDictionary *props in [itemData objectEnumerator]) {
-        [props removeObjectForKey:@"marked"];
-    }
-    [outlineView setNeedsDisplay:YES];
-}
-@end

cocoa/base/ResultTable.h

@@ -1,21 +1,21 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSOutline.h"
-#import "PyResultTree.h"
+#import "HSTable.h"
+#import "PyResultTable.h"
 
-@interface ResultOutline : HSOutline
+@interface ResultTable : HSTable
 {
     NSIndexSet *_deltaColumns;
-    NSArray *_rootChildrenCounts;
 }
-- (PyResultTree *)py;
+- (id)initWithPyParent:(id)aPyParent view:(NSTableView *)aTableView;
+- (PyResultTable *)py;
 - (BOOL)powerMarkerMode;
 - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
 - (BOOL)deltaValuesMode;

cocoa/base/ResultTable.m

@@ -0,0 +1,163 @@
+/* 
+Copyright 2010 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 "ResultTable.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "Consts.h"
+
+@implementation ResultTable
+- (id)initWithPyParent:(id)aPyParent view:(NSTableView *)aTableView
+{
+    self = [super initWithPyClassName:@"PyResultTable" pyParent:aPyParent view:aTableView];
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [_deltaColumns release];
+    [super dealloc];
+}
+
+- (PyResultTable *)py
+{
+    return (PyResultTable *)py;
+}
+
+/* Public */
+- (BOOL)powerMarkerMode
+{
+    return [[self py] powerMarkerMode];
+}
+
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
+{
+    [[self py] setPowerMarkerMode:aPowerMarkerMode];
+}
+
+- (BOOL)deltaValuesMode
+{
+    return [[self py] deltaValuesMode];
+}
+
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
+{
+    [[self py] setDeltaValuesMode:aDeltaValuesMode];
+}
+
+- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
+{
+    [_deltaColumns release];
+    _deltaColumns = [aDeltaColumns retain];
+}
+
+- (NSInteger)selectedDupeCount
+{
+    return [[self py] selectedDupeCount];
+}
+
+- (void)removeSelected
+{
+    NSInteger selectedDupeCount = [self selectedDupeCount];
+    if (!selectedDupeCount)
+        return;
+    NSString *msgFmt = TR(@"FileRemovalConfirmMsg");
+    NSString *msg = [NSString stringWithFormat:msgFmt,selectedDupeCount];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
+        return;
+    [[self py] removeSelected];
+}
+
+/* Datasource */
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        return [[self py] valueForColumn:@"marked" row:row];
+    }
+    NSInteger columnId = [identifier integerValue];
+    return [[self py] valueForRow:row column:columnId];
+}
+
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        [[self py] setValue:object forColumn:identifier row:row];
+    }
+    else if ([identifier isEqual:@"0"]) {
+        NSString *oldName = [[self py] valueForRow:row column:0];
+        NSString *newName = object;
+        if (![newName isEqual:oldName]) {
+            BOOL renamed = [[self py] renameSelected:newName];
+            if (!renamed) {
+                [Dialogs showMessage:[NSString stringWithFormat:TR(@"FilenameAlreadyExistsMsg"), newName]];
+            }
+            else {
+                [tableView setNeedsDisplay:YES];
+            }
+        }
+    }
+}
+
+/* Delegate */
+- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)tableColumn
+{
+    if ([[tableView sortDescriptors] count] < 1)
+        return;
+    NSSortDescriptor *sd = [[tableView sortDescriptors] objectAtIndex:0];
+    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
+}
+
+- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{ 
+    BOOL isMarkable = n2b([[self py] valueForColumn:@"markable" row:row]);
+    if ([[column identifier] isEqual:@"marked"]) {
+        [cell setEnabled:isMarkable];
+        // Low-tech solution, for indentation, but it works...
+        NSCellImagePosition pos = isMarkable ? NSImageRight : NSImageLeft;
+        [cell setImagePosition:pos];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if (isMarkable) {
+            [textCell setTextColor:[NSColor blackColor]];
+            if ([self deltaValuesMode]) {
+                NSInteger i = [[column identifier] integerValue];
+                if ([_deltaColumns containsIndex:i]) {
+                    [textCell setTextColor:[NSColor orangeColor]];
+                }
+            }
+        }
+        else {
+            [textCell setTextColor:[NSColor blueColor]];
+        }
+    }
+}
+
+- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
+{
+    [self removeSelected];
+    return YES;
+}
+
+- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
+{
+    [[self py] markSelected];
+    return YES;
+}
+
+/* Python --> Cocoa */
+- (void)invalidateMarkings
+{
+    [tableView setNeedsDisplay:YES];
+}
+@end

cocoa/base/ResultWindow.h

@@ -1,51 +1,62 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSOutlineView.h"
 #import "StatsLabel.h"
-#import "ResultOutline.h"
+#import "ResultTable.h"
+#import "ProblemDialog.h"
+#import "HSTableView.h"
 #import "PyDupeGuru.h"
 
+@class AppDelegateBase;
+
 @interface ResultWindowBase : NSWindowController
 {
 @protected
-    IBOutlet PyDupeGuruBase *py;
-    IBOutlet id app;
-    IBOutlet NSSegmentedControl *deltaSwitch;
-    IBOutlet HSOutlineView *matches;
-	IBOutlet NSSegmentedControl *pmSwitch;
-	IBOutlet NSTextField *stats;
-	IBOutlet NSMenu *columnsMenu;
-	IBOutlet NSSearchField *filterField;
+    IBOutlet NSSegmentedControl *optionsSwitch;
+    IBOutlet HSTableView *matches;
+    IBOutlet NSTextField *stats;
+    IBOutlet NSSearchField *filterField;
     
+    AppDelegateBase *app;
+    PyDupeGuruBase *py;
+    NSMenu *columnsMenu;
     NSMutableArray *_resultColumns;
-    NSWindowController *preferencesPanel;
-    ResultOutline *outline;
+    ResultTable *table;
     StatsLabel *statsLabel;
+    ProblemDialog *problemDialog;
 }
+- (id)initWithParentApp:(AppDelegateBase *)app;
+
+/* Virtual */
+- (void)initResultColumns;
+- (void)setScanOptions;
+- (NSString *)getScanErrorMessageForCode:(NSInteger)errorCode;
+
 /* Helpers */
 - (void)fillColumnsMenu;
 - (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
 - (NSArray *)getColumnsOrder;
 - (NSDictionary *)getColumnsWidth;
-- (void)initResultColumns;
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
+- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted;
+- (void)updateOptionSegments;
 
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender;
-- (IBAction)changeDelta:(id)sender;
-- (IBAction)changePowerMarker:(id)sender;
+- (IBAction)changeOptions:(id)sender;
 - (IBAction)copyMarked:(id)sender;
 - (IBAction)deleteMarked:(id)sender;
+- (IBAction)hardlinkMarked:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
 - (IBAction)filter:(id)sender;
 - (IBAction)ignoreSelected:(id)sender;
+- (IBAction)invokeCustomCommand:(id)sender;
 - (IBAction)markAll:(id)sender;
 - (IBAction)markInvert:(id)sender;
 - (IBAction)markNone:(id)sender;
@@ -58,7 +69,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)renameSelected:(id)sender;
 - (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)saveResults:(id)sender;
 - (IBAction)startDuplicateScan:(id)sender;
 - (IBAction)switchSelected:(id)sender;
 - (IBAction)toggleColumn:(id)sender;

cocoa/base/ResultWindow.m

@@ -1,46 +1,70 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
 #import "Dialogs.h"
 #import "ProgressController.h"
 #import "Utils.h"
-#import "RegistrationInterface.h"
 #import "AppDelegate.h"
 #import "Consts.h"
 
 @implementation ResultWindowBase
-- (void)awakeFromNib
+- (id)initWithParentApp:(AppDelegateBase *)aApp;
 {
-    [self window];
-    preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
-    outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
+    self = [super initWithWindowNibName:@"ResultWindow"];
+    app = aApp;
+    py = [app py];
+    columnsMenu = [app columnsMenu];
+    /* Put a cute iTunes-like bottom bar */
+    [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
+    table = [[ResultTable alloc] initWithPyParent:py view:matches];
     statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
+    problemDialog = [[ProblemDialog alloc] initWithPy:py];
     [self initResultColumns];
     [self fillColumnsMenu];
-    [deltaSwitch setSelectedSegment:0];
-    [pmSwitch setSelectedSegment:0];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openClicked:)];
+    [table setDeltaColumns:[Utils array2IndexSet:[py deltaColumns]]];
     
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
+    return self;
 }
 
 - (void)dealloc
 {
-    [outline release];
-    [preferencesPanel release];
+    [table release];
+    [statsLabel release];
+    [problemDialog release];
     [super dealloc];
 }
 
+/* Virtual */
+- (void)initResultColumns
+{
+}
+
+- (void)setScanOptions
+{
+}
+
+- (NSString *)getScanErrorMessageForCode:(NSInteger)errorCode
+{
+    if (errorCode == 0) {
+        return nil;
+    }
+    if (errorCode == 3) {
+        return TR(@"NoScannableFileMsg");
+    }
+    return TR(@"UnknownErrorMsg");
+}
+
 /* Helpers */
 - (void)fillColumnsMenu
 {
@@ -54,7 +78,8 @@ http://www.hardcoded.net/licenses/hs_license
             [mi setState:NSOnState];
     }
     [columnsMenu addItem:[NSMenuItem separatorItem]];
-    NSMenuItem *mi = [columnsMenu addItemWithTitle:@"Reset to Default" action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
+    NSMenuItem *mi = [columnsMenu addItemWithTitle:TR(@"Reset to Default")
+        action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
     [mi setTarget:self];
 }
 
@@ -93,11 +118,6 @@ http://www.hardcoded.net/licenses/hs_license
     return result;
 }
 
-- (void)initResultColumns
-{
-    // Virtual
-}
-
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
 {
     for (NSMenuItem *mi in [columnsMenu itemArray]) {
@@ -121,25 +141,60 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
+- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted
+{
+    NSInteger mark_count = [[py getMarkCount] intValue];
+    if (!mark_count) {
+        return;
+    }
+    NSString *msg = TR(@"SendToTrashConfirmMsg");
+    if (hardlinkDeleted) {
+        msg = TR(@"HardlinkConfirmMsg");
+    }
+    if ([Dialogs askYesNo:[NSString stringWithFormat:msg,mark_count]] == NSAlertSecondButtonReturn) { // NO
+        return;
+    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    if (hardlinkDeleted) {
+        [py hardlinkMarked];
+    }
+    else {
+        [py deleteMarked];
+    }
+}
+
+- (void)updateOptionSegments
+{
+    [optionsSwitch setSelected:[[app detailsPanel] isVisible] forSegment:0];
+    [optionsSwitch setSelected:[table powerMarkerMode] forSegment:1];
+    [optionsSwitch setSelected:[table deltaValuesMode] forSegment:2];
+}
+
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender
 {
     NSInteger i = n2i([py getIgnoreListCount]);
     if (!i)
         return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"Do you really want to remove all %d items from the ignore list?",i]] == NSAlertSecondButtonReturn) // NO
+    NSString *msg = [NSString stringWithFormat:TR(@"ClearIgnoreListConfirmMsg"),i];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
     [py clearIgnoreList];
 }
 
-- (IBAction)changeDelta:(id)sender
+- (IBAction)changeOptions:(id)sender
 {
-    [outline setDeltaValuesMode:[deltaSwitch selectedSegment] == 1];
-}
-
-- (IBAction)changePowerMarker:(id)sender
-{
-    [outline setPowerMarkerMode:[pmSwitch selectedSegment] == 1];
+    NSInteger seg = [optionsSwitch selectedSegment];
+    if (seg == 0) {
+        [self toggleDetailsPanel:sender];
+    }
+    else if (seg == 1) {
+        [self togglePowerMarker:sender];
+    }
+    else if (seg == 2) {
+        [self toggleDelta:sender];
+    }
 }
 
 - (IBAction)copyMarked:(id)sender
@@ -152,9 +207,8 @@ http://www.hardcoded.net/licenses/hs_license
     [op setCanChooseDirectories:YES];
     [op setCanCreateDirectories:YES];
     [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to copy marked files to"];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
+    [op setTitle:TR(@"SelectCopyDestinationMsg")];
+    if ([op runModal] == NSOKButton) {
         NSString *directory = [[op filenames] objectAtIndex:0];
         NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
         [py copyOrMove:b2n(YES) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
@@ -163,14 +217,12 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)deleteMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
-    if (!mark_count)
-        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to send %d files to Trash. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
-        return;
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
-    [py deleteMarked];
+    [self sendMarkedToTrash:NO];
+}
+
+- (IBAction)hardlinkMarked:(id)sender
+{
+    [self sendMarkedToTrash:YES];
 }
 
 - (IBAction)exportToXHTML:(id)sender
@@ -182,21 +234,33 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)filter:(id)sender
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py setEscapeFilterRegexp:!n2b([ud objectForKey:@"useRegexpFilter"])];
     [py applyFilter:[filterField stringValue]];
 }
 
 - (IBAction)ignoreSelected:(id)sender
 {
-    NSInteger selectedDupeCount = [outline selectedDupeCount];
+    NSInteger selectedDupeCount = [table selectedDupeCount];
     if (!selectedDupeCount)
         return;
-    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",selectedDupeCount];
+    NSString *msg = [NSString stringWithFormat:TR(@"IgnoreConfirmMsg"),selectedDupeCount];
     if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
     [py addSelectedToIgnoreList];
 }
 
+- (IBAction)invokeCustomCommand:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    NSString *cmd = [ud stringForKey:@"CustomCommand"];
+    if ((cmd != nil) && ([cmd length] > 0)) {
+        [py invokeCommand:cmd];
+    }
+    else {
+        [Dialogs showMessage:TR(@"NoCustomCommandMsg")];
+    }
+}
+
 - (IBAction)markAll:(id)sender
 {
     [py markAll];
@@ -227,12 +291,11 @@ http://www.hardcoded.net/licenses/hs_license
     [op setCanChooseDirectories:YES];
     [op setCanCreateDirectories:YES];
     [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to move marked files to"];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
+    [op setTitle:TR(@"SelectMoveDestinationMsg")];
+    if ([op runModal] == NSOKButton) {
         NSString *directory = [[op filenames] objectAtIndex:0];
         NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-        [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
+        [py setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
         [py copyOrMove:b2n(NO) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
     }
 }
@@ -256,14 +319,15 @@ http://www.hardcoded.net/licenses/hs_license
     int mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
+    NSString *msg = [NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
     [py removeMarked];
 }
 
 - (IBAction)removeSelected:(id)sender
 {
-    [outline removeSelected];
+    [table removeSelected];
 }
 
 - (IBAction)renameSelected:(id)sender
@@ -283,14 +347,31 @@ http://www.hardcoded.net/licenses/hs_license
     [py revealSelected];
 }
 
-- (IBAction)showPreferencesPanel:(id)sender
+- (IBAction)saveResults:(id)sender
 {
-    [preferencesPanel showWindow:sender];
+    NSSavePanel *sp = [NSSavePanel savePanel];
+    [sp setCanCreateDirectories:YES];
+    [sp setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
+    [sp setTitle:TR(@"SelectResultToSaveMsg")];
+    if ([sp runModal] == NSOKButton) {
+        [py saveResultsAs:[sp filename]];
+        [[app recentResults] addFile:[sp filename]];
+    }
 }
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    // Virtual
+    if ([py resultsAreModified]) {
+        if ([Dialogs askYesNo:TR(@"ReallyWantToContinueMsg")] == NSAlertSecondButtonReturn) // NO
+            return;
+    }
+    [self setScanOptions];
+    NSInteger r = n2i([py doScan]);
+    NSString *errorMsg = [self getScanErrorMessageForCode:r];
+    if (errorMsg != nil) {
+        [[ProgressController mainProgressController] hide];
+        [Dialogs showMessage:errorMsg];
+    }
 }
 
 - (IBAction)switchSelected:(id)sender
@@ -303,93 +384,81 @@ http://www.hardcoded.net/licenses/hs_license
     NSMenuItem *mi = sender;
     NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
     NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
-    if (col == nil)
-    {
+    if (col == nil) {
         //Add Column
         col = [_resultColumns objectAtIndex:[mi tag]];
         [matches addTableColumn:col];
         [mi setState:NSOnState];
     }
-    else
-    {
+    else {
         //Remove column
         [matches removeTableColumn:col];
         [mi setState:NSOffState];
     }
 }
 
-- (IBAction)toggleDelta:(id)sender
-{
-    if ([deltaSwitch selectedSegment] == 1)
-        [deltaSwitch setSelectedSegment:0];
-    else
-        [deltaSwitch setSelectedSegment:1];
-    [self changeDelta:sender];
-}
-
 - (IBAction)toggleDetailsPanel:(id)sender
 {
-    [[(AppDelegateBase *)app detailsPanel] toggleVisibility];
+    [[app detailsPanel] toggleVisibility];
+    [self updateOptionSegments];
+}
+
+- (IBAction)toggleDelta:(id)sender
+{
+    [table setDeltaValuesMode:![table deltaValuesMode]];
+    [self updateOptionSegments];
 }
 
 - (IBAction)togglePowerMarker:(id)sender
 {
-    if ([pmSwitch selectedSegment] == 1)
-        [pmSwitch setSelectedSegment:0];
-    else
-        [pmSwitch setSelectedSegment:1];
-    [self changePowerMarker:sender];
+    [table setPowerMarkerMode:![table powerMarkerMode]];
+    [self updateOptionSegments];
 }
 
 /* Notifications */
-- (void)windowWillClose:(NSNotification *)aNotification
-{
-    [NSApp hide:NSApp];
-}
-
 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    NSInteger r = n2i([py getOperationalErrorCount]);
     id lastAction = [[ProgressController mainProgressController] jobId];
     if ([lastAction isEqualTo:jobCopy]) {
-        if (r > 0)
-            [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be copied.",r]];
-        else
-            [Dialogs showMessage:@"All marked files were copied sucessfully."];
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
+        }
+        else {
+            [Dialogs showMessage:TR(@"CopySuccessMsg")];
+        }
     }
     else if ([lastAction isEqualTo:jobMove]) {
-        if (r > 0)
-            [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be moved. They were kept in the results, and still are marked.",r]];
-        else
-            [Dialogs showMessage:@"All marked files were moved sucessfully."];
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
+        }
+        else {
+            [Dialogs showMessage:TR(@"MoveSuccessMsg")];
+        }
     }
     else if ([lastAction isEqualTo:jobDelete]) {
-        if (r > 0) {
-            NSString *msg = @"%d file(s) couldn't be sent to Trash. They were kept in the results, "\
-                "and still are marked. See the F.A.Q. section in the help file for details.";
-            [Dialogs showMessage:[NSString stringWithFormat:msg,r]];
+        if ([py scanWasProblematic]) {
+            [problemDialog showWindow:self];
+        }
+        else {
+            [Dialogs showMessage:TR(@"SendToTrashSuccessMsg")];
         }
-        else
-            [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
     }
     else if ([lastAction isEqualTo:jobScan]) {
-        NSInteger groupCount = [outline intProperty:@"children_count" valueAtPath:nil];
-        if (groupCount == 0)
-            [Dialogs showMessage:@"No duplicates found."];
+        NSInteger rowCount = [[table py] numberOfRows];
+        if (rowCount == 0) {
+            [Dialogs showMessage:TR(@"NoDuplicateFoundMsg")];
+        }
     }
-    
-    // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
-    // a mouse-over is performed
-    [[[self window] toolbar] validateVisibleItems];
 }
 
 - (void)jobInProgress:(NSNotification *)aNotification
 {
-    [Dialogs showMessage:@"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again."];
+    [Dialogs showMessage:TR(@"TaskHangingMsg")];
 }
 
 - (void)jobStarted:(NSNotification *)aNotification
 {
+    [[self window] makeKeyAndOrderFront:nil];
     NSDictionary *ui = [aNotification userInfo];
     NSString *desc = [ui valueForKey:@"desc"];
     [[ProgressController mainProgressController] setJobDesc:desc];
@@ -398,12 +467,6 @@ http://www.hardcoded.net/licenses/hs_license
     [[ProgressController mainProgressController] showSheetForParent:[self window]];
 }
 
-- (void)registrationRequired:(NSNotification *)aNotification
-{
-    NSString *msg = @"This is a demo version, which only allows you 10 delete/copy/move actions per session. You cannot continue.";
-    [Dialogs showMessage:msg];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
     return ![[ProgressController mainProgressController] isShown];

cocoa/base/StatsLabel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/base/StatsLabel.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "StatsLabel.h"

cocoa/base/en.lproj/DetailsPanel.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Details of Selected File";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Selected";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Reference";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribute";

cocoa/base/en.lproj/DetailsPanel.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10F569</string>
+		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">740</string>
+			<string key="NS.object.0">788</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,7 +41,7 @@
 			<object class="NSWindowTemplate" id="476890502">
 				<int key="NSWindowStyleMask">155</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{33, 261}, {451, 161}}</string>
+				<string key="NSWindowRect">{{33, 261}, {451, 146}}</string>
 				<int key="NSWTFlags">-260571136</int>
 				<string key="NSWindowTitle">Details of Selected File</string>
 				<object class="NSMutableString" key="NSWindowClass">
@@ -51,7 +51,7 @@
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{451, 161}</string>
+				<string key="NSWindowContentMinSize">{451, 146}</string>
 				<object class="NSView" key="NSWindowView" id="1027711962">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -70,7 +70,7 @@
 										<object class="NSTableView" id="251969872">
 											<reference key="NSNextResponder" ref="488480549"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{449, 143}</string>
+											<string key="NSFrameSize">{449, 128}</string>
 											<reference key="NSSuperview" ref="488480549"/>
 											<int key="NSTag">2</int>
 											<bool key="NSEnabled">YES</bool>
@@ -224,7 +224,7 @@
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {449, 143}}</string>
+									<string key="NSFrame">{{1, 17}, {449, 128}}</string>
 									<reference key="NSSuperview" ref="362108788"/>
 									<reference key="NSNextKeyView" ref="251969872"/>
 									<reference key="NSDocView" ref="251969872"/>
@@ -266,7 +266,7 @@
 								</object>
 								<reference ref="717380566"/>
 							</object>
-							<string key="NSFrameSize">{451, 161}</string>
+							<string key="NSFrameSize">{451, 146}</string>
 							<reference key="NSSuperview" ref="1027711962"/>
 							<reference key="NSNextKeyView" ref="488480549"/>
 							<int key="NSsFlags">530</int>
@@ -278,12 +278,13 @@
 							<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
 						</object>
 					</object>
-					<string key="NSFrameSize">{451, 161}</string>
+					<string key="NSFrameSize">{451, 146}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
-				<string key="NSMinSize">{451, 177}</string>
+				<string key="NSMinSize">{451, 162}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSFrameAutosaveName">DetailsPanel</string>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -497,12 +498,12 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{109, 656}, {451, 161}}</string>
+					<string>{{109, 671}, {451, 146}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{109, 656}, {451, 161}}</string>
+					<string>{{109, 671}, {451, 146}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
-					<string>{451, 161}</string>
+					<string>{451, 146}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -536,11 +537,18 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">DetailsPanel</string>
-					<string key="superclassName">NSWindowController</string>
+					<string key="superclassName">HSWindowController</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">detailsTable</string>
 						<string key="NS.object.0">NSTableView</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">detailsTable</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">detailsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">../base/DetailsPanel.h</string>
@@ -548,7 +556,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">DetailsPanel</string>
-					<string key="superclassName">NSWindowController</string>
+					<string key="superclassName">HSWindowController</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -562,6 +570,32 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">HSWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../controllers/HSWindowController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/HSOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="111130406">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/NSTableViewAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableView</string>
+					<reference key="sourceIdentifier" ref="111130406"/>
+				</object>
 			</object>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1029,6 +1063,13 @@
 						<string key="NS.key.0">showWindow:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -1037,6 +1078,7 @@
 			</object>
 		</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>
 			<integer value="1050" key="NS.object.0"/>

cocoa/base/en.lproj/DirectoryPanel.strings

@@ -0,0 +1,23 @@
+/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */
+"13.headerCell.title" = "State";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */
+"15.headerCell.title" = "Name";
+
+/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */
+"48.title" = "Scan";
+
+/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */
+"55.title" = "Normal";
+
+/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */
+"56.title" = "Reference";
+
+/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
+"57.title" = "Excluded";
+
+/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
+"71.title" = "Select folders to scan and press \"Scan\".";
+
+/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
+"73.title" = "Load Results";

cocoa/base/en.lproj/Localizable.strings

@@ -0,0 +1,63 @@
+"Add New Folder..." = "Add New Folder...";
+"Load from file..." = "Load from file...";
+"Reset to Default" = "Reset to Default";
+
+"Add iTunes Directory" = "Add iTunes Directory";
+"Remove Dead Tracks in iTunes" = "Remove Dead Tracks in iTunes";
+
+"Add iPhoto Library" = "Add iPhoto Library";
+"Clear Picture Cache" = "Clear Picture Cache";
+
+/* Columns */
+"Folder" = "Folder";
+"Size (KB)" = "Size (KB)";
+"Size (MB)" = "Size (MB)";
+"Kind" = "Kind";
+"Modification" = "Modification";
+"Match %" = "Match %";
+"Words Used" = "Words Used";
+"Dupe Count" = "Dupe Count";
+
+"Time" = "Time";
+"Bitrate" = "Bitrate";
+"Sample Rate" = "Sample Rate";
+"Title" = "Title";
+"Artist" = "Artist";
+"Album" = "Album";
+"Genre" = "Genre";
+"Year" = "Year";
+"Track Number" = "Track Number";
+"Comment" = "Comment";
+
+"Dimensions" = "Dimensions";
+
+/* Messages */
+"SelectResultToLoadMsg" = "Select a results file to load";
+"SelectCopyDestinationMsg" = "Select a directory to copy marked files to";
+"SelectMoveDestinationMsg" = "Select a directory to move marked files to";
+"SelectResultToSaveMsg" = "Select a file to save your results to";
+"SelectFolderToAddMsg" = "Select a folder to add to the scanning list";
+"ReallyWantToQuitMsg" = "You have unsaved results, do you really want to quit?";
+"ReallyWantToContinueMsg" = "You have unsaved results, do you really want to continue?";
+"FolderAlreadyInListMsg" = "'%@' already is in the list.";
+"FolderDoesNotExistMsg" = "'%@' does not exist.";
+"FileRemovalConfirmMsg" = "You are about to remove %d files from results. Continue?";
+"FilenameAlreadyExistsMsg" = "The name '%@' already exists.";
+"NoScannableFileMsg" = "The selected directories contain no scannable file.";
+"UnknownErrorMsg" = "Unknown Error.";
+"SendToTrashConfirmMsg" = "You are about to send %d files to Trash. Continue?";
+"HardlinkConfirmMsg" = "You are about to send %d files to Trash (and hardlink them afterwards). Continue?";
+"ClearIgnoreListConfirmMsg" = "Do you really want to remove all %d items from the ignore list?";
+"IgnoreConfirmMsg" = "All selected %d matches are going to be ignored in all subsequent scans. Continue?";
+"NoCustomCommandMsg" = "You have no custom command set up. Set it up in your preferences.";
+"CopySuccessMsg" = "All marked files were copied sucessfully.";
+"MoveSuccessMsg" = "All marked files were moved sucessfully.";
+"SendToTrashSuccessMsg" = "All marked files were sucessfully sent to Trash.";
+"NoDuplicateFoundMsg" = "No duplicates found.";
+"TaskHangingMsg" = "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.";
+
+"RemoveDeadTracksConfirmMsg" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"NoDeadTrackMsg" = "You have no dead tracks in your iTunes Library";
+
+"IPhotoAppNotFoundMsg" = "The iPhoto application couldn't be found.";
+"ClearPictureCacheConfirmMsg" = "Do you really want to remove all your cached picture analysis?";

cocoa/base/en.lproj/MainMenu.strings

@@ -0,0 +1,174 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Bring All to Front";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimize";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "About dupeGuru"; ObjectID = "58"; */
+"58.title" = "About dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Help";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Help";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Help"; ObjectID = "111"; */
+"111.title" = "dupeGuru Help";
+
+/* Class = "NSMenuItem"; title = "Hide dupeGuru"; ObjectID = "134"; */
+"134.title" = "Hide dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Quit dupeGuru"; ObjectID = "136"; */
+"136.title" = "Quit dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Hide Others";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Show All";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "Details Panel"; ObjectID = "398"; */
+"398.title" = "Details Panel";
+
+/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "541"; */
+"541.title" = "Preferences...";
+
+/* Class = "NSMenuItem"; title = "Folder Selection Window"; ObjectID = "579"; */
+"579.title" = "Folder Selection Window";
+
+/* Class = "NSMenuItem"; title = "Actions"; ObjectID = "597"; */
+"597.title" = "Actions";
+
+/* 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 = "Move Marked to..."; ObjectID = "600"; */
+"600.title" = "Move Marked to...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "601"; */
+"601.title" = "Copy Marked to...";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "602"; */
+"602.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "603"; */
+"603.title" = "Remove Marked from Results";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "605"; */
+"605.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Columns"; ObjectID = "618"; */
+"618.title" = "Columns";
+
+/* Class = "NSMenu"; title = "Columns"; ObjectID = "619"; */
+"619.title" = "Columns";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "708"; */
+"708.title" = "Open Selected with Default Application";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "710"; */
+"710.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "922"; */
+"922.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "924"; */
+"924.title" = "Close Window";
+
+/* Class = "NSMenuItem"; title = "Start Duplicate Scan"; ObjectID = "926"; */
+"926.title" = "Start Duplicate Scan";
+
+/* Class = "NSMenuItem"; title = "Clear Ignore List"; ObjectID = "927"; */
+"927.title" = "Clear Ignore List";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "933"; */
+"933.title" = "Rename Selected";
+
+/* Class = "NSMenuItem"; title = "Export Results to XHTML"; ObjectID = "947"; */
+"947.title" = "Export Results to XHTML";
+
+/* Class = "NSMenuItem"; title = "Check for update..."; ObjectID = "950"; */
+"950.title" = "Check for update...";
+
+/* Class = "NSMenuItem"; title = "Mode"; ObjectID = "959"; */
+"959.title" = "Mode";
+
+/* Class = "NSMenu"; title = "Mode"; ObjectID = "960"; */
+"960.title" = "Mode";
+
+/* Class = "NSMenuItem"; title = "Show Dupes Only"; ObjectID = "961"; */
+"961.title" = "Show Dupes Only";
+
+/* Class = "NSMenuItem"; title = "Show Delta Values"; ObjectID = "962"; */
+"962.title" = "Show Delta Values";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "965"; */
+"965.title" = "Edit";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "966"; */
+"966.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "985"; */
+"985.title" = "Cut";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "986"; */
+"986.title" = "Copy";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "991"; */
+"991.title" = "Paste";
+
+/* Class = "NSMenuItem"; title = "Mark All"; ObjectID = "1011"; */
+"1011.title" = "Mark All";
+
+/* Class = "NSMenuItem"; title = "Mark None"; ObjectID = "1012"; */
+"1012.title" = "Mark None";
+
+/* Class = "NSMenuItem"; title = "Invert Marking"; ObjectID = "1013"; */
+"1013.title" = "Invert Marking";
+
+/* Class = "NSMenuItem"; title = "Mark Selected"; ObjectID = "1014"; */
+"1014.title" = "Mark Selected";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Website"; ObjectID = "1023"; */
+"1023.title" = "dupeGuru Website";
+
+/* Class = "NSMenuItem"; title = "Invoke Custom Command"; ObjectID = "1177"; */
+"1177.title" = "Invoke Custom Command";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1203"; */
+"1203.title" = "File";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1204"; */
+"1204.title" = "File";
+
+/* Class = "NSMenuItem"; title = "Load Results..."; ObjectID = "1205"; */
+"1205.title" = "Load Results...";
+
+/* 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";
+
+/* Class = "NSMenu"; title = "Load Recent Results"; ObjectID = "1240"; */
+"1240.title" = "Load Recent Results";
+
+/* Class = "NSMenuItem"; title = "Results Window"; ObjectID = "1272"; */
+"1272.title" = "Results Window";

cocoa/base/en.lproj/ProblemDialog.strings

@@ -0,0 +1,18 @@
+
+/* Class = "NSWindow"; title = "Problems!"; ObjectID = "1"; */
+"1.title" = "Problems!";
+
+/* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */
+"4.title" = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results.";
+
+/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */
+"10.headerCell.title" = "File Path";
+
+/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */
+"11.headerCell.title" = "Error Message";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Close";
+
+/* Class = "NSButtonCell"; title = "Reveal Selected"; ObjectID = "21"; */
+"21.title" = "Reveal Selected";

cocoa/base/en.lproj/ResultWindow.strings

@@ -0,0 +1,99 @@
+
+/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */
+"1.title" = "dupeGuru Results";
+
+/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */
+"6.title" = "Marked: 0 files, 0 B. Total: 0 files, 0 B.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "11"; */
+"11.headerCell.title" = "Name";
+
+/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
+"15.label" = "Options";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */
+"15.paletteLabel" = "Options";
+
+/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */
+"16.label" = "Filter";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */
+"16.paletteLabel" = "Filter";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */
+"17.label" = "Action";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */
+"17.paletteLabel" = "Action";
+
+/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */
+"19.label" = "Directories";
+
+/* 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 = "Move Marked to..."; ObjectID = "30"; */
+"30.title" = "Move Marked to...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */
+"31.title" = "Copy Marked to...";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */
+"32.title" = "Remove Marked from Results";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */
+"34.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */
+"35.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */
+"36.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */
+"38.title" = "Open Selected with Default Application";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */
+"39.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */
+"40.title" = "Rename Selected";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */
+"42.placeholderString" = "Filter";
+
+/* Class = "NSSegmentedCell"; 44.labels[0] = "Details"; ObjectID = "44"; */
+"44.labels[0]" = "Details";
+
+/* Class = "NSSegmentedCell"; 44.labels[1] = "Dupes Only"; ObjectID = "44"; */
+"44.labels[1]" = "Dupes Only";
+
+/* Class = "NSSegmentedCell"; 44.labels[2] = "Delta"; ObjectID = "44"; */
+"44.labels[2]" = "Delta";
+
+/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */
+"67.title" = "Menu";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
+"68.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */
+"70.title" = "Rename Selected";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */
+"71.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */
+"72.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */
+"73.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
+"74.title" = "Open Selected with Default Application";

cocoa/base/en.lproj/core.strings

@@ -0,0 +1,29 @@
+"Collecting files to scan" = "Collecting files to scan";
+"%s (%d discarded)" = "%s (%d discarded)";
+"Scanning for duplicates" = "Scanning for duplicates";
+"Loading" = "Loading";
+"Moving" = "Moving";
+"Copying" = "Copying";
+"Sending to Trash" = "Sending to Trash";
+"0 matches found" = "0 matches found";
+"%d matches found" = "%d matches found";
+"Read size of %d/%d files" = "Read size of %d/%d files";
+"Grouped %d/%d matches" = "Grouped %d/%d matches";
+"%d / %d (%s / %s) duplicates marked." = "%d / %d (%s / %s) duplicates marked.";
+" filter: %s" = " filter: %s";
+"Read size of %d/%d files" = "Read size of %d/%d files";
+"Read metadata of %d/%d files" = "Read metadata of %d/%d files";
+"Removing false matches" = "Removing false matches";
+"Processed %d/%d matches against the ignore list" = "Processed %d/%d matches against the ignore list";
+"Doing group prioritization" = "Doing group prioritization";
+
+"Analyzed %d/%d pictures" = "Analyzed %d/%d pictures";
+"Preparing for matching" = "Preparing for matching";
+"Matched %d/%d pictures" = "Matched %d/%d pictures";
+"Verified %d/%d matches" = "Verified %d/%d matches";
+
+"Removing dead tracks from your iTunes Library" = "Removing dead tracks from your iTunes Library";
+"Scanning the iTunes Library" = "Scanning the iTunes Library";
+
+"Probing iPhoto. Don't touch it during the operation!" = "Probing iPhoto. Don't touch it during the operation!";
+"Sending dupes to the Trash" = "Sending dupes to the Trash";

cocoa/base/fr.lproj/DetailsPanel.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Détails du fichier sélectionné";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Sélectionné";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Référence";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribut";

cocoa/base/fr.lproj/DirectoryPanel.strings

@@ -0,0 +1,23 @@
+/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */
+"13.headerCell.title" = "Type";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */
+"15.headerCell.title" = "Nom";
+
+/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */
+"48.title" = "Scan";
+
+/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */
+"55.title" = "Normal";
+
+/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */
+"56.title" = "Référence";
+
+/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
+"57.title" = "Exclus";
+
+/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
+"71.title" = "Sélectionnez les dossiers à scanner et cliquez sur Scan.";
+
+/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
+"73.title" = "Charger";

cocoa/base/fr.lproj/Localizable.strings

@@ -0,0 +1,63 @@
+"Add New Folder..." = "Ajouter dossier...";
+"Load from file..." = "Charger un fichier...";
+"Reset to Default" = "Colonnes par défault";
+
+"Add iTunes Directory" = "Ajouter librairie iTunes";
+"Remove Dead Tracks in iTunes" = "Retirer les tracks mortes dans iTunes";
+
+"Add iPhoto Library" = "Ajouter librairie iPhoto";
+"Clear Picture Cache" = "Vider la cache d'images";
+
+/* Columns */
+"Folder" = "Dossier";
+"Size (KB)" = "Taille (KB)";
+"Size (MB)" = "Taille (MB)";
+"Kind" = "Type";
+"Modification" = "Modification";
+"Match %" = "Match %";
+"Words Used" = "Mots";
+"Dupe Count" = "# Doublons";
+
+"Time" = "Temps";
+"Bitrate" = "Bitrate";
+"Sample Rate" = "Sample Rate";
+"Title" = "Titre";
+"Artist" = "Artiste";
+"Album" = "Album";
+"Genre" = "Genre";
+"Year" = "Année";
+"Track Number" = "Track";
+"Comment" = "Commentaire";
+
+"Dimensions" = "Dimensions";
+
+/* Messages */
+"SelectResultToLoadMsg" = "Sélectionnez un fichier résultats à charger";
+"SelectCopyDestinationMsg" = "Sélectionnez un dossier vers lequel copier les fichiers";
+"SelectMoveDestinationMsg" = "Sélectionnez un dossier vers lequel déplacer les fichiers";
+"SelectResultToSaveMsg" = "Sélectionnez un fichier résultats dans lequel sauvegarder";
+"SelectFolderToAddMsg" = "Sélectionnez un dossier à ajouter à la liste";
+"ReallyWantToQuitMsg" = "Vos résultats ne sont pas sauvegardés. Voulez-vous vraiment quitter?";
+"ReallyWantToContinueMsg" = "Vos résultats ne sont pas sauvegardés. Voulez-vous vraiment continuer?";
+"FolderAlreadyInListMsg" = "'%@' est déjà dans la liste.";
+"FolderDoesNotExistMsg" = "'%@' n'existe pas.";
+"FileRemovalConfirmMsg" = "%d fichiers seront retirés des résultats. Continuer?";
+"FilenameAlreadyExistsMsg" = "Le nom '%@' existe déjà.";
+"NoScannableFileMsg" = "Les dossiers sélectionnés ne continnent pas de fichiers valides.";
+"UnknownErrorMsg" = "Erreur inconnue.";
+"SendToTrashConfirmMsg" = "%d fichiers seront envoyés à la corbeille. Continuer?";
+"HardlinkConfirmMsg" = "%d fichiers seront envoyés à la corbeille (puis 'hardlinkés'). Continuer?";
+"ClearIgnoreListConfirmMsg" = "Voulez-vous vider la liste de fichiers ignorés des %d items qu'elle contient?";
+"IgnoreConfirmMsg" = "%d fichiers seront ignorés des prochains scans. Continuer?";
+"NoCustomCommandMsg" = "Vous n'avez pas de commande personnalisée. Ajoutez-la dans vos préférences.";
+"CopySuccessMsg" = "Tous les fichiers marqués ont été copiés correctement.";
+"MoveSuccessMsg" = "Tous les fichiers déplacés ont été copiés correctement.";
+"SendToTrashSuccessMsg" = "Tous les fichiers marqués ont été correctement envoyés à la corbeille.";
+"NoDuplicateFoundMsg" = "Aucun doublon trouvé.";
+"TaskHangingMsg" = "Une action précédente est encore en cours. Attendez quelques secondes avant d'en repartir une nouvelle.";
+
+"RemoveDeadTracksConfirmMsg" = "Votre librairie iTunes contient %d tracks mortes qui seront retirées. Continuer?";
+"NoDeadTrackMsg" = "Votre librairie iTunes ne contient aucune track morte.";
+
+"IPhotoAppNotFoundMsg" = "iPhoto n'a pas pu être trouvée dans vos applications.";
+"ClearPictureCacheConfirmMsg" = "Voulez-vous vraiment vider la cache de vos analyses précédentes?";

cocoa/base/fr.lproj/MainMenu.strings

@@ -0,0 +1,174 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Tout ramener au premier plan";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Fenêtre";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Placer dans le Dock";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Fenêtre";
+
+/* Class = "NSMenuItem"; title = "About dupeGuru"; ObjectID = "58"; */
+"58.title" = "À propos de dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Aide";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Aide";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Help"; ObjectID = "111"; */
+"111.title" = "Aide dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide dupeGuru"; ObjectID = "134"; */
+"134.title" = "Masquer dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Quit dupeGuru"; ObjectID = "136"; */
+"136.title" = "Quitter dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Masquer les autres";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Tout afficher";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Réduire/agrandir";
+
+/* Class = "NSMenuItem"; title = "Details Panel"; ObjectID = "398"; */
+"398.title" = "Fenêtre de détails";
+
+/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "541"; */
+"541.title" = "Préférences...";
+
+/* Class = "NSMenuItem"; title = "Folder Selection Window"; ObjectID = "579"; */
+"579.title" = "Fenêtre de sélection de dossiers";
+
+/* Class = "NSMenuItem"; title = "Actions"; ObjectID = "597"; */
+"597.title" = "Actions";
+
+/* Class = "NSMenu"; title = "Actions"; ObjectID = "598"; */
+"598.title" = "Actions";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "599"; */
+"599.title" = "Envoyer marqués à la corbeille";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
+"600.title" = "Déplacer marqués vers...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "601"; */
+"601.title" = "Copier marqués vers...";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "602"; */
+"602.title" = "Transformer sélectionnés en références";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "603"; */
+"603.title" = "Retirer marqués des résultats";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "605"; */
+"605.title" = "Retirer sélectionnés des résultats";
+
+/* Class = "NSMenuItem"; title = "Columns"; ObjectID = "618"; */
+"618.title" = "Colonnes";
+
+/* Class = "NSMenu"; title = "Columns"; ObjectID = "619"; */
+"619.title" = "Colonnes";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "708"; */
+"708.title" = "Ouvrir sélectionné avec l'application par défaut";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "710"; */
+"710.title" = "Révéler sélectionné dans Finder";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "922"; */
+"922.title" = "Ajouter sélectionnés à la liste de fichiers ignorés";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "924"; */
+"924.title" = "Fermer";
+
+/* Class = "NSMenuItem"; title = "Start Duplicate Scan"; ObjectID = "926"; */
+"926.title" = "Commencer à scanner";
+
+/* Class = "NSMenuItem"; title = "Clear Ignore List"; ObjectID = "927"; */
+"927.title" = "Vider la liste de fichiers ignorés";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "933"; */
+"933.title" = "Renommer sélectionné";
+
+/* Class = "NSMenuItem"; title = "Export Results to XHTML"; ObjectID = "947"; */
+"947.title" = "Exporter les résultats vers HTML";
+
+/* Class = "NSMenuItem"; title = "Check for update..."; ObjectID = "950"; */
+"950.title" = "Mise à jour...";
+
+/* Class = "NSMenuItem"; title = "Mode"; ObjectID = "959"; */
+"959.title" = "Mode";
+
+/* Class = "NSMenu"; title = "Mode"; ObjectID = "960"; */
+"960.title" = "Mode";
+
+/* Class = "NSMenuItem"; title = "Show Dupes Only"; ObjectID = "961"; */
+"961.title" = "Ne pas montrer les références";
+
+/* Class = "NSMenuItem"; title = "Show Delta Values"; ObjectID = "962"; */
+"962.title" = "Montrer les valeurs en tant que delta";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "965"; */
+"965.title" = "Édition";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "966"; */
+"966.title" = "Édition";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "985"; */
+"985.title" = "Couper";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "986"; */
+"986.title" = "Copier";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "991"; */
+"991.title" = "Coller";
+
+/* Class = "NSMenuItem"; title = "Mark All"; ObjectID = "1011"; */
+"1011.title" = "Tout marquer";
+
+/* Class = "NSMenuItem"; title = "Mark None"; ObjectID = "1012"; */
+"1012.title" = "Tout démarquer";
+
+/* Class = "NSMenuItem"; title = "Invert Marking"; ObjectID = "1013"; */
+"1013.title" = "Inverser le marquage";
+
+/* Class = "NSMenuItem"; title = "Mark Selected"; ObjectID = "1014"; */
+"1014.title" = "Marquer sélectionnés";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Website"; ObjectID = "1023"; */
+"1023.title" = "Site web de dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Invoke Custom Command"; ObjectID = "1177"; */
+"1177.title" = "Invoquer commande personnalisée";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1203"; */
+"1203.title" = "Fichier";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1204"; */
+"1204.title" = "Fichier";
+
+/* Class = "NSMenuItem"; title = "Load Results..."; ObjectID = "1205"; */
+"1205.title" = "Charger résultats...";
+
+/* Class = "NSMenuItem"; title = "Save Results..."; ObjectID = "1206"; */
+"1206.title" = "Sauvegarder résultats...";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "1227"; */
+"1227.title" = "Remplacer marqués par des hardlinks";
+
+/* Class = "NSMenuItem"; title = "Load Recent Results"; ObjectID = "1239"; */
+"1239.title" = "Charger résultats récents";
+
+/* Class = "NSMenu"; title = "Load Recent Results"; ObjectID = "1240"; */
+"1240.title" = "Charger résultats récents";
+
+/* Class = "NSMenuItem"; title = "Results Window"; ObjectID = "1272"; */
+"1272.title" = "Fenêtre de résultats";

cocoa/base/fr.lproj/ProblemDialog.strings

@@ -0,0 +1,19 @@
+
+/* Class = "NSWindow"; title = "Problems!"; ObjectID = "1"; */
+"1.title" = "Problèmes!";
+
+/* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */
+"4.title" = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results.";
+"4.title" = "Il y a eu des problèmes lors du traitement de certain (ou tous) fichiers. La cause de ces problèmes est décrite ci-dessous. Ces fichiers n'ont pas été enlevés des résultats.";
+
+/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */
+"10.headerCell.title" = "Chemin du fichier";
+
+/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */
+"11.headerCell.title" = "Message d'erreur";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Fermer";
+
+/* Class = "NSButtonCell"; title = "Reveal Selected"; ObjectID = "21"; */
+"21.title" = "Révéler Fichier";

cocoa/base/fr.lproj/ResultWindow.strings

@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */
+"1.title" = "dupeGuru (Résultats)";
+
+/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */
+"6.title" = "Marqués: 0 fichiers, 0 B. Total: 0 fichiers, 0 B.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "11"; */
+"11.headerCell.title" = "Nom";
+
+/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
+"15.label" = "Options";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */
+"15.paletteLabel" = "Options";
+
+/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */
+"16.label" = "Filtre";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */
+"16.paletteLabel" = "Filtre";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */
+"17.label" = "Action";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */
+"17.paletteLabel" = "Action";
+
+/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */
+"19.label" = "Dossiers";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
+"19.paletteLabel" = "Dossiers";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "27"; */
+"27.title" = "Remplacer marqués par des hardlinks";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
+"29.title" = "Envoyer marqués à la corbeille";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
+"30.title" = "Déplacer marqués vers...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */
+"31.title" = "Copier marqués vers...";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */
+"32.title" = "Retirer marqués des résultats";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */
+"34.title" = "Retirer sélectionnés des résultats";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */
+"35.title" = "Ajouter sélectionnés à la liste de fichiers ignorés";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */
+"36.title" = "Transformer sélectionnés en références";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */
+"38.title" = "Ouvrir sélectionné avec l'application par défaut";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */
+"39.title" = "Révéler sélectionné dans Finder";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */
+"40.title" = "Renommer sélectionné";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */
+"42.placeholderString" = "Filtre";
+
+/* Class = "NSSegmentedCell"; 44.labels[0] = "Details"; ObjectID = "44"; */
+"44.labels[0]" = "Détails";
+
+/* Class = "NSSegmentedCell"; 44.labels[1] = "Dupes Only"; ObjectID = "44"; */
+"44.labels[1]" = "Sans réf.";
+
+/* Class = "NSSegmentedCell"; 44.labels[2] = "Delta"; ObjectID = "44"; */
+"44.labels[2]" = "Delta";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
+"68.title" = "Ajouter sélectionnés à la liste de fichiers ignorés";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */
+"70.title" = "Renommer sélectionné";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */
+"71.title" = "Retirer sélectionnés des résultats";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */
+"72.title" = "Transformer sélectionnés en références";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */
+"73.title" = "Révéler sélectionné dans Finder";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
+"74.title" = "Ouvrir sélectionné avec l'application par défaut";

cocoa/base/fr.lproj/core.strings

@@ -0,0 +1,28 @@
+"Collecting files to scan" = "Collecte des fichiers à scanner";
+"%s (%d discarded)" = "%s (%d hors-groupe)";
+"Scanning for duplicates" = "Scan de doublons en cours";
+"Loading" = "Chargement en cours";
+"Moving" = "Déplacement en cours";
+"Copying" = "Copie en cours";
+"Sending to Trash" = "Envoi vers corbeille";
+"0 matches found" = "0 paires trouvées";
+"%d matches found" = "%d paires trouvées";
+"Read size of %d/%d files" = "Lu la taille de %d/%d fichiers";
+"Grouped %d/%d matches" = "%d/%d paires groupées";
+"%d / %d (%s / %s) duplicates marked." = "%d / %d (%s / %s) doublons marqués.";
+" filter: %s" = " filtre: %s";
+"Read metadata of %d/%d files" = "Lu les métadonnées de %d/%d fichiers";
+"Removing false matches" = "Retrait des paires invalides";
+"Processed %d/%d matches against the ignore list" = "Vérification de %d/%d paires dans la ignore list";
+"Doing group prioritization" = "Prioritization des groupes";
+
+"Analyzed %d/%d pictures" = "Analyzé %d/%d images";
+"Preparing for matching" = "Préparation pour la comparaison";
+"Matched %d/%d pictures" = "Comparé %d/%d images";
+"Verified %d/%d matches" = "Vérifié %d/%d paires";
+
+"Removing dead tracks from your iTunes Library" = "Retrait des tracks mortes de votre librairie iTunes";
+"Scanning the iTunes Library" = "Scan de la librairie iTunes en cours";
+
+"Probing iPhoto. Don't touch it during the operation!" = "Communication avec iPhoto en cours. N'y touchez pas!";
+"Sending dupes to the Trash" = "Envoi de doublons à la corbeille en cours";

cocoa/me/AppDelegate.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -12,8 +12,5 @@ http://www.hardcoded.net/licenses/hs_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
 - (PyDupeGuru *)py;
 @end

cocoa/me/AppDelegate.m

@@ -1,19 +1,19 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
-#import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
-#import "../../cocoalib/Utils.h"
-#import "../../cocoalib/ValueTransformers.h"
-#import "../../cocoalib/Dialogs.h"
+#import "ProgressController.h"
+#import "Utils.h"
+#import "ValueTransformers.h"
+#import "Dialogs.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "ResultWindow.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -28,6 +28,7 @@ http://www.hardcoded.net/licenses/hs_license
     [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
     [d setObject:b2n(YES) forKey:@"mixFileKind"];
     [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"];
     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
     [d setObject:b2n(NO) forKey:@"debug"];
     [d setObject:b2n(NO) forKey:@"scanTagTrack"];
@@ -56,32 +57,30 @@ http://www.hardcoded.net/licenses/hs_license
     return self;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_me"]];
+    return @"http://www.hardcoded.net/dupeguru_me/";
 }
 
-- (IBAction)toggleDirectories:(id)sender
+- (ResultWindowBase *)createResultWindow
 {
-    [[self directoryPanel] toggleVisible:sender];
+    return [[ResultWindow alloc] initWithParentApp:self];
 }
 
-- (DirectoryPanel *)directoryPanel
+- (DirectoryPanel *)createDirectoryPanel
 {
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanelME alloc] initWithParentApp:self];
-    return _directoryPanel;
+    return [[DirectoryPanelME alloc] initWithParentApp:self];
 }
+
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 3 is just after "Export Results to XHTML"
-    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Remove Dead Tracks in iTunes" 
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Remove Dead Tracks in iTunes")
         action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3];
-    [mi setTarget:result];
+    [mi setTarget:[self resultWindow]];
     [super applicationDidFinishLaunching:aNotification];
 }
 @end

cocoa/me/Consts.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "../base/Consts.h"

cocoa/me/DirectoryPanel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/me/DirectoryPanel.m

@@ -1,31 +1,34 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
+#import "Consts.h"
 
 @implementation DirectoryPanelME
+- (id)initWithParentApp:(id)aParentApp
+{
+    self = [super initWithParentApp:aParentApp];
+    [[self window] setTitle:@"dupeGuru Music Edition"];
+    _alwaysShowPopUp = YES;
+    return self;
+}
+
+- (void)fillPopUpMenu
+{
+    [super fillPopUpMenu];
+    NSMenu *m = [addButtonPopUp menu];
+    NSMenuItem *mi = [m insertItemWithTitle:TR(@"Add iTunes Directory") action:@selector(addiTunes:)
+        keyEquivalent:@"" atIndex:1];
+    [mi setTarget:self];
+}
+
 - (IBAction)addiTunes:(id)sender
 {
     [self addDirectory:[@"~/Music/iTunes/iTunes Music" stringByExpandingTildeInPath]];
 }
-
-- (IBAction)popupAddDirectoryMenu:(id)sender
-{
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    mi = [m addItemWithTitle:@"Add iTunes Directory" action:@selector(addiTunes:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem: nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-}
 @end

cocoa/me/InfoTemplate.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.2</string>
+	<string>{version}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/me/PyDupeGuru.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/me/ResultWindow.h

@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "../base/ResultWindow.h"
-#import "DirectoryPanel.h"
 
 @interface ResultWindow : ResultWindowBase {}
 - (IBAction)removeDeadTracks:(id)sender;

cocoa/me/ResultWindow.m

@@ -1,28 +1,65 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
-#import "../../cocoalib/Dialogs.h"
-#import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
-#import "../../cocoalib/Utils.h"
-#import "AppDelegate.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "PyDupeGuru.h"
 #import "Consts.h"
 
 @implementation ResultWindow
 /* Override */
-- (void)awakeFromNib
+- (void)setScanOptions
 {
-    [super awakeFromNib];
-    [[self window] setTitle:@"dupeGuru Music Edition"];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)];
-    [deltaColumns removeIndex:6];
-    [outline setDeltaColumns:deltaColumns];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setScanType:[ud objectForKey:@"scanType"]];
+    [_py enable:[ud objectForKey:@"scanTagTrack"] scanForTag:@"track"];
+    [_py enable:[ud objectForKey:@"scanTagArtist"] scanForTag:@"artist"];
+    [_py enable:[ud objectForKey:@"scanTagAlbum"] scanForTag:@"album"];
+    [_py enable:[ud objectForKey:@"scanTagTitle"] scanForTag:@"title"];
+    [_py enable:[ud objectForKey:@"scanTagGenre"] scanForTag:@"genre"];
+    [_py enable:[ud objectForKey:@"scanTagYear"] scanForTag:@"year"];
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
+    [_py setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [_py setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
+}
+
+- (void)initResultColumns
+{
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:TR(@"Folder") width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:TR(@"Size (MB)") width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    NSTableColumn *timeCol = [self getColumnForIdentifier:3 title:TR(@"Time") width:50 refCol:refCol];
+    [[timeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:timeCol];
+    NSTableColumn *brCol = [self getColumnForIdentifier:4 title:TR(@"Bitrate") width:50 refCol:refCol];
+    [[brCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:brCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:TR(@"Sample Rate") width:60 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:TR(@"Kind") width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:TR(@"Modification") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:8 title:TR(@"Title") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:9 title:TR(@"Artist") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:10 title:TR(@"Album") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:11 title:TR(@"Genre") width:80 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:12 title:TR(@"Year") width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:13 title:TR(@"Track Number") width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:14 title:TR(@"Comment") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:15 title:TR(@"Match %") width:57 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:16 title:TR(@"Words Used") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:17 title:TR(@"Dupe Count") width:80 refCol:refCol]];
 }
 
 /* Actions */
@@ -38,95 +75,32 @@ http://www.hardcoded.net/licenses/hs_license
     [columnsOrder addObject:@"2"];
     [columnsOrder addObject:@"3"];
     [columnsOrder addObject:@"4"];
-    [columnsOrder addObject:@"16"];
+    [columnsOrder addObject:@"6"];
+    [columnsOrder addObject:@"15"];
     NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(214) forKey:@"0"];
+    [columnsWidth setObject:i2n(235) forKey:@"0"];
     [columnsWidth setObject:i2n(63) forKey:@"2"];
     [columnsWidth setObject:i2n(50) forKey:@"3"];
     [columnsWidth setObject:i2n(50) forKey:@"4"];
-    [columnsWidth setObject:i2n(57) forKey:@"16"];
+    [columnsWidth setObject:i2n(40) forKey:@"6"];
+    [columnsWidth setObject:i2n(57) forKey:@"15"];
     [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
 }
 
-- (IBAction)startDuplicateScan:(id)sender
-{
-    if ([matches numberOfRows] > 0)
-    {
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    PyDupeGuru *_py = (PyDupeGuru *)py;
-    [_py setScanType:[ud objectForKey:@"scanType"]];
-    [_py enable:[ud objectForKey:@"scanTagTrack"] scanForTag:@"track"];
-    [_py enable:[ud objectForKey:@"scanTagArtist"] scanForTag:@"artist"];
-    [_py enable:[ud objectForKey:@"scanTagAlbum"] scanForTag:@"album"];
-    [_py enable:[ud objectForKey:@"scanTagTitle"] scanForTag:@"title"];
-    [_py enable:[ud objectForKey:@"scanTagGenre"] scanForTag:@"genre"];
-    [_py enable:[ud objectForKey:@"scanTagYear"] scanForTag:@"year"];
-    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
-    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
-    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
-    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
-    NSInteger r = n2i([py doScan]);
-    if (r == 1)
-        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
-    if (r == 3)
-    {
-        [Dialogs showMessage:@"The selected directories contain no scannable file."];
-        [app toggleDirectories:nil];
-    }
-}
-
-/* Public */
-- (void)initResultColumns
-{
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    _resultColumns = [[NSMutableArray alloc] init];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (MB)" width:63 refCol:refCol];
-    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:sizeCol];
-    NSTableColumn *timeCol = [self getColumnForIdentifier:3 title:@"Time" width:50 refCol:refCol];
-    [[timeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:timeCol];
-    NSTableColumn *brCol = [self getColumnForIdentifier:4 title:@"Bitrate" width:50 refCol:refCol];
-    [[brCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:brCol];
-    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Sample Rate" width:60 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Kind" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Creation" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:9 title:@"Title" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:10 title:@"Artist" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:11 title:@"Album" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:12 title:@"Genre" width:80 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:13 title:@"Year" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:14 title:@"Track Number" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:15 title:@"Comment" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:16 title:@"Match %" width:57 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:17 title:@"Words Used" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:18 title:@"Dupe Count" width:80 refCol:refCol]];
-}
-
 /* Notifications */
 - (void)jobCompleted:(NSNotification *)aNotification
 {
     [super jobCompleted:aNotification];
     id lastAction = [[ProgressController mainProgressController] jobId];
-    if ([lastAction isEqualTo:jobScanDeadTracks])
-    {
+    if ([lastAction isEqualTo:jobScanDeadTracks]) {
         NSInteger deadTrackCount = [(PyDupeGuru *)py deadTrackCount];
-        if (deadTrackCount > 0)
-        {
-            NSString *msg = @"Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+        if (deadTrackCount > 0) {
+            NSString *msg = TR(@"RemoveDeadTracksConfirmMsg");
             if ([Dialogs askYesNo:[NSString stringWithFormat:msg,deadTrackCount]] == NSAlertFirstButtonReturn)
                 [(PyDupeGuru *)py removeDeadTracks];
         }
-        else
-        {
-            [Dialogs showMessage:@"You have no dead tracks in your iTunes Library"];
+        else {
+            [Dialogs showMessage:TR(@"NoDeadTrackMsg")];
         }
     }
 }

cocoa/me/dg_cocoa.py

@@ -1,19 +1,18 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
-from hsutil.cocoa import signature
+from hscommon.trans import install_cocoa_trans
+install_cocoa_trans()
+
+from hscommon.cocoa import signature
 
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_me.app_cocoa import DupeGuruME
-from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
-    SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
-
-# Fix py2app imports which chokes on relative imports
-from core_me import app_cocoa, data, fs, scanner
-from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+from core_me import __appname__
+from core.scanner import ScanType
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
@@ -39,12 +38,12 @@ class PyDupeGuru(PyDupeGuruBase):
     def setScanType_(self, scan_type):
         try:
             self.py.scanner.scan_type = [
-                SCAN_TYPE_FILENAME,
-                SCAN_TYPE_FIELDS,
-                SCAN_TYPE_FIELDS_NO_ORDER,
-                SCAN_TYPE_TAG,
-                SCAN_TYPE_CONTENT,
-                SCAN_TYPE_CONTENT_AUDIO
+                ScanType.Filename,
+                ScanType.Fields,
+                ScanType.FieldsNoOrder,
+                ScanType.Tag,
+                ScanType.Contents,
+                ScanType.ContentsAudio,
             ][scan_type]
         except IndexError:
             pass
@@ -63,5 +62,5 @@ class PyDupeGuru(PyDupeGuruBase):
     
     #---Registration
     def appName(self):
-        return "dupeGuru Music Edition"
+        return __appname__
     

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -29,40 +29,47 @@
 		CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */; };
 		CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */; };
 		CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */; };
-		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
-		CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0B3D6611243F83009A7A30 /* ResultOutline.m */; };
+		CE05331712E5D3ED0029EF25 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330D12E5D3ED0029EF25 /* DetailsPanel.xib */; };
+		CE05331812E5D3ED0029EF25 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05330F12E5D3ED0029EF25 /* DirectoryPanel.xib */; };
+		CE05331912E5D3ED0029EF25 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331112E5D3ED0029EF25 /* MainMenu.xib */; };
+		CE05331A12E5D3ED0029EF25 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */; };
+		CE05331B12E5D3ED0029EF25 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05331512E5D3ED0029EF25 /* ResultWindow.xib */; };
+		CE05332312E5D4100029EF25 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05332112E5D4100029EF25 /* Preferences.xib */; };
+		CE05332F12E5D6100029EF25 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE05332D12E5D6100029EF25 /* Localizable.strings */; };
+		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
+		CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */; };
+		CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */; };
 		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 */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
-		CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD11094637800B72D77 /* DetailsPanel.xib */; };
-		CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */; };
+		CE45274F12E5F62D00005A15 /* core.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE45274D12E5F62D00005A15 /* core.strings */; };
 		CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */; };
 		CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */; };
 		CE4B59C91119919700C06C9E /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C61119919700C06C9E /* progress.xib */; };
-		CE4B59CA1119919700C06C9E /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C71119919700C06C9E /* registration.xib */; };
+		CE4F934612CCA9470067A3AE /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4F934512CCA9470067A3AE /* about.xib */; };
+		CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4F934812CCA96C0067A3AE /* HSAboutBox.m */; };
 		CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE10FC6C12E00EC695D /* Dialogs.m */; };
 		CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */; };
 		CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE70FC6C12E00EC695D /* ProgressController.m */; };
-		CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */; };
-		CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */; };
 		CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF00FC6C12E00EC695D /* Utils.m */; };
 		CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF20FC6C12E00EC695D /* ValueTransformers.m */; };
 		CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E160FC6C19300EC695D /* AppDelegate.m */; };
 		CE515E1E0FC6C19300EC695D /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E190FC6C19300EC695D /* DirectoryPanel.m */; };
 		CE515E1F0FC6C19300EC695D /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E1C0FC6C19300EC695D /* ResultWindow.m */; };
+		CE578303124DFC660004769C /* HSTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE578302124DFC660004769C /* HSTableView.m */; };
 		CE6032C00FE6784C007E33FF /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6032BF0FE6784C007E33FF /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */; };
+		CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */; };
+		CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
-		CE900AD2109B238600754048 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD1109B238600754048 /* Preferences.xib */; };
-		CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD6109B2A9B00754048 /* MainMenu.xib */; };
+		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 */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
-		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
-		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -82,7 +89,7 @@
 /* Begin PBXFileReference section */
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
@@ -97,7 +104,6 @@
 		CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
 		CE003CBC11242D00004B0AA7 /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
 		CE003CBD11242D00004B0AA7 /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
-		CE003CBE11242D00004B0AA7 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
 		CE003CC011242D00004B0AA7 /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
 		CE003CC111242D00004B0AA7 /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
 		CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
@@ -107,23 +113,45 @@
 		CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
 		CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = ../../help_me/dupeguru_me_help; sourceTree = "<group>"; };
-		CE0B3D6411243F83009A7A30 /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
-		CE0B3D6511243F83009A7A30 /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
-		CE0B3D6611243F83009A7A30 /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
+		CE05330E12E5D3ED0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE05331012E5D3ED0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE05331212E5D3ED0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE05331412E5D3ED0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE05331612E5D3ED0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE05331C12E5D4010029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE05331D12E5D4010029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE05331E12E5D4010029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE05331F12E5D4010029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE05332012E5D4010029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE05332212E5D4100029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE05332912E5D4460029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE05332E12E5D6100029EF25 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE05333312E5D6370029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE05347712E5DC420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
+		CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = "<group>"; };
+		CE0A0BFE1175A1C000DCA3C6 /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
+		CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE0A0C011175A1DE00DCA3C6 /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE0A0C031175A1DE00DCA3C6 /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0A0C131175A28100DCA3C6 /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3FBDD11094637800B72D77 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
-		CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
+		CE45274E12E5F62D00005A15 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE45275012E5F63900005A15 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/core.strings; sourceTree = SOURCE_ROOT; };
 		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
 		CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE4B59C61119919700C06C9E /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
-		CE4B59C71119919700C06C9E /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
+		CE4F934512CCA9470067A3AE /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CE4F934712CCA96C0067A3AE /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CE4F934812CCA96C0067A3AE /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
 		CE515DE10FC6C12E00EC695D /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
@@ -131,10 +159,6 @@
 		CE515DE60FC6C12E00EC695D /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE515DE70FC6C12E00EC695D /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -147,24 +171,27 @@
 		CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 		CE515E1B0FC6C19300EC695D /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE515E1C0FC6C19300EC695D /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CE578301124DFC660004769C /* HSTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSTableView.h; path = ../../cocoalib/views/HSTableView.h; sourceTree = SOURCE_ROOT; };
+		CE578302124DFC660004769C /* HSTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSTableView.m; path = ../../cocoalib/views/HSTableView.m; sourceTree = SOURCE_ROOT; };
 		CE6032BE0FE6784C007E33FF /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE6032BF0FE6784C007E33FF /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
 		CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
+		CE74A12112537F06008A8DF0 /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
+		CE74A12312537F06008A8DF0 /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE74A12612537F2E008A8DF0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
-		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
-		CE900AD6109B2A9B00754048 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
-		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
-		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
+		CEB14D26124DFC2800FA7481 /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; };
+		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; };
 		CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CEDF07A1112493B200EE5BC0 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CEDF07A2112493B200EE5BC0 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -181,21 +208,20 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
+		080E96DDFE201D6D7F000001 /* DGME */ = {
 			isa = PBXGroup;
 			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
 				CE848A1809DD85810004CB44 /* Consts.h */,
-				CECA899A09DB132E00A3D774 /* DetailsPanel.h */,
-				CECA899B09DB132E00A3D774 /* DetailsPanel.m */,
 				CE68EE6509ABC48000971085 /* DirectoryPanel.h */,
 				CE68EE6609ABC48000971085 /* DirectoryPanel.m */,
 				CEFF18A009A4D387005E6321 /* PyDupeGuru.h */,
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
 			);
-			name = Classes;
+			name = DGME;
 			sourceTree = "<group>";
 		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
@@ -228,10 +254,9 @@
 		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
 			isa = PBXGroup;
 			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
+				080E96DDFE201D6D7F000001 /* DGME */,
 				CE515E140FC6C17900EC695D /* dgbase */,
 				CE515DDD0FC6C09400EC695D /* cocoalib */,
-				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
@@ -239,22 +264,16 @@
 			name = dupeguru;
 			sourceTree = "<group>";
 		};
-		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				29B97316FDCFA39411CA2CEA /* main.m */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				CE3FBDD01094637800B72D77 /* xib */,
-				CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */,
+				CE073F5409CAE1A3005C1D2F /* help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
+				CE05330C12E5D3D70029EF25 /* xib */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
+				CE05332D12E5D6100029EF25 /* Localizable.strings */,
+				CE45274D12E5F62D00005A15 /* core.strings */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */,
 			);
@@ -277,6 +296,8 @@
 				CE003CB411242D00004B0AA7 /* HSGUIController.m */,
 				CE003CB511242D00004B0AA7 /* HSOutline.h */,
 				CE003CB611242D00004B0AA7 /* HSOutline.m */,
+				CE0A0BFE1175A1C000DCA3C6 /* HSTable.h */,
+				CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */,
 				CE003CB711242D00004B0AA7 /* HSWindowController.h */,
 				CE003CB811242D00004B0AA7 /* HSWindowController.m */,
 			);
@@ -289,6 +310,7 @@
 			children = (
 				CE003CBC11242D00004B0AA7 /* PyGUI.h */,
 				CE003CBD11242D00004B0AA7 /* PyOutline.h */,
+				CE0A0C131175A28100DCA3C6 /* PyTable.h */,
 			);
 			name = proxies;
 			path = ../../cocoalib/proxies;
@@ -297,6 +319,8 @@
 		CE003CBF11242D00004B0AA7 /* views */ = {
 			isa = PBXGroup;
 			children = (
+				CE578301124DFC660004769C /* HSTableView.h */,
+				CE578302124DFC660004769C /* HSTableView.m */,
 				CE003CC011242D00004B0AA7 /* HSOutlineView.h */,
 				CE003CC111242D00004B0AA7 /* HSOutlineView.m */,
 				CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */,
@@ -308,15 +332,17 @@
 			path = ../../cocoalib/views;
 			sourceTree = SOURCE_ROOT;
 		};
-		CE3FBDD01094637800B72D77 /* xib */ = {
+		CE05330C12E5D3D70029EF25 /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CE900AD6109B2A9B00754048 /* MainMenu.xib */,
-				CE3FBDD11094637800B72D77 /* DetailsPanel.xib */,
-				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */,
-				CE900AD1109B238600754048 /* Preferences.xib */,
+				CE05330D12E5D3ED0029EF25 /* DetailsPanel.xib */,
+				CE05330F12E5D3ED0029EF25 /* DirectoryPanel.xib */,
+				CE05331112E5D3ED0029EF25 /* MainMenu.xib */,
+				CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */,
+				CE05331512E5D3ED0029EF25 /* ResultWindow.xib */,
+				CE05332112E5D4100029EF25 /* Preferences.xib */,
 			);
-			path = xib;
+			name = xib;
 			sourceTree = "<group>";
 		};
 		CE49DEF10FDFEB810098617B /* brsinglelineformatter */ = {
@@ -332,9 +358,10 @@
 		CE4B59C41119919700C06C9E /* xib */ = {
 			isa = PBXGroup;
 			children = (
+				CE4F934512CCA9470067A3AE /* about.xib */,
+				CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */,
 				CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */,
 				CE4B59C61119919700C06C9E /* progress.xib */,
-				CE4B59C71119919700C06C9E /* registration.xib */,
 			);
 			name = xib;
 			path = ../../cocoalib/xib;
@@ -352,16 +379,18 @@
 				CE515DE10FC6C12E00EC695D /* Dialogs.m */,
 				CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */,
 				CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */,
+				CE74A12112537F06008A8DF0 /* HSFairwareReminder.h */,
+				CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */,
+				CE74A12312537F06008A8DF0 /* PyFairware.h */,
+				CE4F934712CCA96C0067A3AE /* HSAboutBox.h */,
+				CE4F934812CCA96C0067A3AE /* HSAboutBox.m */,
+				CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */,
+				CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */,
 				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
 				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
-				CE003CBE11242D00004B0AA7 /* PyRegistrable.h */,
-				CE515DE90FC6C12E00EC695D /* RecentDirectories.h */,
-				CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */,
-				CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */,
-				CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */,
 				CE515DEF0FC6C12E00EC695D /* Utils.h */,
 				CE515DF00FC6C12E00EC695D /* Utils.m */,
 				CE515DF10FC6C12E00EC695D /* ValueTransformers.h */,
@@ -373,6 +402,9 @@
 		CE515E140FC6C17900EC695D /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CEB14D26124DFC2800FA7481 /* PyResultTable.h */,
+				CEB14D27124DFC2800FA7481 /* ResultTable.h */,
+				CEB14D28124DFC2800FA7481 /* ResultTable.m */,
 				CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */,
 				CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */,
 				CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */,
@@ -383,15 +415,15 @@
 				CE6032BF0FE6784C007E33FF /* DetailsPanel.m */,
 				CE515E180FC6C19300EC695D /* DirectoryPanel.h */,
 				CE515E190FC6C19300EC695D /* DirectoryPanel.m */,
+				CE0A0C011175A1DE00DCA3C6 /* ProblemDialog.h */,
+				CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */,
 				CE515E1B0FC6C19300EC695D /* ResultWindow.h */,
 				CE515E1C0FC6C19300EC695D /* ResultWindow.m */,
-				CE0B3D6511243F83009A7A30 /* ResultOutline.h */,
-				CE0B3D6611243F83009A7A30 /* ResultOutline.m */,
 				CEDF07A1112493B200EE5BC0 /* StatsLabel.h */,
 				CEDF07A2112493B200EE5BC0 /* StatsLabel.m */,
 				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
 				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
-				CE0B3D6411243F83009A7A30 /* PyResultTree.h */,
+				CE0A0C031175A1DE00DCA3C6 /* PyProblemDialog.h */,
 				CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
@@ -400,8 +432,6 @@
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				CEFC295309C89FF200D9F998 /* details32.png */,
-				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
 			);
 			name = images;
@@ -437,7 +467,16 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+				fr,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -453,19 +492,22 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
-				CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */,
+				CE073F6309CAE1A3005C1D2F /* help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
-				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
-				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
 				CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */,
-				CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */,
-				CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */,
-				CE900AD2109B238600754048 /* Preferences.xib in Resources */,
-				CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */,
 				CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */,
 				CE4B59C91119919700C06C9E /* progress.xib in Resources */,
-				CE4B59CA1119919700C06C9E /* registration.xib in Resources */,
+				CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */,
+				CE4F934612CCA9470067A3AE /* about.xib in Resources */,
+				CE05331712E5D3ED0029EF25 /* DetailsPanel.xib in Resources */,
+				CE05331812E5D3ED0029EF25 /* DirectoryPanel.xib in Resources */,
+				CE05331912E5D3ED0029EF25 /* MainMenu.xib in Resources */,
+				CE05331A12E5D3ED0029EF25 /* ProblemDialog.xib in Resources */,
+				CE05331B12E5D3ED0029EF25 /* ResultWindow.xib in Resources */,
+				CE05332312E5D4100029EF25 /* Preferences.xib in Resources */,
+				CE05332F12E5D6100029EF25 /* Localizable.strings in Resources */,
+				CE45274F12E5F62D00005A15 /* core.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -483,8 +525,6 @@
 				CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */,
 				CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */,
 				CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */,
-				CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */,
-				CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */,
 				CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */,
 				CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */,
 				CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */,
@@ -500,13 +540,104 @@
 				CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */,
 				CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */,
 				CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */,
-				CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */,
 				CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */,
+				CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */,
+				CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */,
+				CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */,
+				CE578303124DFC660004769C /* HSTableView.m in Sources */,
+				CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */,
+				CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */,
+				CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXVariantGroup section */
+		CE05330D12E5D3ED0029EF25 /* DetailsPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05330E12E5D3ED0029EF25 /* en */,
+				CE05331C12E5D4010029EF25 /* fr */,
+			);
+			name = DetailsPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05330F12E5D3ED0029EF25 /* DirectoryPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05331012E5D3ED0029EF25 /* en */,
+				CE05331D12E5D4010029EF25 /* fr */,
+			);
+			name = DirectoryPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05331112E5D3ED0029EF25 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05331212E5D3ED0029EF25 /* en */,
+				CE05331E12E5D4010029EF25 /* fr */,
+			);
+			name = MainMenu.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05331412E5D3ED0029EF25 /* en */,
+				CE05331F12E5D4010029EF25 /* fr */,
+			);
+			name = ProblemDialog.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05331512E5D3ED0029EF25 /* ResultWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05331612E5D3ED0029EF25 /* en */,
+				CE05332012E5D4010029EF25 /* fr */,
+			);
+			name = ResultWindow.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05332112E5D4100029EF25 /* Preferences.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05332212E5D4100029EF25 /* en */,
+				CE05332912E5D4460029EF25 /* fr */,
+			);
+			name = Preferences.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05332D12E5D6100029EF25 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05332E12E5D6100029EF25 /* en */,
+				CE05333312E5D6370029EF25 /* fr */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		CE45274D12E5F62D00005A15 /* core.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE45274E12E5F62D00005A15 /* en */,
+				CE45275012E5F63900005A15 /* fr */,
+			);
+			name = core.strings;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE74A12612537F2E008A8DF0 /* en */,
+				CE05347712E5DC420029EF25 /* fr */,
+			);
+			name = FairwareReminder.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;

cocoa/me/fr.lproj/Preferences.strings

@@ -0,0 +1,102 @@
+
+/* Class = "NSWindow"; title = "dupeGuru ME Preferences"; ObjectID = "2"; */
+"2.title" = "Préférences de dupeGuru ME";
+
+/* Class = "NSTextFieldCell"; title = "More results"; ObjectID = "29"; */
+"29.title" = "+ de doubles";
+
+/* Class = "NSTextFieldCell"; title = "Fewer results"; ObjectID = "30"; */
+"30.title" = "- de doubles";
+
+/* Class = "NSTextFieldCell"; title = "Filter hardness:"; ObjectID = "31"; */
+"31.title" = "Seuil du filtre:";
+
+/* Class = "NSTextFieldCell"; title = "Scan type:"; ObjectID = "32"; */
+"32.title" = "Type de scan:";
+
+/* Class = "NSMenuItem"; title = "Content"; ObjectID = "35"; */
+"35.title" = "Contenu";
+
+/* Class = "NSMenuItem"; title = "Filename"; ObjectID = "36"; */
+"36.title" = "Nom de fichier";
+
+/* Class = "NSMenuItem"; title = "Filename - Fields"; ObjectID = "37"; */
+"37.title" = "Nom de fichier (Champs)";
+
+/* Class = "NSMenuItem"; title = "Tags"; ObjectID = "38"; */
+"38.title" = "Tags";
+
+/* Class = "NSMenuItem"; title = "Audio Content"; ObjectID = "39"; */
+"39.title" = "Contenu Audio";
+
+/* Class = "NSMenuItem"; title = "Filename - Fields (No Order)"; ObjectID = "40"; */
+"40.title" = "Nom de fichier (Champs sans ordre)";
+
+/* Class = "NSButtonCell"; title = "Word weighting"; ObjectID = "41"; */
+"41.title" = "Proportionalité des mots";
+
+/* Class = "NSButtonCell"; title = "Can mix file kind"; ObjectID = "42"; */
+"42.title" = "Comparer les fichiers de différents types";
+
+/* Class = "NSButtonCell"; title = "Reset to Defaults"; ObjectID = "45"; */
+"45.title" = "Options par défaut";
+
+/* Class = "NSButtonCell"; title = "Match similar words"; ObjectID = "46"; */
+"46.title" = "Comparer les mots similaires";
+
+/* Class = "NSTextFieldCell"; title = "Copy and Move:"; ObjectID = "54"; */
+"54.title" = "Déplacements de fichiers:";
+
+/* Class = "NSMenuItem"; title = "Recreate relative path"; ObjectID = "57"; */
+"57.title" = "Re-créer chemins relatifs";
+
+/* Class = "NSMenuItem"; title = "Recreate absolute path"; ObjectID = "58"; */
+"58.title" = "Re-créer chemins absolus";
+
+/* Class = "NSMenuItem"; title = "Right in destination"; ObjectID = "59"; */
+"59.title" = "Directement à la destination";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "60"; */
+"60.title" = "Vérifier automatiquement les mises à jour";
+
+/* Class = "NSButtonCell"; title = "Use regular expressions when filtering"; ObjectID = "61"; */
+"61.title" = "Utiliser les expressions régulières pour les filtres";
+
+/* Class = "NSButtonCell"; title = "Remove empty folders after delete and move"; ObjectID = "62"; */
+"62.title" = "Effacer les dossiers vides après un déplacement";
+
+/* Class = "NSTextFieldCell"; title = "Tags to scan:"; ObjectID = "63"; */
+"63.title" = "Tags à scanner:";
+
+/* Class = "NSButtonCell"; title = "Track"; ObjectID = "64"; */
+"64.title" = "Track";
+
+/* Class = "NSButtonCell"; title = "Artist"; ObjectID = "65"; */
+"65.title" = "Artiste";
+
+/* Class = "NSButtonCell"; title = "Album"; ObjectID = "66"; */
+"66.title" = "Album";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "67"; */
+"67.title" = "Titre";
+
+/* Class = "NSButtonCell"; title = "Genre"; ObjectID = "68"; */
+"68.title" = "Genre";
+
+/* Class = "NSButtonCell"; title = "Year"; ObjectID = "69"; */
+"69.title" = "Année";
+
+/* Class = "NSTabViewItem"; label = "Basic"; ObjectID = "116"; */
+"116.label" = "Simple";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "117"; */
+"117.label" = "Avancé";
+
+/* Class = "NSTextFieldCell"; title = "Custom Command (arguments: %d for dupe, %r for ref):"; ObjectID = "121"; */
+"121.title" = "Commande perso. (arguments: %d pour doublon, %r pour réf):";
+
+/* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "126"; */
+"126.title" = "Ignorer doublons avec hardlink vers le même fichier";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "130"; */
+"130.title" = "Mode de déboguage (redémarrage requis)";

cocoa/me/main.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/pe/AppDelegate.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -11,8 +11,5 @@ http://www.hardcoded.net/licenses/hs_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
 - (PyDupeGuru *)py;
 @end

cocoa/pe/AppDelegate.m

@@ -1,19 +1,19 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
 #import "ValueTransformers.h"
 #import "Consts.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "ResultWindow.h"
 
 @implementation AppDelegate
 + (void)initialize
@@ -25,6 +25,7 @@ http://www.hardcoded.net/licenses/hs_license
     [d setObject:[NSNumber numberWithBool:NO] forKey:@"matchScaled"];
     [d setObject:[NSNumber numberWithBool:YES] forKey:@"mixFileKind"];
     [d setObject:[NSNumber numberWithBool:NO] forKey:@"useRegexpFilter"];
+    [d setObject:[NSNumber numberWithBool:NO] forKey:@"ignoreHardlinkMatches"];
     [d setObject:[NSNumber numberWithBool:NO] forKey:@"removeEmptyFolders"];
     [d setObject:[NSNumber numberWithBool:NO] forKey:@"debug"];
     [d setObject:[NSArray array] forKey:@"recentDirectories"];
@@ -34,45 +35,35 @@ http://www.hardcoded.net/licenses/hs_license
     [ud registerDefaults:d];
 }
 
-- (id)init
+- (NSString *)homepageURL
 {
-    self = [super init];
-    _directoryPanel = nil;
-    return self;
+    return @"http://www.hardcoded.net/dupeguru_pe/";
 }
 
-- (DetailsPanel *)detailsPanel
+- (ResultWindowBase *)createResultWindow
 {
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanelPE alloc] initWithPy:py];
-    return _detailsPanel;
+    return [[ResultWindow alloc] initWithParentApp:self];
 }
 
-- (IBAction)openWebsite:(id)sender
+- (DirectoryPanel *)createDirectoryPanel
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_pe"]];
+    return [[DirectoryPanelPE alloc] initWithParentApp:self];
 }
 
-- (IBAction)toggleDirectories:(id)sender
+- (DetailsPanel *)createDetailsPanel
 {
-    [[self directoryPanel] toggleVisible:sender];
+    return [[DetailsPanelPE alloc] initWithPy:py];
 }
 
-- (DirectoryPanel *)directoryPanel
-{
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanelPE alloc] initWithParentApp:self];
-    return _directoryPanel;
-}
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 2 is just after "Clear Ingore List"
-    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Clear Picture Cache" action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
-    [mi setTarget:result];
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Clear Picture Cache")
+        action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
+    [mi setTarget:[self resultWindow]];
     [mi setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask];
     [super applicationDidFinishLaunching:aNotification];
 }

cocoa/pe/Consts.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "../base/Consts.h"

cocoa/pe/DetailsPanel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/pe/DetailsPanel.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "Utils.h"

cocoa/pe/DirectoryPanel.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/pe/DirectoryPanel.m

@@ -1,51 +1,34 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
-#import "ProgressController.h"
-
-static NSString* jobAddIPhoto = @"jobAddIPhoto";
+#import "Consts.h"
 
 @implementation DirectoryPanelPE
 - (id)initWithParentApp:(id)aParentApp
 {
     self = [super initWithParentApp:aParentApp];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
+    [[self window] setTitle:@"dupeGuru Picture Edition"];
+    _alwaysShowPopUp = YES;
     return self;
 }
 
+- (void)fillPopUpMenu
+{
+    [super fillPopUpMenu];
+    NSMenu *m = [addButtonPopUp menu];
+    NSMenuItem *mi = [m insertItemWithTitle:TR(@"Add iPhoto Library") action:@selector(addiPhoto:)
+        keyEquivalent:@"" atIndex:1];
+    [mi setTarget:self];
+}
+
 - (IBAction)addiPhoto:(id)sender
 {
-    [[ProgressController mainProgressController] setJobDesc:@"Adding iPhoto Library..."];
-    [[ProgressController mainProgressController] setJobId:jobAddIPhoto];
-    [[ProgressController mainProgressController] showSheetForParent:[self window]];
     [self addDirectory:@"iPhoto Library"];
 }
-
-- (IBAction)popupAddDirectoryMenu:(id)sender
-{
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    mi = [m addItemWithTitle:@"Add iPhoto Directory" action:@selector(addiPhoto:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-}
-
-- (void)jobCompleted:(NSNotification *)aNotification
-{
-    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto) {
-        [outlineView reloadData];
-    }
-}
 @end

cocoa/pe/InfoTemplate.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.4</string>
+	<string>{version}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/pe/PyDupeGuru.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/pe/ResultWindow.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -11,6 +11,4 @@ http://www.hardcoded.net/licenses/hs_license
 
 @interface ResultWindow : ResultWindowBase {}
 - (IBAction)clearPictureCache:(id)sender;
-- (IBAction)startDuplicateScan:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
 @end

cocoa/pe/ResultWindow.m

@@ -1,35 +1,58 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
 #import "Dialogs.h"
-#import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
-#import "AppDelegate.h"
 #import "Consts.h"
+#import "PyDupeGuru.h"
 
 @implementation ResultWindow
 /* Override */
-- (void)awakeFromNib
+- (void)initResultColumns
 {
-    [super awakeFromNib];
-    [[self window] setTitle:@"dupeGuru Picture Edition"];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)];
-    [deltaColumns removeIndex:3];
-    [deltaColumns removeIndex:4];
-    [outline setDeltaColumns:deltaColumns];
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:TR(@"Folder") width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:TR(@"Size (KB)") width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:3 title:TR(@"Kind") width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:4 title:TR(@"Dimensions") width:80 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:TR(@"Modification") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:TR(@"Match %") width:58 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:TR(@"Dupe Count") width:80 refCol:refCol]];
+}
+
+- (void)setScanOptions
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [_py setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
+}
+
+- (NSString *)getScanErrorMessageForCode:(NSInteger)errorCode
+{
+    if (errorCode == 4) {
+        return TR(@"IPhotoAppNotFoundMsg");
+    }
+    return [super getScanErrorMessageForCode:errorCode];
 }
 
 /* Actions */
 - (IBAction)clearPictureCache:(id)sender
 {
-    if ([Dialogs askYesNo:@"Do you really want to remove all your cached picture analysis?"] == NSAlertSecondButtonReturn) // NO
+    NSString *msg = TR(@"ClearPictureCacheConfirmMsg");
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
     [(PyDupeGuru *)py clearPictureCache];
 }
@@ -41,60 +64,13 @@ http://www.hardcoded.net/licenses/hs_license
     [columnsOrder addObject:@"1"];
     [columnsOrder addObject:@"2"];
     [columnsOrder addObject:@"4"];
-    [columnsOrder addObject:@"7"];
+    [columnsOrder addObject:@"6"];
     NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(121) forKey:@"0"];
-    [columnsWidth setObject:i2n(120) forKey:@"1"];
+    [columnsWidth setObject:i2n(162) forKey:@"0"];
+    [columnsWidth setObject:i2n(142) forKey:@"1"];
     [columnsWidth setObject:i2n(63) forKey:@"2"];
     [columnsWidth setObject:i2n(73) forKey:@"4"];
-    [columnsWidth setObject:i2n(58) forKey:@"7"];
+    [columnsWidth setObject:i2n(58) forKey:@"6"];
     [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
 }
-
-- (IBAction)startDuplicateScan:(id)sender
-{
-    if ([matches numberOfRows] > 0)
-    {
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    PyDupeGuru *_py = (PyDupeGuru *)py;
-    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
-    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
-    [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
-    int r = n2i([py doScan]);
-    if (r != 0)
-        [[ProgressController mainProgressController] hide];
-    if (r == 1)
-        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
-    if (r == 3)
-    {
-        [Dialogs showMessage:@"The selected directories contain no scannable file."];
-        [app toggleDirectories:nil];
-    }
-}
-
-- (IBAction)toggleDirectories:(id)sender
-{
-    [(AppDelegate *)app toggleDirectories:sender];
-}
-
-/* Public */
-- (void)initResultColumns
-{
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    _resultColumns = [[NSMutableArray alloc] init];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
-    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:sizeCol];
-    [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Dimensions" width:80 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Creation" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Match %" width:58 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
-}
 @end

cocoa/pe/dg_cocoa.py

@@ -1,14 +1,14 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
+
+from hscommon.trans import install_cocoa_trans
+install_cocoa_trans()
 
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
-from core_pe import app_cocoa as app_pe_cocoa
-
-# Fix py2app imports which chokes on relative imports
-from core_pe import block, cache, matchbase, data, _block_osx
+from core_pe import app_cocoa as app_pe_cocoa, __appname__
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
@@ -21,10 +21,10 @@ class PyDupeGuru(PyDupeGuruBase):
     
     #---Information    
     def getSelectedDupePath(self):
-        return unicode(self.py.selected_dupe_path())
+        return str(self.py.selected_dupe_path())
     
     def getSelectedDupeRefPath(self):
-        return unicode(self.py.selected_dupe_ref_path())
+        return str(self.py.selected_dupe_ref_path())
     
     #---Properties
     def setMatchScaled_(self,match_scaled):
@@ -35,5 +35,5 @@ class PyDupeGuru(PyDupeGuruBase):
     
     #---Registration
     def appName(self):
-        return "dupeGuru Picture Edition"
+        return __appname__
     

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -9,27 +9,33 @@
 /* Begin PBXBuildFile section */
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; };
-		CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; };
-		CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; };
+		CE05339B12E5DA350029EF25 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339312E5DA350029EF25 /* DirectoryPanel.xib */; };
+		CE05339C12E5DA350029EF25 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339512E5DA350029EF25 /* MainMenu.xib */; };
+		CE05339D12E5DA350029EF25 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339712E5DA350029EF25 /* ProblemDialog.xib */; };
+		CE05339E12E5DA350029EF25 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339912E5DA350029EF25 /* ResultWindow.xib */; };
+		CE0533A712E5DA4D0029EF25 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */; };
+		CE0533A812E5DA4D0029EF25 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A512E5DA4D0029EF25 /* Preferences.xib */; };
+		CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A912E5DA6A0029EF25 /* Localizable.strings */; };
+		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
+		CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; };
+		CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
+		CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */; };
+		CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
+		CE4527AC12E5F6E700005A15 /* core.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE4527AA12E5F6E700005A15 /* core.strings */; };
+		CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE60180712DF3EA900236FDC /* HSRecentFiles.m */; };
 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
-		CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */; };
-		CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C8A710946CE20078B0DB /* DetailsPanel.xib */; };
 		CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */; };
 		CE7AC9191119911200D02F6C /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9161119911200D02F6C /* progress.xib */; };
-		CE7AC91A1119911200D02F6C /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9171119911200D02F6C /* registration.xib */; };
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; };
 		CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB220FC192D60086DCA6 /* ProgressController.m */; };
-		CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB250FC192D60086DCA6 /* RecentDirectories.m */; };
-		CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */; };
 		CE80DB350FC192D60086DCA6 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB2B0FC192D60086DCA6 /* Utils.m */; };
 		CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */; };
 		CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */; };
@@ -38,7 +44,6 @@
 		CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */; };
 		CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB890FC1951C0086DCA6 /* ResultWindow.m */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
-		CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865B112C516400F95FD2 /* ResultOutline.m */; };
 		CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865D112C516400F95FD2 /* StatsLabel.m */; };
 		CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7441122C96C008CD2BC /* HSGUIController.m */; };
 		CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7461122C96C008CD2BC /* HSOutline.m */; };
@@ -49,13 +54,14 @@
 		CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */; };
 		CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
+		CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEC9DB4612CCAA6B003102F0 /* about.xib */; };
+		CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.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 */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
-		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
-		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
-		CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -76,31 +82,55 @@
 /* Begin PBXFileReference section */
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru PE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru PE.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
-		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = ../../help_pe/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
+		CE05339412E5DA350029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE05339612E5DA350029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE05339812E5DA350029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE05339A12E5DA350029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE05339F12E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE0533A012E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE0533A112E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE0533A212E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0533A412E5DA4D0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailsPanel.xib; sourceTree = "<group>"; };
+		CE0533A612E5DA4D0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE0533AA12E5DA6A0029EF25 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE0533AC12E5DA790029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE0533AD12E5DAAD0029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/DetailsPanel.xib; sourceTree = "<group>"; };
+		CE0533AE12E5DAAD0029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE0533B712E5DC040029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
+		CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = SOURCE_ROOT; };
+		CE0C2AAA117700E700BC749F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE0C2AB41177011000BC749F /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
+		CE0C2AB51177011000BC749F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE0C2ABA1177014200BC749F /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0C2ABB1177014200BC749F /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE0C2ABC1177014200BC749F /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
+		CE1EB5FD12537F9D0034AABB /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE1EB60012537FB90034AABB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE4527AB12E5F6E700005A15 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE4527B012E5F72600005A15 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE60180612DF3EA900236FDC /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CE60180712DF3EA900236FDC /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
 		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
 		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
-		CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CE77C8A710946CE20078B0DB /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailsPanel.xib; sourceTree = "<group>"; };
 		CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE7AC9161119911200D02F6C /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
-		CE7AC9171119911200D02F6C /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
 		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
 		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
@@ -108,10 +138,6 @@
 		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE80DB220FC192D60086DCA6 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -129,10 +155,7 @@
 		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
-		CE958658112C516400F95FD2 /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
 		CE958659112C516400F95FD2 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
-		CE95865A112C516400F95FD2 /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
-		CE95865B112C516400F95FD2 /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
 		CE95865C112C516400F95FD2 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE95865D112C516400F95FD2 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CE9EA7431122C96C008CD2BC /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
@@ -145,7 +168,6 @@
 		CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
 		CE9EA74C1122C96C008CD2BC /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
 		CE9EA74D1122C96C008CD2BC /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
-		CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
 		CE9EA7501122C96C008CD2BC /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
 		CE9EA7511122C96C008CD2BC /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
 		CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
@@ -157,13 +179,18 @@
 		CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CEC9DB4612CCAA6B003102F0 /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
 		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
+		CEF12A7C124DFD400087B51D /* HSTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSTableView.h; path = ../../cocoalib/views/HSTableView.h; sourceTree = SOURCE_ROOT; };
+		CEF12A7D124DFD400087B51D /* HSTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSTableView.m; path = ../../cocoalib/views/HSTableView.m; sourceTree = SOURCE_ROOT; };
+		CEF12A81124DFD620087B51D /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; };
+		CEF12A82124DFD620087B51D /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
+		CEF12A83124DFD620087B51D /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = ../../images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -180,9 +207,10 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
+		080E96DDFE201D6D7F000001 /* DGPE */ = {
 			isa = PBXGroup;
 			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
 				CE848A1809DD85810004CB44 /* Consts.h */,
@@ -194,7 +222,7 @@
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
 			);
-			name = Classes;
+			name = DGPE;
 			sourceTree = "<group>";
 		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
@@ -227,10 +255,9 @@
 		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
 			isa = PBXGroup;
 			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
+				080E96DDFE201D6D7F000001 /* DGPE */,
 				CE80DB1A0FC192AB0086DCA6 /* cocoalib */,
 				CE80DB810FC194BD0086DCA6 /* dgbase */,
-				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
@@ -238,23 +265,17 @@
 			name = dupeguru;
 			sourceTree = "<group>";
 		};
-		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				29B97316FDCFA39411CA2CEA /* main.m */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				CE77C89A10946C6D0078B0DB /* xib */,
-				CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */,
+				CE073F5409CAE1A3005C1D2F /* help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
+				CE05339212E5DA1D0029EF25 /* xib */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
+				CE0533A912E5DA6A0029EF25 /* Localizable.strings */,
+				CE4527AA12E5F6E700005A15 /* core.strings */,
 				CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */,
 			);
 			name = Resources;
@@ -269,23 +290,26 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		CE77C89A10946C6D0078B0DB /* xib */ = {
+		CE05339212E5DA1D0029EF25 /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CE031753109B345200517EE6 /* MainMenu.xib */,
-				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */,
-				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
-				CE031750109B340A00517EE6 /* Preferences.xib */,
+				CE05339312E5DA350029EF25 /* DirectoryPanel.xib */,
+				CE05339512E5DA350029EF25 /* MainMenu.xib */,
+				CE05339712E5DA350029EF25 /* ProblemDialog.xib */,
+				CE05339912E5DA350029EF25 /* ResultWindow.xib */,
+				CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */,
+				CE0533A512E5DA4D0029EF25 /* Preferences.xib */,
 			);
-			path = xib;
+			name = xib;
 			sourceTree = "<group>";
 		};
 		CE7AC9141119911200D02F6C /* xib */ = {
 			isa = PBXGroup;
 			children = (
+				CEC9DB4612CCAA6B003102F0 /* about.xib */,
+				CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */,
 				CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */,
 				CE7AC9161119911200D02F6C /* progress.xib */,
-				CE7AC9171119911200D02F6C /* registration.xib */,
 			);
 			name = xib;
 			path = ../../cocoalib/xib;
@@ -309,14 +333,16 @@
 				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
 				CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */,
 				CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */,
+				CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */,
+				CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */,
+				CE1EB5FD12537F9D0034AABB /* PyFairware.h */,
+				CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */,
+				CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */,
+				CE60180612DF3EA900236FDC /* HSRecentFiles.h */,
+				CE60180712DF3EA900236FDC /* HSRecentFiles.m */,
 				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB230FC192D60086DCA6 /* PyApp.h */,
-				CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */,
-				CE80DB240FC192D60086DCA6 /* RecentDirectories.h */,
-				CE80DB250FC192D60086DCA6 /* RecentDirectories.m */,
-				CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */,
-				CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */,
 				CE80DB2A0FC192D60086DCA6 /* Utils.h */,
 				CE80DB2B0FC192D60086DCA6 /* Utils.m */,
 				CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */,
@@ -328,6 +354,9 @@
 		CE80DB810FC194BD0086DCA6 /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CEF12A81124DFD620087B51D /* PyResultTable.h */,
+				CEF12A82124DFD620087B51D /* ResultTable.h */,
+				CEF12A83124DFD620087B51D /* ResultTable.m */,
 				CE80DB820FC1951C0086DCA6 /* AppDelegate.h */,
 				CE80DB830FC1951C0086DCA6 /* AppDelegate.m */,
 				CE80DB840FC1951C0086DCA6 /* Consts.h */,
@@ -335,19 +364,19 @@
 				CE6044EB0FE6796200B71262 /* DetailsPanel.m */,
 				CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */,
 				CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */,
-				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
 				CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */,
 				CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */,
-				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
-				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE0C2ABA1177014200BC749F /* ProblemDialog.h */,
+				CE0C2ABB1177014200BC749F /* ProblemDialog.m */,
 				CE80DB880FC1951C0086DCA6 /* ResultWindow.h */,
 				CE80DB890FC1951C0086DCA6 /* ResultWindow.m */,
-				CE958658112C516400F95FD2 /* PyResultTree.h */,
-				CE95865A112C516400F95FD2 /* ResultOutline.h */,
-				CE95865B112C516400F95FD2 /* ResultOutline.m */,
-				CE958659112C516400F95FD2 /* PyStatsLabel.h */,
 				CE95865C112C516400F95FD2 /* StatsLabel.h */,
 				CE95865D112C516400F95FD2 /* StatsLabel.m */,
+				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
+				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
+				CE0C2ABC1177014200BC749F /* PyProblemDialog.h */,
+				CE958659112C516400F95FD2 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -359,6 +388,8 @@
 				CE9EA7441122C96C008CD2BC /* HSGUIController.m */,
 				CE9EA7451122C96C008CD2BC /* HSOutline.h */,
 				CE9EA7461122C96C008CD2BC /* HSOutline.m */,
+				CE0C2AB41177011000BC749F /* HSTable.h */,
+				CE0C2AB51177011000BC749F /* HSTable.m */,
 				CE9EA7471122C96C008CD2BC /* HSWindowController.h */,
 				CE9EA7481122C96C008CD2BC /* HSWindowController.m */,
 			);
@@ -371,6 +402,7 @@
 			children = (
 				CE9EA74C1122C96C008CD2BC /* PyGUI.h */,
 				CE9EA74D1122C96C008CD2BC /* PyOutline.h */,
+				CE0C2AAA117700E700BC749F /* PyTable.h */,
 			);
 			name = proxies;
 			path = ../../cocoalib/proxies;
@@ -379,6 +411,8 @@
 		CE9EA74F1122C96C008CD2BC /* views */ = {
 			isa = PBXGroup;
 			children = (
+				CEF12A7C124DFD400087B51D /* HSTableView.h */,
+				CEF12A7D124DFD400087B51D /* HSTableView.m */,
 				CE9EA7501122C96C008CD2BC /* HSOutlineView.h */,
 				CE9EA7511122C96C008CD2BC /* HSOutlineView.m */,
 				CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */,
@@ -403,9 +437,6 @@
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */,
-				CEFC295309C89FF200D9F998 /* details32.png */,
-				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
 			);
 			name = images;
@@ -440,7 +471,16 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+				fr,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -456,20 +496,22 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
-				CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */,
+				CE073F6309CAE1A3005C1D2F /* help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
-				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
-				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */,
 				CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */,
-				CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */,
-				CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */,
-				CE031751109B340A00517EE6 /* Preferences.xib in Resources */,
-				CE031754109B345200517EE6 /* MainMenu.xib in Resources */,
 				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
 				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
-				CE7AC91A1119911200D02F6C /* registration.xib in Resources */,
+				CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */,
+				CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */,
+				CE05339B12E5DA350029EF25 /* DirectoryPanel.xib in Resources */,
+				CE05339C12E5DA350029EF25 /* MainMenu.xib in Resources */,
+				CE05339D12E5DA350029EF25 /* ProblemDialog.xib in Resources */,
+				CE05339E12E5DA350029EF25 /* ResultWindow.xib in Resources */,
+				CE0533A712E5DA4D0029EF25 /* DetailsPanel.xib in Resources */,
+				CE0533A812E5DA4D0029EF25 /* Preferences.xib in Resources */,
+				CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */,
+				CE4527AC12E5F6E700005A15 /* core.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -488,8 +530,6 @@
 				CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */,
 				CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */,
 				CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */,
-				CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */,
-				CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */,
 				CE80DB350FC192D60086DCA6 /* Utils.m in Sources */,
 				CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */,
 				CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */,
@@ -507,13 +547,104 @@
 				CE9EA75B1122C96C008CD2BC /* NSIndexPathAdditions.m in Sources */,
 				CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */,
 				CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */,
-				CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */,
 				CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */,
+				CE0C2AB61177011000BC749F /* HSTable.m in Sources */,
+				CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */,
+				CEF12A7E124DFD400087B51D /* HSTableView.m in Sources */,
+				CEF12A84124DFD620087B51D /* ResultTable.m in Sources */,
+				CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */,
+				CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */,
+				CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXVariantGroup section */
+		CE05339312E5DA350029EF25 /* DirectoryPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05339412E5DA350029EF25 /* en */,
+				CE05339F12E5DA420029EF25 /* fr */,
+			);
+			name = DirectoryPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05339512E5DA350029EF25 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05339612E5DA350029EF25 /* en */,
+				CE0533A012E5DA420029EF25 /* fr */,
+			);
+			name = MainMenu.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05339712E5DA350029EF25 /* ProblemDialog.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05339812E5DA350029EF25 /* en */,
+				CE0533A112E5DA420029EF25 /* fr */,
+			);
+			name = ProblemDialog.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE05339912E5DA350029EF25 /* ResultWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE05339A12E5DA350029EF25 /* en */,
+				CE0533A212E5DA420029EF25 /* fr */,
+			);
+			name = ResultWindow.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0533A412E5DA4D0029EF25 /* en */,
+				CE0533AD12E5DAAD0029EF25 /* fr */,
+			);
+			name = DetailsPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE0533A512E5DA4D0029EF25 /* Preferences.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0533A612E5DA4D0029EF25 /* en */,
+				CE0533AE12E5DAAD0029EF25 /* fr */,
+			);
+			name = Preferences.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE0533A912E5DA6A0029EF25 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0533AA12E5DA6A0029EF25 /* en */,
+				CE0533AC12E5DA790029EF25 /* fr */,
+			);
+			name = Localizable.strings;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE1EB60012537FB90034AABB /* en */,
+				CE0533B712E5DC040029EF25 /* fr */,
+			);
+			name = FairwareReminder.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE4527AA12E5F6E700005A15 /* core.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE4527AB12E5F6E700005A15 /* en */,
+				CE4527B012E5F72600005A15 /* fr */,
+			);
+			name = core.strings;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;

cocoa/pe/en.lproj/DetailsPanel.strings

@@ -0,0 +1,18 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Details of Selected File";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Selected";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Reference";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribute";
+
+/* Class = "NSTextFieldCell"; title = "Selected"; ObjectID = "33"; */
+"33.title" = "Selected";
+
+/* Class = "NSTextFieldCell"; title = "Reference"; ObjectID = "35"; */
+"35.title" = "Reference";

cocoa/pe/en.lproj/DetailsPanel.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10F569</string>
+		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">740</string>
+			<string key="NS.object.0">788</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -434,6 +434,7 @@
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{451, 177}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSFrameAutosaveName">DetailsPanel</string>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -866,6 +867,13 @@
 						<string key="NS.key.0">detailsTable</string>
 						<string key="NS.object.0">NSTableView</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">detailsTable</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">detailsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">../base/DetailsPanel.h</string>
@@ -891,6 +899,35 @@
 							<string>NSProgressIndicator</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>dupeImage</string>
+							<string>dupeProgressIndicator</string>
+							<string>refImage</string>
+							<string>refProgressIndicator</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">dupeImage</string>
+								<string key="candidateClassName">NSImageView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">dupeProgressIndicator</string>
+								<string key="candidateClassName">NSProgressIndicator</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">refImage</string>
+								<string key="candidateClassName">NSImageView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">refProgressIndicator</string>
+								<string key="candidateClassName">NSProgressIndicator</string>
+							</object>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">DetailsPanel.h</string>
@@ -903,6 +940,13 @@
 						<string key="NS.key.0">detailsTable</string>
 						<string key="NS.object.0">NSTableView</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">detailsTable</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">detailsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1423,6 +1467,13 @@
 						<string key="NS.key.0">showWindow:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -1431,6 +1482,7 @@
 			</object>
 		</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>
 			<integer value="1050" key="NS.object.0"/>
@@ -1446,5 +1498,9 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSApplicationIcon</string>
+			<string key="NS.object.0">{128, 128}</string>
+		</object>
 	</data>
 </archive>

cocoa/pe/fr.lproj/DetailsPanel.strings

@@ -0,0 +1,18 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Détails du fichier sélectionné";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Sélectionné";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Référence";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribut";
+
+/* Class = "NSTextFieldCell"; title = "Selected"; ObjectID = "33"; */
+"33.title" = "Sélectionné";
+
+/* Class = "NSTextFieldCell"; title = "Reference"; ObjectID = "35"; */
+"35.title" = "Référence";

cocoa/pe/fr.lproj/Preferences.strings

@@ -0,0 +1,57 @@
+
+/* Class = "NSWindow"; title = "dupeGuru PE Preferences"; ObjectID = "2"; */
+"2.title" = "Préférences de dupeGuru PE";
+
+/* Class = "NSTextFieldCell"; title = "More results"; ObjectID = "18"; */
+"18.title" = "+ de doubles";
+
+/* Class = "NSTextFieldCell"; title = "Fewer results"; ObjectID = "19"; */
+"19.title" = "- de doubles";
+
+/* Class = "NSTextFieldCell"; title = "Filter hardness:"; ObjectID = "20"; */
+"20.title" = "Seuil du filtre:";
+
+/* Class = "NSButtonCell"; title = "Can mix file kind"; ObjectID = "21"; */
+"21.title" = "Comparer les fichiers de différents types";
+
+/* Class = "NSButtonCell"; title = "Reset to Defaults"; ObjectID = "24"; */
+"24.title" = "Options par défaut";
+
+/* Class = "NSTextFieldCell"; title = "Copy and Move:"; ObjectID = "25"; */
+"25.title" = "Déplacements de fichiers:";
+
+/* Class = "NSMenuItem"; title = "Recreate relative path"; ObjectID = "28"; */
+"28.title" = "Re-créer chemins relatifs";
+
+/* Class = "NSMenuItem"; title = "Recreate absolute path"; ObjectID = "29"; */
+"29.title" = "Re-créer chemins absolus";
+
+/* Class = "NSMenuItem"; title = "Right in destination"; ObjectID = "30"; */
+"30.title" = "Directement à la destination";
+
+/* Class = "NSButtonCell"; title = "Match scaled pictures together"; ObjectID = "31"; */
+"31.title" = "Comparer les images de tailles différentes";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "32"; */
+"32.title" = "Vérifier automatiquement les mises à jour";
+
+/* Class = "NSButtonCell"; title = "Remove empty folders on delete or move"; ObjectID = "33"; */
+"33.title" = "Effacer les dossiers vides après un déplacement";
+
+/* Class = "NSButtonCell"; title = "Use regular expressions when filtering"; ObjectID = "34"; */
+"34.title" = "Utiliser les expressions régulières pour les filtres";
+
+/* Class = "NSTabViewItem"; label = "Basic"; ObjectID = "60"; */
+"60.label" = "Simple";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "61"; */
+"61.label" = "Avancé";
+
+/* Class = "NSTextFieldCell"; title = "Custom Command (arguments: %d for dupe, %r for ref):"; ObjectID = "65"; */
+"65.title" = "Commande perso. (arguments: %d pour doublon, %r pour réf):";
+
+/* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "70"; */
+"70.title" = "Ignorer doublons avec hardlink vers le même fichier";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "75"; */
+"75.title" = "Mode de déboguage (redémarrage requis)";

cocoa/pe/main.m

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/se/AppDelegate.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -11,8 +11,5 @@ http://www.hardcoded.net/licenses/hs_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
 - (PyDupeGuru *)py;
 @end

cocoa/se/AppDelegate.m

@@ -1,18 +1,18 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
 #import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
 #import "../../cocoalib/Utils.h"
 #import "../../cocoalib/ValueTransformers.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "ResultWindow.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -28,6 +28,7 @@ http://www.hardcoded.net/licenses/hs_license
     [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
     [d setObject:b2n(YES) forKey:@"mixFileKind"];
     [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"];
     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
     [d setObject:b2n(YES) forKey:@"ignoreSmallFiles"];
     [d setObject:b2n(NO) forKey:@"debug"];
@@ -47,14 +48,14 @@ http://www.hardcoded.net/licenses/hs_license
     return self;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru"]];
+    return @"http://www.hardcoded.net/dupeguru/";
 }
 
-- (IBAction)toggleDirectories:(id)sender
+- (ResultWindowBase *)createResultWindow
 {
-    [[self directoryPanel] toggleVisible:sender];
+    return [[ResultWindow alloc] initWithParentApp:self];
 }
 
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }

cocoa/se/InfoTemplate.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.2</string>
+	<string>{version}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/se/PyDupeGuru.h

@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/se/ResultWindow.h

@@ -1,20 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../../cocoalib/Outline.h"
 #import "../base/ResultWindow.h"
-#import "DirectoryPanel.h"
 
-@interface ResultWindow : ResultWindowBase
-{   
-    NSString *_lastAction;
-}
-- (IBAction)resetColumnsToDefault:(id)sender;
-- (IBAction)startDuplicateScan:(id)sender;
+@interface ResultWindow : ResultWindowBase {}
 @end

cocoa/se/ResultWindow.m

@@ -1,25 +1,47 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
-#import "../../cocoalib/Dialogs.h"
-#import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/Utils.h"
-#import "AppDelegate.h"
+#import "Utils.h"
 #import "Consts.h"
+#import "PyDupeGuru.h"
 
 @implementation ResultWindow
 /* Override */
-- (void)awakeFromNib
+- (void)initResultColumns
 {
-    [super awakeFromNib];
-    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
-    [_deltaColumns removeIndex:3];
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:TR(@"Folder") width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:TR(@"Size (KB)") width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:3 title:TR(@"Kind") width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:4 title:TR(@"Modification") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:TR(@"Match %") width:60 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:TR(@"Words Used") width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:TR(@"Dupe Count") width:80 refCol:refCol]];
+}
+
+- (void)setScanOptions
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setScanType:[ud objectForKey:@"scanType"]];
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
+    [_py setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [_py setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
+    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
+    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
+    [_py setSizeThreshold:sizeThreshold];
 }
 
 /* Actions */
@@ -29,62 +51,12 @@ http://www.hardcoded.net/licenses/hs_license
     [columnsOrder addObject:@"0"];
     [columnsOrder addObject:@"1"];
     [columnsOrder addObject:@"2"];
-    [columnsOrder addObject:@"6"];
+    [columnsOrder addObject:@"5"];
     NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
     [columnsWidth setObject:i2n(195) forKey:@"0"];
-    [columnsWidth setObject:i2n(120) forKey:@"1"];
+    [columnsWidth setObject:i2n(183) forKey:@"1"];
     [columnsWidth setObject:i2n(63) forKey:@"2"];
-    [columnsWidth setObject:i2n(60) forKey:@"6"];
+    [columnsWidth setObject:i2n(60) forKey:@"5"];
     [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
 }
-
-- (IBAction)startDuplicateScan:(id)sender
-{
-    if ([matches numberOfRows] > 0)
-    {
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    PyDupeGuru *_py = (PyDupeGuru *)py;
-    [_py setScanType:[ud objectForKey:@"scanType"]];
-    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
-    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
-    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
-    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
-    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
-    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
-    [_py setSizeThreshold:sizeThreshold];
-    int r = n2i([py doScan]);
-    [matches reloadData];
-    [self refreshStats];
-    if (r != 0)
-        [[ProgressController mainProgressController] hide];
-    if (r == 1)
-        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
-    if (r == 3)
-    {
-        [Dialogs showMessage:@"The selected directories contain no scannable file."];
-        [app toggleDirectories:nil];
-    }
-
-}
-
-/* Public */
-- (void)initResultColumns
-{
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    _resultColumns = [[NSMutableArray alloc] init];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
-    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:sizeCol];
-    [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Creation" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Match %" width:60 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Words Used" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
-}
 @end

cocoa/se/dg_cocoa.py

@@ -1,17 +1,18 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
-from hsutil.cocoa import signature
+from hscommon.trans import install_cocoa_trans
+install_cocoa_trans()
 
-from core import scanner
+from hscommon.cocoa import signature
+
+from core.scanner import ScanType
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_se.app_cocoa import DupeGuru
-
-# Fix py2app imports with chokes on relative imports
-from core_se import fs, data
+from core_se import __appname__
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
@@ -26,8 +27,8 @@ class PyDupeGuru(PyDupeGuruBase):
     def setScanType_(self,scan_type):
         try:
             self.py.scanner.scan_type = [
-                scanner.SCAN_TYPE_FILENAME,
-                scanner.SCAN_TYPE_CONTENT
+                ScanType.Filename,
+                ScanType.Contents,
             ][scan_type]
         except IndexError:
             pass
@@ -44,5 +45,5 @@ class PyDupeGuru(PyDupeGuruBase):
     
     #---Registration
     def appName(self):
-        return "dupeGuru"
+        return __appname__
     

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -9,16 +9,20 @@
 /* Begin PBXBuildFile section */
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_help */; };
+		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
 		CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */; };
 		CE19BC6411199231007CCEB0 /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6111199231007CCEB0 /* progress.xib */; };
-		CE19BC6511199231007CCEB0 /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6211199231007CCEB0 /* registration.xib */; };
+		CE27D3C112CCA42500859E67 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE27D3C012CCA42500859E67 /* about.xib */; };
+		CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE27D3C312CCA43800859E67 /* HSAboutBox.m */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
-		CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3A46F9109B212E002ABFD5 /* MainMenu.xib */; };
+		CE4526F212E5F55F00005A15 /* core.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE4526F012E5F55F00005A15 /* core.strings */; };
 		CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
 		CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
+		CE647E571173024A006D28BA /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE647E551173024A006D28BA /* ProblemDialog.m */; };
+		CE6DD4E7124CA3070089A48D /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DD4E6124CA3070089A48D /* ResultTable.m */; };
+		CE6DD547124CAF1F0089A48D /* HSTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DD546124CAF1F0089A48D /* HSTableView.m */; };
 		CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
 		CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDBF111EE37C006618EA /* HSOutlineView.m */; };
 		CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */; };
@@ -27,22 +31,26 @@
 		CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; };
 		CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; };
 		CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; };
-		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
+		CE79638612536C94008D405B /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE79638412536C94008D405B /* FairwareReminder.xib */; };
+		CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE79638B12536F4E008D405B /* HSFairwareReminder.m */; };
+		CE81134C12E5CE4D00A36C80 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */; };
+		CE81134D12E5CE4D00A36C80 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */; };
+		CE81134E12E5CE4D00A36C80 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134612E5CE4D00A36C80 /* MainMenu.xib */; };
+		CE81134F12E5CE4D00A36C80 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134812E5CE4D00A36C80 /* ProblemDialog.xib */; };
+		CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; };
+		CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81135612E5CE6D00A36C80 /* Preferences.xib */; };
+		CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE8113E912E5CE9A00A36C80 /* Localizable.strings */; };
+		CE8C53BC117324CE0011B41F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C53BB117324CE0011B41F /* HSTable.m */; };
+		CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; };
 		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
-		CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */; };
-		CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */; };
+		CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
-		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
-		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
 		CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
 		CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */; };
-		CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8F0FC9517500CD5728 /* Outline.m */; };
 		CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
-		CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F950FC9517500CD5728 /* RecentDirectories.m */; };
-		CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */; };
 		CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9B0FC9517500CD5728 /* Utils.m */; };
 		CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */; };
 		CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7FB20FC951A700CD5728 /* AppDelegate.m */; };
@@ -71,17 +79,29 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dupeGuru.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = ../../help_se/dupeguru_help; sourceTree = "<group>"; };
+		CE05341312E5DC260029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
+		CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = "<group>"; };
 		CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE19BC6111199231007CCEB0 /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
-		CE19BC6211199231007CCEB0 /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
+		CE27D3C012CCA42500859E67 /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CE27D3C212CCA43800859E67 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CE27D3C312CCA43800859E67 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3A46F9109B212E002ABFD5 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../base/xib/MainMenu.xib; sourceTree = "<group>"; };
+		CE4526F112E5F55F00005A15 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE4526F312E5F57000005A15 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/core.strings; sourceTree = SOURCE_ROOT; };
 		CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE647E541173024A006D28BA /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE647E551173024A006D28BA /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE647E561173024A006D28BA /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE6DD4E4124CA3070089A48D /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; };
+		CE6DD4E5124CA3070089A48D /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
+		CE6DD4E6124CA3070089A48D /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
+		CE6DD545124CAF1F0089A48D /* HSTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSTableView.h; path = ../../cocoalib/views/HSTableView.h; sourceTree = SOURCE_ROOT; };
+		CE6DD546124CAF1F0089A48D /* HSTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSTableView.m; path = ../../cocoalib/views/HSTableView.m; sourceTree = SOURCE_ROOT; };
 		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
 		CE6E7407111C997500C350E3 /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE76FDBE111EE37C006618EA /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
@@ -101,7 +121,29 @@
 		CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
 		CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
 		CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
-		CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
+		CE79638212536C6E008D405B /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE79638512536C94008D405B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
+		CE79638A12536F4E008D405B /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE79638B12536F4E008D405B /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
+		CE81134312E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE81134512E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE81134712E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE81134912E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE81134B12E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE81135112E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE81135212E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
+		CE81135312E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
+		CE81135412E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
+		CE81135512E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE81135712E5CE6D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE81135912E5CE7B00A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CE8113EA12E5CE9A00A36C80 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE8113EC12E5CEA800A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+		CE8C53B61173248F0011B41F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE8C53BB117324CE0011B41F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE91F210113BC22D0010360B /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE91F213113BC22D0010360B /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CE91F214113BC22D0010360B /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
 		CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
 		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
@@ -109,25 +151,16 @@
 		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
+		CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
 		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; };
 		CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F8E0FC9517500CD5728 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8F0FC9517500CD5728 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.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; };
 		CEFC7F910FC9517500CD5728 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -212,12 +245,14 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				CE073F5409CAE1A3005C1D2F /* dupeguru_help */,
+				CE073F5409CAE1A3005C1D2F /* help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
 				CEEFC0CA10943849001F3A39 /* xib */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
+				CE8113E912E5CE9A00A36C80 /* Localizable.strings */,
+				CE4526F012E5F55F00005A15 /* core.strings */,
 				CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */,
 			);
 			name = Resources;
@@ -235,9 +270,10 @@
 		CE19BC5F11199231007CCEB0 /* xib */ = {
 			isa = PBXGroup;
 			children = (
+				CE27D3C012CCA42500859E67 /* about.xib */,
+				CE79638412536C94008D405B /* FairwareReminder.xib */,
 				CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */,
 				CE19BC6111199231007CCEB0 /* progress.xib */,
-				CE19BC6211199231007CCEB0 /* registration.xib */,
 			);
 			name = xib;
 			path = ../../cocoalib/xib;
@@ -246,6 +282,8 @@
 		CE76FDBD111EE37C006618EA /* views */ = {
 			isa = PBXGroup;
 			children = (
+				CE6DD545124CAF1F0089A48D /* HSTableView.h */,
+				CE6DD546124CAF1F0089A48D /* HSTableView.m */,
 				CE76FDBE111EE37C006618EA /* HSOutlineView.h */,
 				CE76FDBF111EE37C006618EA /* HSOutlineView.m */,
 				CE76FDC0111EE37C006618EA /* NSIndexPathAdditions.h */,
@@ -266,6 +304,7 @@
 				CE76FDDE111EE42F006618EA /* HSOutline.m */,
 				CE76FDC8111EE38E006618EA /* HSGUIController.h */,
 				CE76FDC9111EE38E006618EA /* HSGUIController.m */,
+				CE8C53BB117324CE0011B41F /* HSTable.m */,
 			);
 			name = controllers;
 			path = ../../cocoalib/controllers;
@@ -276,6 +315,7 @@
 			children = (
 				CE76FDCD111EE38E006618EA /* PyGUI.h */,
 				CE76FDCE111EE38E006618EA /* PyOutline.h */,
+				CE8C53B61173248F0011B41F /* PyTable.h */,
 			);
 			name = proxies;
 			path = ../../cocoalib/proxies;
@@ -294,10 +334,12 @@
 		CEEFC0CA10943849001F3A39 /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CE3A46F9109B212E002ABFD5 /* MainMenu.xib */,
-				CEAC6810109B0B7E00B43C85 /* Preferences.xib */,
-				CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */,
-				CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */,
+				CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */,
+				CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */,
+				CE81134612E5CE4D00A36C80 /* MainMenu.xib */,
+				CE81134812E5CE4D00A36C80 /* ProblemDialog.xib */,
+				CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */,
+				CE81135612E5CE6D00A36C80 /* Preferences.xib */,
 			);
 			name = xib;
 			sourceTree = "<group>";
@@ -305,8 +347,6 @@
 		CEFC294309C89E0000D9F998 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				CEFC295309C89FF200D9F998 /* details32.png */,
-				CEFC295409C89FF200D9F998 /* preferences32.png */,
 				CEFC294509C89E3D00D9F998 /* folder32.png */,
 			);
 			name = images;
@@ -326,16 +366,16 @@
 				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
 				CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */,
 				CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */,
-				CEFC7F8E0FC9517500CD5728 /* Outline.h */,
-				CEFC7F8F0FC9517500CD5728 /* Outline.m */,
+				CE79638A12536F4E008D405B /* HSFairwareReminder.h */,
+				CE79638B12536F4E008D405B /* HSFairwareReminder.m */,
+				CE79638212536C6E008D405B /* PyFairware.h */,
+				CE27D3C212CCA43800859E67 /* HSAboutBox.h */,
+				CE27D3C312CCA43800859E67 /* HSAboutBox.m */,
+				CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */,
+				CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */,
 				CEFC7F900FC9517500CD5728 /* ProgressController.h */,
 				CEFC7F910FC9517500CD5728 /* ProgressController.m */,
 				CEFC7F920FC9517500CD5728 /* PyApp.h */,
-				CEFC7F930FC9517500CD5728 /* PyRegistrable.h */,
-				CEFC7F940FC9517500CD5728 /* RecentDirectories.h */,
-				CEFC7F950FC9517500CD5728 /* RecentDirectories.m */,
-				CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */,
-				CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */,
 				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
 				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
 				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
@@ -347,6 +387,12 @@
 		CEFC7FB00FC9518F00CD5728 /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE6DD4E4124CA3070089A48D /* PyResultTable.h */,
+				CE6DD4E5124CA3070089A48D /* ResultTable.h */,
+				CE6DD4E6124CA3070089A48D /* ResultTable.m */,
+				CE91F210113BC22D0010360B /* PyStatsLabel.h */,
+				CE91F213113BC22D0010360B /* StatsLabel.h */,
+				CE91F214113BC22D0010360B /* StatsLabel.m */,
 				CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */,
 				CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */,
 				CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */,
@@ -361,6 +407,9 @@
 				CE6E7407111C997500C350E3 /* PyDetailsPanel.h */,
 				CEFC7FB70FC951A700CD5728 /* ResultWindow.h */,
 				CEFC7FB80FC951A700CD5728 /* ResultWindow.m */,
+				CE647E541173024A006D28BA /* ProblemDialog.h */,
+				CE647E551173024A006D28BA /* ProblemDialog.m */,
+				CE647E561173024A006D28BA /* PyProblemDialog.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -397,7 +446,16 @@
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+				fr,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -413,19 +471,22 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
-				CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */,
+				CE073F6309CAE1A3005C1D2F /* help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
-				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
-				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
 				CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */,
-				CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */,
-				CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */,
-				CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */,
-				CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */,
 				CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */,
 				CE19BC6411199231007CCEB0 /* progress.xib in Resources */,
-				CE19BC6511199231007CCEB0 /* registration.xib in Resources */,
+				CE79638612536C94008D405B /* FairwareReminder.xib in Resources */,
+				CE27D3C112CCA42500859E67 /* about.xib in Resources */,
+				CE81134C12E5CE4D00A36C80 /* DetailsPanel.xib in Resources */,
+				CE81134D12E5CE4D00A36C80 /* DirectoryPanel.xib in Resources */,
+				CE81134E12E5CE4D00A36C80 /* MainMenu.xib in Resources */,
+				CE81134F12E5CE4D00A36C80 /* ProblemDialog.xib in Resources */,
+				CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */,
+				CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */,
+				CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */,
+				CE4526F212E5F55F00005A15 /* core.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -441,10 +502,7 @@
 				CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */,
 				CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */,
 				CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,
-				CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */,
 				CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */,
-				CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */,
-				CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */,
 				CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */,
 				CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */,
 				CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */,
@@ -460,11 +518,104 @@
 				CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */,
 				CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */,
 				CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */,
+				CE91F216113BC22D0010360B /* StatsLabel.m in Sources */,
+				CE647E571173024A006D28BA /* ProblemDialog.m in Sources */,
+				CE8C53BC117324CE0011B41F /* HSTable.m in Sources */,
+				CE6DD4E7124CA3070089A48D /* ResultTable.m in Sources */,
+				CE6DD547124CAF1F0089A48D /* HSTableView.m in Sources */,
+				CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */,
+				CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */,
+				CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXVariantGroup section */
+		CE4526F012E5F55F00005A15 /* core.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE4526F112E5F55F00005A15 /* en */,
+				CE4526F312E5F57000005A15 /* fr */,
+			);
+			name = core.strings;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE79638412536C94008D405B /* FairwareReminder.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE79638512536C94008D405B /* en */,
+				CE05341312E5DC260029EF25 /* fr */,
+			);
+			name = FairwareReminder.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81134212E5CE4D00A36C80 /* DetailsPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81134312E5CE4D00A36C80 /* en */,
+				CE81135112E5CE6100A36C80 /* fr */,
+			);
+			name = DetailsPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81134512E5CE4D00A36C80 /* en */,
+				CE81135212E5CE6100A36C80 /* fr */,
+			);
+			name = DirectoryPanel.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81134612E5CE4D00A36C80 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81134712E5CE4D00A36C80 /* en */,
+				CE81135312E5CE6100A36C80 /* fr */,
+			);
+			name = MainMenu.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81134812E5CE4D00A36C80 /* ProblemDialog.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81134912E5CE4D00A36C80 /* en */,
+				CE81135412E5CE6100A36C80 /* fr */,
+			);
+			name = ProblemDialog.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81134B12E5CE4D00A36C80 /* en */,
+				CE81135512E5CE6100A36C80 /* fr */,
+			);
+			name = ResultWindow.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE81135612E5CE6D00A36C80 /* Preferences.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE81135712E5CE6D00A36C80 /* en */,
+				CE81135912E5CE7B00A36C80 /* fr */,
+			);
+			name = Preferences.xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE8113E912E5CE9A00A36C80 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE8113EA12E5CE9A00A36C80 /* en */,
+				CE8113EC12E5CEA800A36C80 /* fr */,
+			);
+			name = Localizable.strings;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;