Fixed crash under Cocoa when dupeGuru was launched from a path containing non-ascii characters.

--HG--
branch : objp
rename : cocoa/se/main.m => cocoa/base/main.m

.hgignore

@@ -4,7 +4,9 @@ syntax: glob
 run.py
 *.pyc
 *.so
+*.mo
 *.pyd
+.tm_*
 *.xcodeproj/xcuserdata
 *.xcodeproj/project.xcworkspace/xcuserdata
 conf.json
@@ -12,16 +14,20 @@ build
 dist
 install
 installer_tmp-cache
+cocoa/autogen
 cocoa/*/Info.plist
 cocoa/*/build
+cocoa/*/*.app
 cocoa/*/dg_cocoa.plugin
 cocoa/*/fr.lproj/*.xib
 cocoa/*/de.lproj/*.xib
 cocoa/*/zh_CN.lproj/*.xib
+cocoa/*/cs.lproj/*.xib
+cocoa/*/it.lproj/*.xib
+# We keep old strings files in the repo for a while to be sure that auto-generated strings work
+# fine, but we'll eventually only have en.lproj in the repo.
+hy.lproj
+ru.lproj
 qt/base/*_rc.py
-qt/lang/fr.qm
-qt/lang/en.qm
-qt/lang/de.qm
-qt/lang/zh.qm
 help/*/conf.py
 help/*/changelog.rst

.hgtags

@@ -57,3 +57,10 @@ e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
 383b14d6e8555ed2c8d5552259bc7ce600dfb1d0 before-leopard-drop
 a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
 5a5134a4fa9bb7ca80ae3e32010030f5bd7ba434 me6.1.0
+0fd77be57ff716d5c93232e829dc02acec036d7c se3.2.1
+3dd08060135b0b9cef70b6f5a81f191ea339c8d5 me6.1.1
+4e6cbef6bcdfcc0e56ff9690fbfe1cac1f4b1b09 pe2.3.0
+9ea9af1b886cd1adc4f42fd2276cc2b38376eab0 se3.3.0
+6e3379be6821bb36d7f0877a17dd6c07aa037b0a se3.3.1
+015ba7e2c10d09afb944f387c2a9c97f7eff7571 me6.2.0
+8178bda48324461a17118c98634241952c074f29 pe2.4.0

README

@@ -29,21 +29,18 @@ General dependencies
 - Python 3.2 (http://www.python.org)
 - Send2Trash3k (http://hg.hardcoded.net/send2trash)
 - hsaudiotag3k 1.1.0 (for ME) (http://hg.hardcoded.net/hsaudiotag)
-- jobprogress 1.0.2 (http://hg.hardcoded.net/jobprogress)
+- jobprogress 1.0.3 (http://hg.hardcoded.net/jobprogress)
-- Sphinx 1.0.7 (http://sphinx.pocoo.org/)
+- Sphinx 1.1 (http://sphinx.pocoo.org/)
+- polib 0.7.0 (http://bitbucket.org/izi/polib)
 - 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 4.1
 - Sparkle (http://sparkle.andymatuschak.org/)
-- PyObjC 2.3 (http://pyobjc.sourceforge.net/)
+- objp 1.1.0 (http://bitbucket.org/hsoft/objp)
-- pluginbuilder 1.0.1 (http://bitbucket.org/hsoft/pluginbuilder)
+- pluginbuilder 1.1.0 (http://bitbucket.org/hsoft/pluginbuilder)
 - appscript 1.0.0 for ME and PE (http://appscript.sourceforge.net/)
 
 Windows prerequisites
@@ -67,8 +64,7 @@ There's an easy way to install the majority of the prerequisites above, and it's
     pip install -r requirements-[osx|win].txt
 
 ([osx|win] depends, of course, on your platform. On other platforms, just use requirements.txt). 
-Because Sphinx doesn't support Python 3 yet, it's not in the requirements file and you'll have to 
+You might have to compile PyObjC manually (see gotchas below). Sparkle and 
-install it manually. You might have to compile PyObjC manually too (see gotchas below). Sparkle and 
 Advanced Installer, having nothing to do with Python, are also manual installs.
 
 PyQt isn't in the requirements file either (there's no package uploaded on PyPI) and you also have
@@ -93,12 +89,6 @@ PyObjC's website is badly outdated. Also, as far as I can tell, the package inst
 `easy_install` has good chances of not working. Your best bet is to download the latest tagged
 version from the repository and compile it from source.
 
-Also, on OS X, don't try to use the built-in python 2.x to install Sphinx on (the only pre-requisite
-that doesn't run on python 3 yet). There's some weird error popping up when dupeGuru tries to build 
-its help file. Install your own framework version of python 2.7, and then install Sphinx on that. 
-When Sphinx supports Python 3, things will be easier because you'll be able to install sphinx on the 
-same Python version you build dupeGuru with.
-
 Another one on OS X: I wouldn't use macports/fink/whatever. Whenever I tried using those, I always 
 ended up with problems.
 

build.py

@@ -6,18 +6,21 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
+import sys
 import os
 import os.path as op
 from optparse import OptionParser
 import shutil
 import json
+import importlib
 
-from setuptools import setup
+from setuptools import setup, Extension
-from distutils.extension import Extension
 
 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)
+    get_module_version, build_all_cocoa_locs, move_all, copy_sysconfig_files_for_embed, copy_all,
+    move)
+from hscommon import loc
 
 def parse_args():
     usage = "usage: %prog [options]"
@@ -28,37 +31,45 @@ def parse_args():
         help="Build only the help file")
     parser.add_option('--loc', action='store_true', dest='loc',
         help="Build only localization")
+    parser.add_option('--cocoamod', action='store_true', dest='cocoamod',
+        help="Build only Cocoa modules")
+    parser.add_option('--updatepot', action='store_true', dest='updatepot',
+        help="Generate .pot files from source code.")
+    parser.add_option('--mergepot', action='store_true', dest='mergepot',
+        help="Update all .po files based on .pot files.")
     (options, args) = parser.parse_args()
     return options
 
 def build_cocoa(edition, dev):
-    from pluginbuilder import build_plugin
+    build_cocoa_proxy_module()
-    print("Building dg_cocoa.plugin")
+    build_cocoa_bridging_interfaces(edition)
-    if dev:
+    print("Building the cocoa layer")
-        tocopy = ['cocoa/inter']
+    from pluginbuilder import copy_embeddable_python_dylib, get_python_header_folder, collect_dependencies
-    else:
+    copy_embeddable_python_dylib('build')
+    if not op.exists('build/PythonHeaders'):
+        os.symlink(get_python_header_folder(), 'build/PythonHeaders')
+    if not op.exists('build/py'):
+        os.mkdir('build/py')
+    cocoa_project_path = 'cocoa/{0}'.format(edition)
+    shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
     specific_packages = {
         'se': ['core_se'],
         'me': ['core_me'],
         'pe': ['core_pe'],
     }[edition]
-        tocopy = ['core', 'hscommon', 'cocoa/inter'] + specific_packages
+    tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa'] + specific_packages
-    copy_packages(tocopy, 'build')
-    cocoa_project_path = 'cocoa/{0}'.format(edition)
-    shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
-    os.chdir('build')
-    # We have to exclude PyQt4 specifically because it's conditionally imported in hscommon.trans
-    build_plugin('dg_cocoa.py', excludes=['PyQt4'], alias=dev)
-    os.chdir('..')
-    pluginpath = op.join(cocoa_project_path, 'dg_cocoa.plugin')
-    if op.exists(pluginpath):
-        shutil.rmtree(pluginpath)
-    shutil.move('build/dist/dg_cocoa.plugin', pluginpath)
     if dev:
-        # In alias mode, the tweakings we do to the pythonpath aren't counted in. We have to
+        # collect dependencies, then override our own pckages with symlinks
-        # manually put a .pth in the plugin
+        collect_dependencies('build/dg_cocoa.py', 'build/py', excludes=['PyQt4'])
-        pthpath = op.join(pluginpath, 'Contents/Resources/dev.pth')
+        copy_packages(tocopy, 'build/py', create_links=True)
-        open(pthpath, 'w').write(op.abspath('.'))
+    else:
+        copy_packages(tocopy, 'build')
+        sys.path.insert(0, 'build')
+        collect_dependencies('build/dg_cocoa.py', 'build/py', excludes=['PyQt4'])
+        del sys.path[0]
+    # Views are not referenced by python code, so they're not found by the collector.
+    copy_all('build/inter/*.so', 'build/py/inter')
+    copy_sysconfig_files_for_embed('build/py')
     os.chdir(cocoa_project_path)
     print('Generating Info.plist')
     app_version = get_module_version('core_{}'.format(edition))
@@ -73,12 +84,11 @@ def build_cocoa(edition, dev):
     os.system('xcodebuild {0}'.format(args))
     os.chdir('../..')
     print("Creating the run.py file")
-    subfolder = 'dev' if dev else 'release'
     app_path = {
-        'se': 'cocoa/se/build/{0}/dupeGuru.app',
+        'se': 'cocoa/se/dupeGuru.app',
-        'me': 'cocoa/me/build/{0}/dupeGuru\\ ME.app',
+        'me': 'cocoa/me/dupeGuru\\ ME.app',
-        'pe': 'cocoa/pe/build/{0}/dupeGuru\\ PE.app',
+        'pe': 'cocoa/pe/dupeGuru\\ PE.app',
-    }[edition].format(subfolder)
+    }[edition]
     tmpl = open('run_template_cocoa.py', 'rt').read()
     run_contents = tmpl.replace('{{app_path}}', app_path)
     open('run.py', 'wt').write(run_contents)
@@ -105,23 +115,111 @@ def build_help(edition):
 
 def build_localizations(ui, edition):
     print("Building localizations")
+    loc.compile_all_po('locale')
+    loc.compile_all_po(op.join('hscommon', 'locale'))
+    loc.merge_locale_dir(op.join('hscommon', 'locale'), 'locale')
+    if op.exists(op.join('build', 'locale')):
+        shutil.rmtree(op.join('build', 'locale'))
+    shutil.copytree('locale', op.join('build', 'locale'), ignore=shutil.ignore_patterns('*.po', '*.pot'))
     if ui == 'cocoa':
+        print("Creating lproj folders based on .po files")
+        for lang in loc.get_langs('locale'):
+            if lang == 'en':
+                continue
+            pofile = op.join('locale', lang, 'LC_MESSAGES', 'ui.po')
+            for edition_folder in ['base', 'se', 'me', 'pe']:
+                enlproj = op.join('cocoa', edition_folder, 'en.lproj')
+                dest_lproj = op.join('cocoa', edition_folder, lang + '.lproj')
+                loc.po2allxibstrings(pofile, enlproj, dest_lproj)
+                if edition_folder == 'base':
+                    loc.po2strings(pofile, op.join(enlproj, 'Localizable.strings'), op.join(dest_lproj, 'Localizable.strings'))
+            pofile = op.join('cocoalib', 'locale', lang, 'LC_MESSAGES', 'cocoalib.po')
+            loc.po2allxibstrings(pofile, op.join('cocoalib', 'en.lproj'), op.join('cocoalib', lang + '.lproj'))
         build_all_cocoa_locs('cocoalib')
         build_all_cocoa_locs(op.join('cocoa', 'base'))
         build_all_cocoa_locs(op.join('cocoa', edition))
     elif ui == 'qt':
-        print("Building .ts files")
+        loc.compile_all_po(op.join('qtlib', 'locale'))
-        build_all_qt_locs(op.join('qt', 'lang'), extradirs=[op.join('qtlib', 'lang')])
+        loc.merge_locale_dir(op.join('qtlib', 'locale'), 'locale')
+
+def build_updatepot():
+    print("Building .pot files from source files")
+    print("Building core.pot")
+    all_cores = ['core', 'core_se', 'core_me', 'core_pe']
+    loc.generate_pot(all_cores, op.join('locale', 'core.pot'), ['tr'])
+    print("Building columns.pot")
+    loc.generate_pot(all_cores, op.join('locale', 'columns.pot'), ['coltr'])
+    print("Building ui.pot")
+    ui_packages = ['qt', op.join('cocoa', 'inter')]
+    loc.generate_pot(ui_packages, op.join('locale', 'ui.pot'), ['tr'])
+    print("Building hscommon.pot")
+    loc.generate_pot(['hscommon'], op.join('hscommon', 'locale', 'hscommon.pot'), ['tr'])
+    print("Building qtlib.pot")
+    loc.generate_pot(['qtlib'], op.join('qtlib', 'locale', 'qtlib.pot'), ['tr'])
+    print("Enhancing ui.pot with Cocoa's strings files")
+    loc.allstrings2pot(op.join('cocoa', 'base', 'en.lproj'), op.join('locale', 'ui.pot'),
+        excludes={'core', 'message', 'columns'})
+    loc.allstrings2pot(op.join('cocoa', 'se', 'en.lproj'), op.join('locale', 'ui.pot'))
+    loc.allstrings2pot(op.join('cocoa', 'me', 'en.lproj'), op.join('locale', 'ui.pot'))
+    loc.allstrings2pot(op.join('cocoa', 'pe', 'en.lproj'), op.join('locale', 'ui.pot'))
+
+def build_mergepot():
+    print("Updating .po files using .pot files")
+    loc.merge_pots_into_pos('locale')
+    loc.merge_pots_into_pos(op.join('hscommon', 'locale'))
+    loc.merge_pots_into_pos(op.join('qtlib', 'locale'))
+
+def build_cocoa_ext(extname, dest, source_files, extra_frameworks=(), extra_includes=()):
+    extra_link_args = ["-framework", "CoreFoundation", "-framework", "Foundation"]
+    for extra in extra_frameworks:
+        extra_link_args += ['-framework', extra]
+    ext = Extension(extname, source_files, extra_link_args=extra_link_args, include_dirs=extra_includes)
+    setup(script_args=['build_ext', '--inplace'], ext_modules=[ext])
+    fn = extname + '.so'
+    assert op.exists(fn)
+    move(fn, op.join(dest, fn))
+
+def build_cocoa_proxy_module():
+    print("Building Cocoa Proxy")
+    import objp.p2o
+    objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m')
+    build_cocoa_ext("CocoaProxy", 'cocoalib/cocoa',
+        ['cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m', 'cocoalib/HSErrorReportWindow.m'],
+        ['AppKit', 'CoreServices'],
+        ['cocoalib'])
+
+def build_cocoa_bridging_interfaces(edition):
+    print("Building Cocoa Bridging Interfaces")
+    import objp.o2p
+    import objp.p2o
+    add_to_pythonpath('cocoa')
+    add_to_pythonpath('cocoalib')
+    from cocoa.inter import (PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
+        OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyFairware)
+    from inter.details_panel import PyDetailsPanel, DetailsPanelView
+    from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView
+    from inter.extra_fairware_reminder import PyExtraFairwareReminder, ExtraFairwareReminderView
+    from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView
+    from inter.prioritize_list import PyPrioritizeList, PrioritizeListView
+    from inter.problem_dialog import PyProblemDialog
+    from inter.result_table import PyResultTable, ResultTableView
+    from inter.stats_label import PyStatsLabel, StatsLabelView
+    from inter.app import PyDupeGuruBase, DupeGuruView
+    appmod = importlib.import_module('inter.app_{}'.format(edition))
+    allclasses = [PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyFairware,
+        PyDetailsPanel, PyDirectoryOutline, PyExtraFairwareReminder, PyPrioritizeDialog,
+        PyPrioritizeList, PyProblemDialog, PyResultTable, PyStatsLabel, PyDupeGuruBase,
+        appmod.PyDupeGuru]
+    for class_ in allclasses:
+        objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True)
+    allclasses = [GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView,
+        DetailsPanelView, DirectoryOutlineView, ExtraFairwareReminderView, PrioritizeDialogView,
+        PrioritizeListView, ResultTableView, StatsLabelView, DupeGuruView]
+    clsspecs = [objp.o2p.spec_from_python_class(class_) for class_ in allclasses]
+    objp.p2o.generate_python_proxy_code_from_clsspec(clsspecs, 'build/CocoaViews.m')
+    build_cocoa_ext('CocoaViews', 'cocoa/inter', ['build/CocoaViews.m', 'build/ObjP.m'])
 
 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 PE Modules")
     exts = [
         Extension("_block", [op.join('core_pe', 'modules', 'block.c'), op.join('core_pe', 'modules', 'common.c')]),
@@ -141,13 +239,9 @@ def build_pe_modules(ui):
         script_args = ['build_ext', '--inplace'],
         ext_modules = exts,
     )
-    move('_block.so', op.join('core_pe', '_block.so'))
+    move_all('_block_qt*', op.join('qt', 'pe'))
-    move('_block.pyd', op.join('core_pe', '_block.pyd'))
+    move_all('_block*', 'core_pe')
-    move('_block_osx.so', op.join('core_pe', '_block_osx.so'))
+    move_all('_cache*', 'core_pe')
-    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))
@@ -179,6 +273,13 @@ def main():
         build_help(edition)
     elif options.loc:
         build_localizations(ui, edition)
+    elif options.updatepot:
+        build_updatepot()
+    elif options.mergepot:
+        build_mergepot()
+    elif options.cocoamod:
+        build_cocoa_proxy_module()
+        build_cocoa_bridging_interfaces(edition)
     else:
         build_normal(edition, ui, dev)
 

cocoa/base/AppDelegate.h

@@ -16,11 +16,11 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @interface AppDelegateBase : NSObject
 {
-    IBOutlet PyDupeGuruBase *py;
     IBOutlet NSMenu *recentResultsMenu;
     IBOutlet NSMenu *actionsMenu;
     IBOutlet NSMenu *columnsMenu;
     
+    PyDupeGuru *model;
     ResultWindowBase *_resultWindow;
     DirectoryPanel *_directoryPanel;
     DetailsPanel *_detailsPanel;
@@ -30,7 +30,7 @@ http://www.hardcoded.net/licenses/bsd_license
 }
 
 /* Virtual */
-- (PyDupeGuruBase *)py;
+- (PyDupeGuru *)model;
 - (ResultWindowBase *)createResultWindow;
 - (DirectoryPanel *)createDirectoryPanel;
 - (DetailsPanel *)createDetailsPanel;

cocoa/base/AppDelegate.m

@@ -25,7 +25,8 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (void)awakeFromNib
 {
-    [py bindCocoa:self];
+    model = [[PyDupeGuru alloc] init];
+    [model bindCallback:createCallback(@"DupeGuruView", self)];
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     /* Because the pref pane is lazily loaded, we have to manually do the update check if the
        preference is set.
@@ -45,7 +46,10 @@ http://www.hardcoded.net/licenses/bsd_license
 
 /* Virtual */
 
-- (PyDupeGuruBase *)py { return py; }
+- (PyDupeGuru *)model
+{
+    return model;
+}
 
 - (ResultWindowBase *)createResultWindow
 {
@@ -59,7 +63,7 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (DetailsPanel *)createDetailsPanel
 {
-    return [[DetailsPanel alloc] initWithPy:py];
+    return [[DetailsPanel alloc] initWithPyRef:[model detailsPanel]];
 }
 
 - (NSString *)homepageURL
@@ -101,10 +105,10 @@ http://www.hardcoded.net/licenses/bsd_license
     [op setCanCreateDirectories:NO];
     [op setAllowsMultipleSelection:NO];
     [op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
-    [op setTitle:TRMSG(@"SelectResultToLoadMsg")];
+    [op setTitle:TR(@"Select a results file to load")];
     if ([op runModal] == NSOKButton) {
         NSString *filename = [[op filenames] objectAtIndex:0];
-        [py loadResultsFrom:filename];
+        [model loadResultsFrom:filename];
         [[self recentResults] addFile:filename];
     }
 }
@@ -125,7 +129,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (IBAction)showAboutBox:(id)sender
 {
     if (_aboutBox == nil) {
-        _aboutBox = [[HSAboutBox alloc] initWithApp:py];
+        _aboutBox = [[HSAboutBox alloc] initWithApp:model];
     }
     [[_aboutBox window] makeKeyAndOrderFront:sender];
 }
@@ -157,17 +161,9 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Delegate */
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    [[ProgressController mainProgressController] setWorker:py];
+    [[ProgressController mainProgressController] setWorker:model];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model initialRegistrationSetup];
-    //Restore Columns
+    [model loadSession];
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
-    if ([columnsOrder count])
-        [[self resultWindow] restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    else
-        [[self resultWindow] resetColumnsToDefault:nil];
-    [py initialRegistrationSetup];
-    [py loadSession];
 }
 
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
@@ -179,8 +175,8 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-    if ([py resultsAreModified]) {
+    if ([model resultsAreModified]) {
-        NSString *msg = TRMSG(@"ReallyWantToQuitMsg");
+        NSString *msg = TR(@"You have unsaved results, do you really want to quit?");
         if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) { // NO
             return NSTerminateCancel;
         }
@@ -191,15 +187,13 @@ http://www.hardcoded.net/licenses/bsd_license
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [[self resultWindow] getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [[self resultWindow] getColumnsWidth] forKey:@"columnsWidth"];
     NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
     if (sc >= 10) {
         sc = -1;
-        [py purgeIgnoreList];
+        [model purgeIgnoreList];
     }
     sc++;
-    [py saveSession];
+    [model 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
@@ -210,16 +204,17 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (void)recentFileClicked:(NSString *)path
 {
-    [py loadResultsFrom:path];
+    [model loadResultsFrom:path];
 }
 
 
 /* model --> view */
 - (void)showExtraFairwareReminder
 {
-    ExtraFairwareReminder *dialog = [[ExtraFairwareReminder alloc] initWithPy:py];
+    ExtraFairwareReminder *dialog = [[ExtraFairwareReminder alloc] initWithApp:model];
     [dialog start];
     [NSApp runModalForWindow:[dialog window]];
+    [dialog close];
     [dialog release];
 }
 
@@ -235,11 +230,11 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (void)showFairwareNagWithPrompt:(NSString *)prompt
 {
-    [HSFairwareReminder showFairwareNagWithApp:[self py] prompt:prompt];
+    [HSFairwareReminder showFairwareNagWithApp:[self model] prompt:prompt];
 }
 
 - (void)showDemoNagWithPrompt:(NSString *)prompt
 {
-    [HSFairwareReminder showDemoNagWithApp:[self py] prompt:prompt];
+    [HSFairwareReminder showDemoNagWithApp:[self model] prompt:prompt];
 }
 @end

cocoa/base/Consts.h

@@ -6,7 +6,7 @@ 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 "HSConsts.h"
 
 #define JobStarted @"JobStarted"
 #define JobInProgress @"JobInProgress"
@@ -19,7 +19,3 @@ http://www.hardcoded.net/licenses/bsd_license
 #define jobDelete @"job_delete"
 
 #define DGPrioritizeIndexPasteboardType @"DGPrioritizeIndexPasteboardType"
-
-#define TR(s) NSLocalizedString(s, @"")
-#define TRCOL(s) NSLocalizedStringFromTable(s, @"columns", @"")
-#define TRMSG(s) NSLocalizedStringFromTable(s, @"message", @"")

cocoa/base/DetailsPanel.h

@@ -7,16 +7,17 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSWindowController.h"
+#import <Python.h>
-#import "PyApp.h"
 #import "PyDetailsPanel.h"
 
-@interface DetailsPanel : HSWindowController
+@interface DetailsPanel : NSWindowController
 {
     IBOutlet NSTableView *detailsTable;
+    
+    PyDetailsPanel *model;
 }
-- (id)initWithPy:(PyApp *)aPy;
+- (id)initWithPyRef:(PyObject *)aPyRef;
-- (PyDetailsPanel *)py;
+- (PyDetailsPanel *)model;
 
 - (BOOL)isVisible;
 - (void)toggleVisibility;

cocoa/base/DetailsPanel.m

@@ -10,23 +10,24 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "Utils.h"
 
 @implementation DetailsPanel
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithPyRef:(PyObject *)aPyRef
 {
-    self = [super initWithNibName:@"DetailsPanel" pyClassName:@"PyDetailsPanel" pyParent:aPy];
+    self = [super initWithWindowNibName:@"DetailsPanel"];
     [self window]; //So the detailsTable is initialized.
-    [self connect];
+    model = [[PyDetailsPanel alloc] initWithModel:aPyRef];
+    [model bindCallback:createCallback(@"DetailsPanelView", self)];
     return self;
 }
 
 - (void)dealloc
 {
-    [self disconnect];
+    [model release];
     [super dealloc];
 }
 
-- (PyDetailsPanel *)py
+- (PyDetailsPanel *)model
 {
-    return (PyDetailsPanel *)py;
+    return (PyDetailsPanel *)model;
 }
 
 - (void)refreshDetails
@@ -53,12 +54,12 @@ http://www.hardcoded.net/licenses/bsd_license
 /* NSTableView Delegate */
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
 {
-    return [[self py] numberOfRows];
+    return [[self model] numberOfRows];
 }
 
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
 {
-    return [[self py] valueForColumn:[column identifier] row:row];
+    return [[self model] valueForColumn:[column identifier] row:row];
 }
 
 /* Python --> Cocoa */

cocoa/base/DirectoryOutline.h

@@ -7,12 +7,13 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import <Python.h>
 #import "HSOutline.h"
 #import "PyDirectoryOutline.h"
 
 #define DGAddedFoldersNotification @"DGAddedFoldersNotification"
 
 @interface DirectoryOutline : HSOutline {}
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
+- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView;
-- (PyDirectoryOutline *)py;
+- (PyDirectoryOutline *)model;
 @end;

cocoa/base/DirectoryOutline.m

@@ -9,23 +9,17 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "DirectoryOutline.h"
 
 @implementation DirectoryOutline
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
+- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView
 {
-    self = [super initWithPyClassName:@"PyDirectoryOutline" pyParent:aPyParent view:aOutlineView];
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyDirectoryOutline class]
-    [outlineView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+        callbackClassName:@"DirectoryOutlineView" view:aOutlineView];
-    [self connect];
+    [[self view] registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
     return self;
 }
 
-- (void)dealloc
+- (PyDirectoryOutline *)model
 {
-    [self disconnect];
+    return (PyDirectoryOutline *)model;
-    [super dealloc];
-}
-
-- (PyDirectoryOutline *)py
-{
-    return (PyDirectoryOutline *)py;
 }
 
 /* Delegate */
@@ -53,7 +47,7 @@ http://www.hardcoded.net/licenses/bsd_license
         if (!(sourceDragMask & NSDragOperationLink))
             return NO;
         for (NSString *foldername in foldernames) {
-            [[self py] addDirectory:foldername];
+            [[self model] addDirectory:foldername];
         }
         NSDictionary *userInfo = [NSDictionary dictionaryWithObject:foldernames forKey:@"foldernames"];
         [[NSNotificationCenter defaultCenter] postNotificationName:DGAddedFoldersNotification
@@ -67,7 +61,7 @@ http://www.hardcoded.net/licenses/bsd_license
     if ([cell isKindOfClass:[NSTextFieldCell class]]) {
         NSTextFieldCell *textCell = cell;
         NSIndexPath *path = item;
-        BOOL selected = [path isEqualTo:[outlineView selectedPath]];
+        BOOL selected = [path isEqualTo:[[self view] selectedPath]];
         if (selected) {
             [textCell setTextColor:[NSColor blackColor]];
             return;

cocoa/base/DirectoryPanel.h

@@ -22,7 +22,7 @@ http://www.hardcoded.net/licenses/bsd_license
     IBOutlet NSButton *removeButton;
     
     AppDelegateBase *_app;
-    PyDupeGuruBase *_py;
+    PyDupeGuru *model;
     HSRecentFiles *_recentDirectories;
     DirectoryOutline *outline;
     BOOL _alwaysShowPopUp;

cocoa/base/DirectoryPanel.m

@@ -18,13 +18,13 @@ http://www.hardcoded.net/licenses/bsd_license
     self = [super initWithWindowNibName:@"DirectoryPanel"];
     [self window];
     _app = aParentApp;
-    _py = [_app py];
+    model = [_app model];
-    [[self window] setTitle:[_py appName]];
+    [[self window] setTitle:[model appName]];
     _alwaysShowPopUp = NO;
     [self fillPopUpMenu];
     _recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
     [_recentDirectories setDelegate:self];
-    outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
+    outline = [[DirectoryOutline alloc] initWithPyRef:[model directoryTree] outlineView:outlineView];
     [self refreshRemoveButtonText];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
         name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
@@ -58,7 +58,7 @@ http://www.hardcoded.net/licenses/bsd_license
     [op setCanChooseFiles:YES];
     [op setCanChooseDirectories:YES];
     [op setAllowsMultipleSelection:YES];
-    [op setTitle:TRMSG(@"SelectFolderToAddMsg")];
+    [op setTitle:TR(@"Select a folder to add to the scanning list")];
     [op setDelegate:self];
     if ([op runModal] == NSOKButton) {
         for (NSString *directory in [op filenames]) {
@@ -100,32 +100,21 @@ http://www.hardcoded.net/licenses/bsd_license
 - (IBAction)removeSelectedDirectory:(id)sender
 {
     [[self window] makeKeyAndOrderFront:nil];
-    if ([outlineView selectedRow] < 0)
+    [[outline model] removeSelectedDirectory];
-        return;
-    NSIndexPath *path = [outline selectedIndexPath];
-    NSInteger state = [outline intProperty:@"state" valueAtPath:path];
-    if (([path length] == 1) && (state != 2)) {
-        [_py removeDirectory:i2n([path indexAtPosition:0])];
-    }
-    else {
-        NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back
-        [outline setIntProperty:@"state" value:newState atPath:path];
-        [outlineView display];
-    }
     [self refreshRemoveButtonText];
 }
 
 /* Public */
 - (void)addDirectory:(NSString *)directory
 {
-    NSInteger r = [[_py addDirectory:directory] intValue];
+    NSInteger r = [model addDirectory:directory];
     if (r) {
         NSString *m = @"";
         if (r == 1) {
-            m = TRMSG(@"FolderAlreadyInListMsg");
+            m = TR(@"'%@' already is in the list.");
         }
         else if (r == 2) {
-            m = TRMSG(@"FolderDoesNotExistMsg");
+            m = TR(@"'%@' does not exist.");
         }
         [Dialogs showMessage:[NSString stringWithFormat:m,directory]];
     }
@@ -140,9 +129,13 @@ http://www.hardcoded.net/licenses/bsd_license
         return;
     }
     [removeButton setEnabled:YES];
-    NSInteger state = [outline intProperty:@"state" valueAtPath:[outline selectedIndexPath]];
+    NSIndexPath *path = [outline selectedIndexPath];
-    NSString *imgName = state == 2 ? @"NSGoLeftTemplate" : @"NSRemoveTemplate";
+    if (path != nil) {
+        NSInteger state = [outline intProperty:@"state" valueAtPath:path];
+        BOOL shouldDisplayArrow = ([path length] > 1) && (state == 2);
+        NSString *imgName = shouldDisplayArrow ? @"NSGoLeftTemplate" : @"NSRemoveTemplate";
         [removeButton setImage:[NSImage imageNamed:imgName]];
+    }
 }
 
 /* Delegate */

cocoa/base/ExtraFairwareReminder.h

@@ -8,17 +8,17 @@ http://www.hardcoded.net/licenses/bsd_license
 
 #import <Cocoa/Cocoa.h>
 #import "PyExtraFairwareReminder.h"
-#import "HSWindowController.h"
+#import "PyDupeGuru.h"
-#import "PyApp.h"
 
-@interface ExtraFairwareReminder : HSWindowController
+@interface ExtraFairwareReminder : NSWindowController
 {
     IBOutlet NSButton *continueButton;
     
+    PyExtraFairwareReminder *model;
     NSTimer *timer;
 }
-- (id)initWithPy:(PyApp *)aPy;
+- (id)initWithApp:(PyDupeGuru *)aApp;
-- (PyExtraFairwareReminder *)py;
+- (PyExtraFairwareReminder *)model;
 
 - (void)start;
 - (void)updateButton;

cocoa/base/ExtraFairwareReminder.m

@@ -7,35 +7,39 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ExtraFairwareReminder.h"
+#import "Utils.h"
 
 @implementation ExtraFairwareReminder
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithApp:(PyDupeGuru *)aApp
 {
-    self = [super initWithNibName:@"ExtraFairwareReminder" pyClassName:@"PyExtraFairwareReminder" pyParent:aPy];
+    self = [super initWithWindowNibName:@"ExtraFairwareReminder"];
     [self window];
     [continueButton setEnabled:NO];
+    model = [[PyExtraFairwareReminder alloc] initWithApp:[aApp pyRef]];
+    [model bindCallback:createCallback(@"ExtraFairwareReminderView", self)];
     return self;
 }
 
 - (void)dealloc
 {
+    [model release];
     [timer release];
     [super dealloc];
 }
 
-- (PyExtraFairwareReminder *)py
+- (PyExtraFairwareReminder *)model
 {
-    return (PyExtraFairwareReminder *)py;
+    return (PyExtraFairwareReminder *)model;
 }
 
 - (void)start
 {
-    [[self py] start];
+    [[self model] start];
 }
 
 - (void)updateButton
 {
-    [[self py] updateButton];
+    [[self model] updateButton];
 }
 
 - (IBAction)continue:(id)sender

cocoa/base/PrioritizeDialog.h

@@ -7,25 +7,25 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSWindowController.h"
-#import "PyApp.h"
 #import "PyPrioritizeDialog.h"
 #import "HSPopUpList.h"
 #import "HSSelectableList.h"
 #import "PrioritizeList.h"
+#import "PyDupeGuru.h"
 
-@interface PrioritizeDialog : HSWindowController
+@interface PrioritizeDialog : NSWindowController
 {
     IBOutlet NSPopUpButton *categoryPopUpView;
     IBOutlet NSTableView *criteriaTableView;
     IBOutlet NSTableView *prioritizationTableView;
     
+    PyPrioritizeDialog *model;
     HSPopUpList *categoryPopUp;
     HSSelectableList *criteriaList;
     PrioritizeList *prioritizationList;
 }
-- (id)initWithPy:(PyApp *)aPy;
+- (id)initWithApp:(PyDupeGuru *)aApp;
-- (PyPrioritizeDialog *)py;
+- (PyPrioritizeDialog *)model;
 
 - (IBAction)addSelected:(id)sender;
 - (IBAction)removeSelected:(id)sender;

cocoa/base/PrioritizeDialog.m

@@ -7,50 +7,54 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "PrioritizeDialog.h"
+#import "Utils.h"
 
 @implementation PrioritizeDialog
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithApp:(PyDupeGuru *)aApp
 {
-    self = [super initWithNibName:@"PrioritizeDialog" pyClassName:@"PyPrioritizeDialog" pyParent:aPy];
+    self = [super initWithWindowNibName:@"PrioritizeDialog"];
     [self window];
-    categoryPopUp = [[HSPopUpList alloc] initWithPy:[[self py] categoryList] view:categoryPopUpView];
+    model = [[PyPrioritizeDialog alloc] initWithApp:[aApp pyRef]];
-    criteriaList = [[HSSelectableList alloc] initWithPy:[[self py] criteriaList] view:criteriaTableView];
+    [model bindCallback:createCallback(@"PrioritizeDialogView", self)];
-    prioritizationList = [[PrioritizeList alloc] initWithPy:[[self py] prioritizationList] view:prioritizationTableView];
+    categoryPopUp = [[HSPopUpList alloc] initWithPyRef:[[self model] categoryList] popupView:categoryPopUpView];
-    [self connect];
+    criteriaList = [[HSSelectableList alloc] initWithPyRef:[[self model] criteriaList] tableView:criteriaTableView];
+    prioritizationList = [[PrioritizeList alloc] initWithPyRef:[[self model] prioritizationList] tableView:prioritizationTableView];
     return self;
 }
 
 - (void)dealloc
 {
-    [self disconnect];
     [categoryPopUp release];
     [criteriaList release];
     [prioritizationList release];
+    [model release];
     [super dealloc];
 }
 
-- (PyPrioritizeDialog *)py
+- (PyPrioritizeDialog *)model
 {
-    return (PyPrioritizeDialog *)py;
+    return (PyPrioritizeDialog *)model;
 }
 
 - (IBAction)addSelected:(id)sender
 {
-    [[self py] addSelected];
+    [[self model] addSelected];
 }
 
 - (IBAction)removeSelected:(id)sender
 {
-    [[self py] removeSelected];
+    [[self model] removeSelected];
 }
 
 - (IBAction)ok:(id)sender
 {
     [NSApp stopModal];
+    [self close];
 }
 
 - (IBAction)cancel:(id)sender
 {
     [NSApp abortModal];
+    [self close];
 }
 @end

cocoa/base/PrioritizeList.h

@@ -11,5 +11,6 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "PyPrioritizeList.h"
 
 @interface PrioritizeList : HSSelectableList {}
-- (PyPrioritizeList *)py;
+- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView;
+- (PyPrioritizeList *)model;
 @end

cocoa/base/PrioritizeList.m

@@ -11,9 +11,16 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "Consts.h"
 
 @implementation PrioritizeList
-- (PyPrioritizeList *)py
+- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView
 {
-    return (PyPrioritizeList *)py;
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyPrioritizeList class]
+        callbackClassName:@"PrioritizeListView" view:aTableView];
+    return self;
+}
+
+- (PyPrioritizeList *)model
+{
+    return (PyPrioritizeList *)model;
 }
 
 - (void)setView:(NSTableView *)aTableView
@@ -45,7 +52,7 @@ http://www.hardcoded.net/licenses/bsd_license
     NSPasteboard* pboard = [info draggingPasteboard];
     NSData* rowData = [pboard dataForType:DGPrioritizeIndexPasteboardType];
     NSIndexSet* rowIndexes = [NSKeyedUnarchiver unarchiveObjectWithData:rowData];
-    [[self py] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row];
+    [[self model] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row];
     return YES;
 }
 @end

cocoa/base/ProblemDialog.h

@@ -7,19 +7,18 @@ 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
+@interface ProblemDialog : NSWindowController
 {
     IBOutlet NSTableView *problemTableView;
     
+    PyProblemDialog *model;
     HSTable *problemTable;
 }
-- (id)initWithPy:(PyApp *)aPy;
+- (id)initWithPyRef:(PyObject *)aPyRef;
-- (PyProblemDialog *)py;
 
+- (void)initializeColumns;
 - (IBAction)revealSelected:(id)sender;
 @end

cocoa/base/ProblemDialog.m

@@ -10,31 +10,35 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "Utils.h"
 
 @implementation ProblemDialog
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithPyRef:(PyObject *)aPyRef
 {
-    self = [super initWithNibName:@"ProblemDialog" pyClassName:@"PyProblemDialog" pyParent:aPy];
+    self = [super initWithWindowNibName:@"ProblemDialog"];
     [self window]; //So the detailsTable is initialized.
-    problemTable = [[HSTable alloc] initWithPyClassName:@"PyProblemTable" pyParent:[self py] view:problemTableView];
+    model = [[PyProblemDialog alloc] initWithModel:aPyRef];
-    [self connect];
+    problemTable = [[HSTable alloc] initWithPyRef:[model problemTable] tableView:problemTableView];
-    [problemTable connect];
+    [self initializeColumns];
     return self;
 }
 
 - (void)dealloc
 {
-    [problemTable disconnect];
-    [self disconnect];
     [problemTable release];
+    [model release];
     [super dealloc];
 }
 
-- (PyProblemDialog *)py
+- (void)initializeColumns
 {
-    return (PyProblemDialog *)py;
+    HSColumnDef defs[] = {
+        {@"path", 202, 40, 0, NO, nil},
+        {@"msg", 228, 40, 0, NO, nil},
+        nil
+    };
+    [[problemTable columns] initializeColumns:defs];
 }
 
 - (IBAction)revealSelected:(id)sender
 {
-    [[self py] revealSelected];
+    [model revealSelected];
 }
 @end

cocoa/base/PyDetailsPanel.h

@@ -1,15 +0,0 @@
-/* 
-Copyright 2011 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 PyDetailsPanel : PyGUI
-- (NSInteger)numberOfRows;
-- (id)valueForColumn:(NSString *)column row:(NSInteger)row;
-@end

cocoa/base/PyDirectoryOutline.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2011 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 "PyOutline.h"
-
-@interface PyDirectoryOutline : PyOutline
-- (void)addDirectory:(NSString *)directoryPath;
-@end

cocoa/base/PyDupeGuru.h

@@ -1,59 +0,0 @@
-/* 
-Copyright 2011 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 "PyApp.h"
-
-@interface PyDupeGuruBase : PyApp
-- (void)bindCocoa:(id)cocoa;
-//Actions
-- (NSNumber *)addDirectory:(NSString *)name;
-- (void)removeDirectory:(NSNumber *)index;
-- (void)loadResultsFrom:(NSString *)filename;
-- (void)saveResultsAs:(NSString *)filename;
-- (void)loadSession;
-- (void)saveSession;
-- (void)clearIgnoreList;
-- (void)purgeIgnoreList;
-- (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
-- (void)invokeCommand:(NSString *)cmd;
-
-- (void)doScan;
-
-- (void)toggleSelectedMark;
-- (void)markAll;
-- (void)markInvert;
-- (void)markNone;
-
-- (void)addSelectedToIgnoreList;
-- (void)openSelected;
-- (void)revealSelected;
-- (void)makeSelectedReference;
-- (void)applyFilter:(NSString *)filter;
-
-- (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
-- (void)deleteMarked;
-- (void)hardlinkMarked;
-- (void)removeMarked;
-
-//Data
-- (NSNumber *)getIgnoreListCount;
-- (NSNumber *)getMarkCount;
-- (BOOL)scanWasProblematic;
-- (BOOL)resultsAreModified;
-- (NSArray *)deltaColumns;
-
-//Scanning options
-- (void)setScanType:(NSNumber *)scan_type;
-- (void)setMinMatchPercentage:(NSNumber *)percentage;
-- (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/PyExtraFairwareReminder.h

@@ -1,15 +0,0 @@
-/* 
-Copyright 2011 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 PyExtraFairwareReminder : PyGUI
-- (void)start;
-- (void)updateButton;
-@end

cocoa/base/PyPrioritizeDialog.h

@@ -1,20 +0,0 @@
-/* 
-Copyright 2011 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"
-#import "PySelectableList.h"
-
-@interface PyPrioritizeDialog : PyGUI
-- (PySelectableList *)categoryList;
-- (PySelectableList *)criteriaList;
-- (PySelectableList *)prioritizationList;
-- (void)addSelected;
-- (void)removeSelected;
-- (void)performReprioritization;
-@end

cocoa/base/PyPrioritizeList.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2011 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 "PySelectableList.h"
-
-@interface PyPrioritizeList : PySelectableList
-- (void)moveIndexes:(NSArray *)indexes toIndex:(NSInteger)destIndex;
-@end

cocoa/base/PyProblemDialog.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2011 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,25 +0,0 @@
-/* 
-Copyright 2011 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 "PyTable.h"
-
-@interface PyResultTable : PyTable
-- (BOOL)powerMarkerMode;
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
-- (BOOL)deltaValuesMode;
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
-
-- (NSString *)valueForRow:(NSInteger)rowIndex column:(NSInteger)aColumn;
-- (BOOL)renameSelected:(NSString *)aNewName;
-- (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
-- (void)markSelected;
-- (void)removeSelected;
-- (NSInteger)selectedDupeCount;
-- (NSString *)pathAtIndex:(NSInteger)index;
-@end

cocoa/base/PyStatsLabel.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2011 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 PyStatsLabel : PyGUI
-- (NSString *)display;
-@end

cocoa/base/ResultTable.h

@@ -13,15 +13,14 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @interface ResultTable : HSTable <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
 {
-    NSIndexSet *_deltaColumns;
+    NSSet *_deltaColumns;
 }
-- (id)initWithPyParent:(id)aPyParent view:(NSTableView *)aTableView;
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView;
-- (PyResultTable *)py;
+- (PyResultTable *)model;
 - (BOOL)powerMarkerMode;
 - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
 - (BOOL)deltaValuesMode;
 - (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
-- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns;
 - (NSInteger)selectedDupeCount;
 - (void)removeSelected;
 @end;

cocoa/base/ResultTable.m

@@ -18,23 +18,22 @@ http://www.hardcoded.net/licenses/bsd_license
 @end
 
 @implementation ResultTable
-- (id)initWithPyParent:(id)aPyParent view:(NSTableView *)aTableView
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView
 {
-    self = [super initWithPyClassName:@"PyResultTable" pyParent:aPyParent view:aTableView];
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyResultTable class] callbackClassName:@"ResultTableView" view:aTableView];
-    [self connect];
+    _deltaColumns = [[NSSet setWithArray:[[self model] deltaColumns]] retain];
     return self;
 }
 
 - (void)dealloc
 {
-    [self disconnect];
     [_deltaColumns release];
     [super dealloc];
 }
 
-- (PyResultTable *)py
+- (PyResultTable *)model
 {
-    return (PyResultTable *)py;
+    return (PyResultTable *)model;
 }
 
 /* Private */
@@ -60,33 +59,27 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Public */
 - (BOOL)powerMarkerMode
 {
-    return [[self py] powerMarkerMode];
+    return [[self model] powerMarkerMode];
 }
 
 - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
 {
-    [[self py] setPowerMarkerMode:aPowerMarkerMode];
+    [[self model] setPowerMarkerMode:aPowerMarkerMode];
 }
 
 - (BOOL)deltaValuesMode
 {
-    return [[self py] deltaValuesMode];
+    return [[self model] deltaValuesMode];
 }
 
 - (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
 {
-    [[self py] setDeltaValuesMode:aDeltaValuesMode];
+    [[self model] setDeltaValuesMode:aDeltaValuesMode];
-}
-
-- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
-{
-    [_deltaColumns release];
-    _deltaColumns = [aDeltaColumns retain];
 }
 
 - (NSInteger)selectedDupeCount
 {
-    return [[self py] selectedDupeCount];
+    return [[self model] selectedDupeCount];
 }
 
 - (void)removeSelected
@@ -94,11 +87,11 @@ http://www.hardcoded.net/licenses/bsd_license
     NSInteger selectedDupeCount = [self selectedDupeCount];
     if (!selectedDupeCount)
         return;
-    NSString *msgFmt = TRMSG(@"FileRemovalConfirmMsg");
+    NSString *msgFmt = TR(@"You are about to remove %d files from results. Continue?");
     NSString *msg = [NSString stringWithFormat:msgFmt,selectedDupeCount];
     if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
-    [[self py] removeSelected];
+    [[self model] removeSelected];
 }
 
 /* Datasource */
@@ -106,28 +99,27 @@ http://www.hardcoded.net/licenses/bsd_license
 {
     NSString *identifier = [column identifier];
     if ([identifier isEqual:@"marked"]) {
-        return [[self py] valueForColumn:@"marked" row:row];
+        return [[self model] valueForColumn:@"marked" row:row];
     }
-    NSInteger columnId = [identifier integerValue];
+    return [[self model] valueForRow:row column:identifier];
-    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];
+        [[self model] setValue:object forColumn:identifier row:row];
     }
-    else if ([identifier isEqual:@"0"]) {
+    else if ([identifier isEqual:@"name"]) {
-        NSString *oldName = [[self py] valueForRow:row column:0];
+        NSString *oldName = [[self model] valueForRow:row column:identifier];
         NSString *newName = object;
         if (![newName isEqual:oldName]) {
-            BOOL renamed = [[self py] renameSelected:newName];
+            BOOL renamed = [[self model] renameSelected:newName];
             if (!renamed) {
-                [Dialogs showMessage:[NSString stringWithFormat:TRMSG(@"FilenameAlreadyExistsMsg"), newName]];
+                [Dialogs showMessage:[NSString stringWithFormat:TR(@"The name '%@' already exists."), newName]];
             }
             else {
-                [tableView setNeedsDisplay:YES];
+                [[self view] setNeedsDisplay:YES];
             }
         }
     }
@@ -136,16 +128,16 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Delegate */
 - (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)tableColumn
 {
-    if ([[tableView sortDescriptors] count] < 1)
+    if ([[[self view] sortDescriptors] count] < 1)
         return;
-    NSSortDescriptor *sd = [[tableView sortDescriptors] objectAtIndex:0];
+    NSSortDescriptor *sd = [[[self view] sortDescriptors] objectAtIndex:0];
-    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
+    [[self model] sortBy:[sd key] ascending:[sd ascending]];
 }
 
 - (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row
 {
-    BOOL isSelected = [tableView isRowSelected:row];
+    BOOL isSelected = [[self view] isRowSelected:row];
-    BOOL isMarkable = n2b([[self py] valueForColumn:@"markable" row:row]);
+    BOOL isMarkable = n2b([[self model] valueForColumn:@"markable" row:row]);
     if ([[column identifier] isEqual:@"marked"]) {
         [cell setEnabled:isMarkable];
         // Low-tech solution, for indentation, but it works...
@@ -159,8 +151,7 @@ http://www.hardcoded.net/licenses/bsd_license
         }
         else if (isMarkable) {
             if ([self deltaValuesMode]) {
-                NSInteger i = [[column identifier] integerValue];
+                if ([_deltaColumns containsObject:[column identifier]]) {
-                if ([_deltaColumns containsIndex:i]) {
                     color = [NSColor orangeColor];
                 }
             }
@@ -180,21 +171,21 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
 {
-    [[self py] markSelected];
+    [[self model] markSelected];
     return YES;
 }
 
 /* Quicklook */
 - (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel *)panel
 {
-    return [[[self py] selectedRows] count];
+    return [[[self model] selectedRows] count];
 }
 
 - (id <QLPreviewItem>)previewPanel:(QLPreviewPanel *)panel previewItemAtIndex:(NSInteger)index
 {
-    NSArray *selectedRows = [[self py] selectedRows];
+    NSArray *selectedRows = [[self model] selectedRows];
     NSInteger absIndex = n2i([selectedRows objectAtIndex:index]);
-    NSString *path = [[self py] pathAtIndex:absIndex];
+    NSString *path = [[self model] pathAtIndex:absIndex];
     return [[HSQLPreviewItem alloc] initWithUrl:[NSURL fileURLWithPath:path] title:path];
 }
 
@@ -211,6 +202,6 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Python --> Cocoa */
 - (void)invalidateMarkings
 {
-    [tableView setNeedsDisplay:YES];
+    [[self view] setNeedsDisplay:YES];
 }
 @end

cocoa/base/ResultWindow.h

@@ -25,9 +25,8 @@ http://www.hardcoded.net/licenses/bsd_license
     IBOutlet NSSearchField *filterField;
     
     AppDelegateBase *app;
-    PyDupeGuruBase *py;
+    PyDupeGuru *model;
     NSMenu *columnsMenu;
-    NSMutableArray *_resultColumns;
     ResultTable *table;
     StatsLabel *statsLabel;
     ProblemDialog *problemDialog;
@@ -41,10 +40,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 /* Helpers */
 - (void)fillColumnsMenu;
-- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
-- (NSArray *)getColumnsOrder;
-- (NSDictionary *)getColumnsWidth;
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 - (void)sendMarkedToTrash:(BOOL)hardlinkDeleted;
 - (void)updateOptionSegments;
 

cocoa/base/ResultWindow.m

@@ -19,19 +19,18 @@ http://www.hardcoded.net/licenses/bsd_license
 {
     self = [super initWithWindowNibName:@"ResultWindow"];
     app = aApp;
-    py = [app py];
+    model = [app model];
-    [[self window] setTitle:fmt(@"%@ Results", [py appName])];
+    [[self window] setTitle:fmt(@"%@ Results", [model appName])];
     columnsMenu = [app columnsMenu];
     /* Put a cute iTunes-like bottom bar */
     [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
-    table = [[ResultTable alloc] initWithPyParent:py view:matches];
+    table = [[ResultTable alloc] initWithPyRef:[model resultTable] view:matches];
-    statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
+    statsLabel = [[StatsLabel alloc] initWithPyRef:[model statsLabel] view:stats];
-    problemDialog = [[ProblemDialog alloc] initWithPy:py];
+    problemDialog = [[ProblemDialog alloc] initWithPyRef:[model problemDialog]];
     [self initResultColumns];
     [self fillColumnsMenu];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openClicked:)];
-    [table setDeltaColumns:[Utils array2IndexSet:[py deltaColumns]]];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
@@ -50,9 +49,6 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Virtual */
 - (void)initResultColumns
 {
-    NSUserDefaults *udc = [NSUserDefaultsController sharedUserDefaultsController];
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    [refCol bind:@"fontSize" toObject:udc withKeyPath:@"values.TableFontSize" options:nil];
 }
 
 - (void)setScanOptions
@@ -62,14 +58,15 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Helpers */
 - (void)fillColumnsMenu
 {
-    // The columns menu is supposed to be empty and initResultColumns must have been called
+    NSArray *menuItems = [[[table columns] model] menuItems];
-    for (NSTableColumn *col in _resultColumns)
+    for (NSInteger i=0; i < [menuItems count]; i++) {
-    {
+        NSArray *pair = [menuItems objectAtIndex:i];
-        NSMenuItem *mi = [columnsMenu addItemWithTitle:[[col headerCell] stringValue] action:@selector(toggleColumn:) keyEquivalent:@""];
+        NSString *display = [pair objectAtIndex:0];
-        [mi setTag:[[col identifier] integerValue]];
+        BOOL marked = n2b([pair objectAtIndex:1]);
+        NSMenuItem *mi = [columnsMenu addItemWithTitle:display action:@selector(toggleColumn:) keyEquivalent:@""];
         [mi setTarget:self];
-        if ([[matches tableColumns] containsObject:col])
+        [mi setState:marked ? NSOnState : NSOffState];
-            [mi setState:NSOnState];
+        [mi setTag:i];
     }
     [columnsMenu addItem:[NSMenuItem separatorItem]];
     NSMenuItem *mi = [columnsMenu addItemWithTitle:TR(@"Reset to Default")
@@ -77,86 +74,26 @@ http://www.hardcoded.net/licenses/bsd_license
     [mi setTarget:self];
 }
 
-- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn
-{
-    NSNumber *n = [NSNumber numberWithInteger:aIdentifier];
-    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
-    [col setWidth:aWidth];
-    [col setEditable:NO];
-    [[col dataCell] setFont:[[aColumn dataCell] font]];
-    [[col headerCell] setStringValue:aTitle];
-    [col setResizingMask:NSTableColumnUserResizingMask];
-    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
-    NSUserDefaults *udc = [NSUserDefaultsController sharedUserDefaultsController];
-    [col bind:@"fontSize" toObject:udc withKeyPath:@"values.TableFontSize" options:nil];
-    return col;
-}
-
-//Returns an array of identifiers, in order.
-- (NSArray *)getColumnsOrder
-{
-    NSMutableArray *result = [NSMutableArray array];
-    for (NSTableColumn *col in [matches tableColumns]) {
-        NSString *colId = [col identifier];
-        [result addObject:colId];
-    }
-    return result;
-}
-
-- (NSDictionary *)getColumnsWidth
-{
-    NSMutableDictionary *result = [NSMutableDictionary dictionary];
-    for (NSTableColumn *col in [matches tableColumns]) {
-        NSString *colId = [col identifier];
-        NSNumber *width = [NSNumber numberWithDouble:[col width]];
-        [result setObject:width forKey:colId];
-    }
-    return result;
-}
-
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
-{
-    for (NSMenuItem *mi in [columnsMenu itemArray]) {
-        if ([mi state] == NSOnState) {
-            [self toggleColumn:mi];
-        }
-    }
-    //Add columns and set widths
-    for (NSString *colId in aColumnsOrder) {
-        NSInteger colIndex = [colId integerValue];
-        if ((colIndex == 0) && (![colId isEqual:@"0"])) {
-            continue;
-        }
-        NSTableColumn *col = [_resultColumns objectAtIndex:colIndex];
-        NSNumber *width = [aColumnsWidth objectForKey:[col identifier]];
-        NSMenuItem *mi = [columnsMenu itemWithTag:colIndex];
-        if (width) {
-            [col setWidth:[width floatValue]];
-        }
-        [self toggleColumn:mi];
-    }
-}
-
 - (void)sendMarkedToTrash:(BOOL)hardlinkDeleted
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [model getMarkCount];
     if (!mark_count) {
         return;
     }
-    NSString *msg = TRMSG(@"SendToTrashConfirmMsg");
+    NSString *msg = TR(@"You are about to send %d files to Trash. Continue?");
     if (hardlinkDeleted) {
-        msg = TRMSG(@"HardlinkConfirmMsg");
+        msg = TR(@"You are about to send %d files to Trash (and hardlink them afterwards). Continue?");
     }
     if ([Dialogs askYesNo:[NSString stringWithFormat:msg,mark_count]] == NSAlertSecondButtonReturn) { // NO
         return;
     }
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
     if (hardlinkDeleted) {
-        [py hardlinkMarked];
+        [model hardlinkMarked];
     }
     else {
-        [py deleteMarked];
+        [model deleteMarked];
     }
 }
 
@@ -170,13 +107,13 @@ http://www.hardcoded.net/licenses/bsd_license
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender
 {
-    NSInteger i = n2i([py getIgnoreListCount]);
+    NSInteger i = [model getIgnoreListCount];
     if (!i)
         return;
-    NSString *msg = [NSString stringWithFormat:TRMSG(@"ClearIgnoreListConfirmMsg"),i];
+    NSString *msg = [NSString stringWithFormat:TR(@"Do you really want to remove all %d items from the ignore list?"),i];
     if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
-    [py clearIgnoreList];
+    [model clearIgnoreList];
 }
 
 - (IBAction)changeOptions:(id)sender
@@ -195,7 +132,7 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)copyMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [model getMarkCount];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -203,11 +140,11 @@ http://www.hardcoded.net/licenses/bsd_license
     [op setCanChooseDirectories:YES];
     [op setCanCreateDirectories:YES];
     [op setAllowsMultipleSelection:NO];
-    [op setTitle:TRMSG(@"SelectCopyDestinationMsg")];
+    [op setTitle:TR(@"Select a directory to copy marked files to")];
     if ([op runModal] == NSOKButton) {
         NSString *directory = [[op filenames] objectAtIndex:0];
         NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-        [py copyOrMove:b2n(YES) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
+        [model copyOrMove:YES markedTo:directory recreatePath:n2b([ud objectForKey:@"recreatePathType"])];
     }
 }
 
@@ -223,15 +160,15 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)exportToXHTML:(id)sender
 {
-    NSString *exported = [py exportToXHTMLwithColumns:[self getColumnsOrder]];
+    NSString *exported = [model exportToXHTML];
     [[NSWorkspace sharedWorkspace] openFile:exported];
 }
 
 - (IBAction)filter:(id)sender
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setEscapeFilterRegexp:!n2b([ud objectForKey:@"useRegexpFilter"])];
+    [model setEscapeFilterRegexp:!n2b([ud objectForKey:@"useRegexpFilter"])];
-    [py applyFilter:[filterField stringValue]];
+    [model applyFilter:[filterField stringValue]];
 }
 
 - (IBAction)ignoreSelected:(id)sender
@@ -239,10 +176,10 @@ http://www.hardcoded.net/licenses/bsd_license
     NSInteger selectedDupeCount = [table selectedDupeCount];
     if (!selectedDupeCount)
         return;
-    NSString *msg = [NSString stringWithFormat:TRMSG(@"IgnoreConfirmMsg"),selectedDupeCount];
+    NSString *msg = [NSString stringWithFormat:TR(@"All selected %d matches are going to be ignored in all subsequent scans. Continue?"),selectedDupeCount];
     if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
-    [py addSelectedToIgnoreList];
+    [model addSelectedToIgnoreList];
 }
 
 - (IBAction)invokeCustomCommand:(id)sender
@@ -250,36 +187,36 @@ http://www.hardcoded.net/licenses/bsd_license
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     NSString *cmd = [ud stringForKey:@"CustomCommand"];
     if ((cmd != nil) && ([cmd length] > 0)) {
-        [py invokeCommand:cmd];
+        [model invokeCommand:cmd];
     }
     else {
-        [Dialogs showMessage:TRMSG(@"NoCustomCommandMsg")];
+        [Dialogs showMessage:TR(@"You have no custom command set up. Set it up in your preferences.")];
     }
 }
 
 - (IBAction)markAll:(id)sender
 {
-    [py markAll];
+    [model markAll];
 }
 
 - (IBAction)markInvert:(id)sender
 {
-    [py markInvert];
+    [model markInvert];
 }
 
 - (IBAction)markNone:(id)sender
 {
-    [py markNone];
+    [model markNone];
 }
 
 - (IBAction)markSelected:(id)sender
 {
-    [py toggleSelectedMark];
+    [model toggleSelectedMark];
 }
 
 - (IBAction)moveMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [model getMarkCount];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -287,12 +224,12 @@ http://www.hardcoded.net/licenses/bsd_license
     [op setCanChooseDirectories:YES];
     [op setCanCreateDirectories:YES];
     [op setAllowsMultipleSelection:NO];
-    [op setTitle:TRMSG(@"SelectMoveDestinationMsg")];
+    [op setTitle:TR(@"Select a directory to move marked files to")];
     if ([op runModal] == NSOKButton) {
         NSString *directory = [[op filenames] objectAtIndex:0];
         NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-        [py setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+        [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
-        [py copyOrMove:b2n(NO) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
+        [model copyOrMove:NO markedTo:directory recreatePath:n2b([ud objectForKey:@"recreatePathType"])];
     }
 }
 
@@ -302,23 +239,23 @@ http://www.hardcoded.net/licenses/bsd_license
         return;
     }
     [matches selectRowIndexes:[NSIndexSet indexSetWithIndex:[matches clickedRow]] byExtendingSelection:NO];
-    [py openSelected];
+    [model openSelected];
 }
 
 - (IBAction)openSelected:(id)sender
 {
-    [py openSelected];
+    [model openSelected];
 }
 
 - (IBAction)removeMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    int mark_count = [model getMarkCount];
     if (!mark_count)
         return;
     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];
+    [model removeMarked];
 }
 
 - (IBAction)removeSelected:(id)sender
@@ -335,10 +272,10 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)reprioritizeResults:(id)sender
 {
-    PrioritizeDialog *dlg = [[PrioritizeDialog alloc] initWithPy:py];
+    PrioritizeDialog *dlg = [[PrioritizeDialog alloc] initWithApp:model];
     NSInteger result = [NSApp runModalForWindow:[dlg window]];
     if (result == NSRunStoppedResponse) {
-        [[dlg py] performReprioritization];
+        [[dlg model] performReprioritization];
     }
     [dlg release];
     [[self window] makeKeyAndOrderFront:nil];
@@ -346,12 +283,12 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)resetColumnsToDefault:(id)sender
 {
-    // Virtual
+    [[[table columns] model] resetToDefaults];
 }
 
 - (IBAction)revealSelected:(id)sender
 {
-    [py revealSelected];
+    [model revealSelected];
 }
 
 - (IBAction)saveResults:(id)sender
@@ -359,44 +296,33 @@ http://www.hardcoded.net/licenses/bsd_license
     NSSavePanel *sp = [NSSavePanel savePanel];
     [sp setCanCreateDirectories:YES];
     [sp setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
-    [sp setTitle:TRMSG(@"SelectResultToSaveMsg")];
+    [sp setTitle:TR(@"Select a file to save your results to")];
     if ([sp runModal] == NSOKButton) {
-        [py saveResultsAs:[sp filename]];
+        [model saveResultsAs:[sp filename]];
         [[app recentResults] addFile:[sp filename]];
     }
 }
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    if ([py resultsAreModified]) {
+    if ([model resultsAreModified]) {
-        if ([Dialogs askYesNo:TRMSG(@"ReallyWantToContinueMsg")] == NSAlertSecondButtonReturn) // NO
+        if ([Dialogs askYesNo:TR(@"You have unsaved results, do you really want to continue?")] == NSAlertSecondButtonReturn) // NO
             return;
     }
     [self setScanOptions];
-    [py doScan];
+    [model doScan];
 }
 
 - (IBAction)switchSelected:(id)sender
 {
-    [py makeSelectedReference];
+    [model makeSelectedReference];
 }
 
 - (IBAction)toggleColumn:(id)sender
 {
     NSMenuItem *mi = sender;
-    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
+    BOOL checked = [[[table columns] model] toggleMenuItem:[mi tag]];
-    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
+    [mi setState:checked ? NSOnState : NSOffState];
-    if (col == nil) {
-        //Add Column
-        col = [_resultColumns objectAtIndex:[mi tag]];
-        [matches addTableColumn:col];
-        [mi setState:NSOnState];
-    }
-    else {
-        //Remove column
-        [matches removeTableColumn:col];
-        [mi setState:NSOffState];
-    }
 }
 
 - (IBAction)toggleDetailsPanel:(id)sender
@@ -456,40 +382,40 @@ http://www.hardcoded.net/licenses/bsd_license
 {
     id lastAction = [[ProgressController mainProgressController] jobId];
     if ([lastAction isEqualTo:jobCopy]) {
-        if ([py scanWasProblematic]) {
+        if ([model scanWasProblematic]) {
             [problemDialog showWindow:self];
         }
         else {
-            [Dialogs showMessage:TRMSG(@"CopySuccessMsg")];
+            [Dialogs showMessage:TR(@"All marked files were copied sucessfully.")];
         }
     }
     else if ([lastAction isEqualTo:jobMove]) {
-        if ([py scanWasProblematic]) {
+        if ([model scanWasProblematic]) {
             [problemDialog showWindow:self];
         }
         else {
-            [Dialogs showMessage:TRMSG(@"MoveSuccessMsg")];
+            [Dialogs showMessage:TR(@"All marked files were moved sucessfully.")];
         }
     }
     else if ([lastAction isEqualTo:jobDelete]) {
-        if ([py scanWasProblematic]) {
+        if ([model scanWasProblematic]) {
             [problemDialog showWindow:self];
         }
         else {
-            [Dialogs showMessage:TRMSG(@"SendToTrashSuccessMsg")];
+            [Dialogs showMessage:TR(@"All marked files were sucessfully sent to Trash.")];
         }
     }
     else if ([lastAction isEqualTo:jobScan]) {
-        NSInteger rowCount = [[table py] numberOfRows];
+        NSInteger rowCount = [[table model] numberOfRows];
         if (rowCount == 0) {
-            [Dialogs showMessage:TRMSG(@"NoDuplicateFoundMsg")];
+            [Dialogs showMessage:TR(@"No duplicates found.")];
         }
     }
 }
 
 - (void)jobInProgress:(NSNotification *)aNotification
 {
-    [Dialogs showMessage:TRMSG(@"TaskHangingMsg")];
+    [Dialogs showMessage:TR(@"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.")];
 }
 
 - (void)jobStarted:(NSNotification *)aNotification

cocoa/base/StatsLabel.h

@@ -10,10 +10,8 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "HSGUIController.h"
 #import "PyStatsLabel.h"
 
-@interface StatsLabel : HSGUIController
+@interface StatsLabel : HSGUIController {}
-{
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView;
-    NSTextField *labelView;
+- (PyStatsLabel *)model;
-}
+- (NSTextField *)labelView;
-- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView;
-- (PyStatsLabel *)py;
 @end

cocoa/base/StatsLabel.m

@@ -10,29 +10,25 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "Utils.h"
 
 @implementation StatsLabel
-- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView
 {
-    self = [super initWithPyClassName:@"PyStatsLabel" pyParent:aPyParent];
+    return [super initWithPyRef:aPyRef wrapperClass:[PyStatsLabel class]
-    labelView = [aLabelView retain];
+        callbackClassName:@"StatsLabelView" view:aLabelView];
-    [self connect];
-    return self;
 }
 
-- (void)dealloc
+- (PyStatsLabel *)model
 {
-    [self disconnect];
+    return (PyStatsLabel *)model;
-    [labelView release];
-    [super dealloc];
 }
 
-- (PyStatsLabel *)py
+- (NSTextField *)labelView
 {
-    return (PyStatsLabel *)py;
+    return (NSTextField *)view;
 }
 
 /* Python --> Cocoa */
 - (void)refresh
 {
-    [labelView setStringValue:[[self py] display]];
+    [[self labelView] setStringValue:[[self model] display]];
 }
 @end

cocoa/base/cs.lproj/DetailsPanel.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Detaily vybraného souboru";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Vybráno";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Referenční";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Atribut";

cocoa/base/cs.lproj/DirectoryPanel.strings

@@ -0,0 +1,23 @@
+/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */
+"13.headerCell.title" = "Stav";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */
+"15.headerCell.title" = "Název";
+
+/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */
+"48.title" = "Prohledat";
+
+/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */
+"55.title" = "Normální";
+
+/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */
+"56.title" = "Referenční";
+
+/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
+"57.title" = "Vyjmuto";
+
+/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
+"71.title" = "Vyberte složky, které chcete prohledat a stiskněte \"Prohledat\".";
+
+/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
+"73.title" = "Nahrát výsledky";

cocoa/base/cs.lproj/ExtraFairwareReminder.strings

@@ -0,0 +1,11 @@
+/* Class = "NSWindow"; title = "Sorry, I must insist"; ObjectID = "1"; */
+"1.title" = "Je mi líto, musím na tom trvat";
+
+/* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
+"4.title" = "Tato připomínka se zobrazila, protože:\n\n1. Zpracováváte více než 100 duplicit\n2. Zatím jste nepřispěli na vývoj dupeGuru\n3. V projektu jsou nezaplacené hodiny";
+
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
+"6.title" = "Vypadá to, že jste našli spoustu duplicit. Paráda! Musím ale trvat na tom, že v případě nezaplacených hodin vývoje projektu, očekávám příspěvky.\n\nMůžete si říct \"ale já chci program použít jen jednou, proč bych měl platit\". Problém je, že většina lidí používá dupeGuru jen občas. Kdyby si totéž řekl každý, nemohl by se vývoj dupeGuru zaplatit. Kvůli této vlastnosti, která vychází z podstaty dupeGuru, si zde dovoluji žádat o příspěvek na vývoj.\n\nPokud si nemůžete příspěvek dovolit, můžete tuto připomínku ignorovat nebo mi poslat e-mail na hsoft@hardcoded.net, abych vám dal klíč pro odstranění tohoto vyskakovacího okna.";
+
+/* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */
+"10.title" = "Přispět";

cocoa/base/cs.lproj/Localizable.strings

@@ -0,0 +1,39 @@
+"Add New Folder..." = "Přidat novou složku...";
+"Load from file..." = "Nahrát ze souboru...";
+"Reset to Default" = "Výchozí nastavení";
+
+"Select a results file to load" = "Vyberte soubor s výsledky, který chcete nahrát";
+"You have unsaved results, do you really want to quit?" = "Máte neuložené výsledky, opravdu si přejete skončit?";
+"Select a directory to copy marked files to" = "Select a directory to copy marked files to";
+"Select a directory to move marked files to" = "Select a directory to move marked files to";
+"Select a file to save your results to" = "Vyberte soubor pro uložení výsledků";
+"Select a folder to add to the scanning list" = "Vyberte složku, kterou chcete přidat do prohledávacího seznamu";
+"You have unsaved results, do you really want to continue?" = "Máte neuložené výsledky, opravdu si přejete pokračovat?";
+"'%@' already is in the list." = "'%@' already is in the list.";
+"'%@' does not exist." = "'%@' does not exist.";
+"You are about to remove %d files from results. Continue?" = "Chystáte se z výsledků odstranit %d souborů. Pokračovat?";
+"The name '%@' already exists." = "The name '%@' already exists.";
+"You are about to send %d files to Trash. Continue?" = "Chystáte se vyhodit %d souborů do koše. Pokračovat?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "Chystáte se vyhodit %d souborů do koše (a následně na ně vytvořit hardlinky). Pokračovat?";
+"Do you really want to remove all %d items from the ignore list?" = "Opravdu chcete odstranit všech %d položek ze seznamu výjimek?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "Všech %d vybraných shod bude v následujících hledáních ignorováno. Pokračovat?";
+"You have no custom command set up. Set it up in your preferences." = "Nedefinoval jste žádný uživatelský příkaz. Nadefinujete ho v předvolbách.";
+"All marked files were copied sucessfully." = "All marked files were copied sucessfully.";
+"All marked files were moved sucessfully." = "All marked files were moved sucessfully.";
+"All marked files were sucessfully sent to Trash." = "All marked files were sucessfully sent to Trash.";
+"No duplicates found." = "Nebyli nalezeny žádné duplicity.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "Předchozí akce stále nebyla ukončena. Novou zatím nemůžete spustit. Počkejte pár sekund a zkuste to znovu.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"You have no dead tracks in your iTunes Library" = "You have no dead tracks in your iTunes Library";
+"Do you really want to remove all your cached picture analysis?" = "Opravdu chcete odstranit veškeré uložené analýzy snímků?";
+
+
+"Add iTunes Directory" = "Přidat složku iTunes";
+"Remove Dead Tracks in iTunes" = "Odstranit z iTunes mrtvé stopy";
+
+"Add iPhoto Library" = "Přidat knihovnu iPhoto";
+"Clear Picture Cache" = "Vyčistit cache snímků";
+
+"Yes" = "Yes";
+"No" = "No";
+"OK" = "OK";

cocoa/base/cs.lproj/MainMenu.strings

@@ -0,0 +1,177 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Vše do popředí";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Okno";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimalizovat";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Okno";
+
+/* Class = "NSMenuItem"; title = "About dupeGuru"; ObjectID = "58"; */
+"58.title" = "O aplikaci";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Nápověda";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Nápověda";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Help"; ObjectID = "111"; */
+"111.title" = "Nápověda dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide dupeGuru"; ObjectID = "134"; */
+"134.title" = "Skrýt dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Quit dupeGuru"; ObjectID = "136"; */
+"136.title" = "Ukončit dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Skrýt ostatní";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Zobrazit vše";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "Details Panel"; ObjectID = "398"; */
+"398.title" = "Detaily";
+
+/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "541"; */
+"541.title" = "Předvolby...";
+
+/* Class = "NSMenuItem"; title = "Folder Selection Window"; ObjectID = "579"; */
+"579.title" = "Výběr složky";
+
+/* Class = "NSMenuItem"; title = "Actions"; ObjectID = "597"; */
+"597.title" = "Akce";
+
+/* Class = "NSMenu"; title = "Actions"; ObjectID = "598"; */
+"598.title" = "Akce";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "599"; */
+"599.title" = "Vyhodit označené do koše";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
+"600.title" = "Označené přesunout...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "601"; */
+"601.title" = "Označené kopírovat...";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "602"; */
+"602.title" = "Výběr jako reference";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "603"; */
+"603.title" = "Odstranit označené z výsledků";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "605"; */
+"605.title" = "Odstranit výběr z výsledků";
+
+/* Class = "NSMenuItem"; title = "Columns"; ObjectID = "618"; */
+"618.title" = "Sloupce";
+
+/* Class = "NSMenu"; title = "Columns"; ObjectID = "619"; */
+"619.title" = "Sloupce";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "708"; */
+"708.title" = "Vybrané otevřít výchozí aplikací";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "710"; */
+"710.title" = "Vybrané otevřít ve Finderu";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "922"; */
+"922.title" = "Přidat výběr na seznam výjimek";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "924"; */
+"924.title" = "Zavřít okno";
+
+/* Class = "NSMenuItem"; title = "Start Duplicate Scan"; ObjectID = "926"; */
+"926.title" = "Spustit hledání duplicit";
+
+/* Class = "NSMenuItem"; title = "Clear Ignore List"; ObjectID = "927"; */
+"927.title" = "Vyčistit seznam výjimek";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "933"; */
+"933.title" = "Vybrané přejmenovat";
+
+/* Class = "NSMenuItem"; title = "Export Results to XHTML"; ObjectID = "947"; */
+"947.title" = "Exportovat výsledky do XHTML";
+
+/* Class = "NSMenuItem"; title = "Check for update..."; ObjectID = "950"; */
+"950.title" = "Zkontrolovat aktualizace...";
+
+/* Class = "NSMenuItem"; title = "Mode"; ObjectID = "959"; */
+"959.title" = "Režim";
+
+/* Class = "NSMenu"; title = "Mode"; ObjectID = "960"; */
+"960.title" = "Režim";
+
+/* Class = "NSMenuItem"; title = "Show Dupes Only"; ObjectID = "961"; */
+"961.title" = "Zobrazit pouze duplicity";
+
+/* Class = "NSMenuItem"; title = "Show Delta Values"; ObjectID = "962"; */
+"962.title" = "Zobrazit rozdíly";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "965"; */
+"965.title" = "Upravit";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "966"; */
+"966.title" = "Upravit";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "985"; */
+"985.title" = "Vyjmout";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "986"; */
+"986.title" = "Kopírovat";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "991"; */
+"991.title" = "Vložit";
+
+/* Class = "NSMenuItem"; title = "Mark All"; ObjectID = "1011"; */
+"1011.title" = "Označit vše";
+
+/* Class = "NSMenuItem"; title = "Mark None"; ObjectID = "1012"; */
+"1012.title" = "Zrušit označení";
+
+/* Class = "NSMenuItem"; title = "Invert Marking"; ObjectID = "1013"; */
+"1013.title" = "Invertovat označení";
+
+/* Class = "NSMenuItem"; title = "Mark Selected"; ObjectID = "1014"; */
+"1014.title" = "Označit vybrané";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Website"; ObjectID = "1023"; */
+"1023.title" = "dupeGuru Website";
+
+/* Class = "NSMenuItem"; title = "Invoke Custom Command"; ObjectID = "1177"; */
+"1177.title" = "Spustit vlastní příkaz";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1203"; */
+"1203.title" = "Soubor";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1204"; */
+"1204.title" = "Soubor";
+
+/* Class = "NSMenuItem"; title = "Load Results..."; ObjectID = "1205"; */
+"1205.title" = "Nahrát výsledky...";
+
+/* Class = "NSMenuItem"; title = "Save Results..."; ObjectID = "1206"; */
+"1206.title" = "Uložit výsledky...";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "1227"; */
+"1227.title" = "Označené nahradit pevnými odkazy";
+
+/* Class = "NSMenuItem"; title = "Load Recent Results"; ObjectID = "1239"; */
+"1239.title" = "Nahrát nedávné výsledky";
+
+/* Class = "NSMenu"; title = "Load Recent Results"; ObjectID = "1240"; */
+"1240.title" = "Nahrát nedávné výsledky";
+
+/* Class = "NSMenuItem"; title = "Results Window"; ObjectID = "1272"; */
+"1272.title" = "Okno s výsledky";
+
+/* Class = "NSMenuItem"; title = "Re-Prioritize Results"; ObjectID = "1276"; */
+"1276.title" = "Změnit prioritu výsledků";

cocoa/base/cs.lproj/PrioritizeDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Re-Prioritize duplicates"; ObjectID = "1"; */
+"1.title" = "Změnit prioritu duplicit";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "37"; */
+"37.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "39"; */
+"39.title" = "Zrušit";
+
+/* Class = "NSTextFieldCell"; title = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; ObjectID = "41"; */
+"41.title" = "Do pole vpravo přidejte kritéria a klepnutím na tlačítko OK odešlete duplicity, které těmto kritériím vyhovují do referenčního umístění příslušné skupiny. Více informací naleznete v nápovědě.";

cocoa/base/cs.lproj/ProblemDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Problems!"; ObjectID = "1"; */
+"1.title" = "Problémy!";
+
+/* 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" = "Při zpracování některých (nebo všech) souborů se vyskytly problémy. Jejich příčina je popsána v tabulce dole. Dotčené soubory nebyli odstraněny z výsledků.";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Zavřít";
+
+/* Class = "NSButtonCell"; title = "Reveal Selected"; ObjectID = "21"; */
+"21.title" = "Ukázat vybrané ve správci souborů";

cocoa/base/cs.lproj/ResultWindow.strings

@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */
+"1.title" = "Výsledky dupeGuru";
+
+/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */
+"6.title" = "Označeno: 0 souborů, 0 B. Celkem: 0 souborů, 0 B.";
+
+/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
+"15.label" = "Možnosti";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */
+"15.paletteLabel" = "Možnosti";
+
+/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */
+"16.label" = "Filtr";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */
+"16.paletteLabel" = "Filtr";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */
+"17.label" = "Akce";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */
+"17.paletteLabel" = "Akce";
+
+/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */
+"19.label" = "Adresáře";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
+"19.paletteLabel" = "Adresáře";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "27"; */
+"27.title" = "Označené nahradit pevnými odkazy";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
+"29.title" = "Vyhodit označené do koše";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
+"30.title" = "Označené přesunout...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */
+"31.title" = "Označené kopírovat...";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */
+"32.title" = "Odstranit označené z výsledků";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */
+"34.title" = "Odstranit výběr z výsledků";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */
+"35.title" = "Přidat výběr na seznam výjimek";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */
+"36.title" = "Výběr jako reference";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */
+"38.title" = "Vybrané otevřít výchozí aplikací";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */
+"39.title" = "Vybrané otevřít ve Finderu";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */
+"40.title" = "Vybrané přejmenovat";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */
+"42.placeholderString" = "Filtr";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[0] = "Details"; ObjectID = "44"; */
+"44.ibShadowedLabels[0]" = "Detaily";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[1] = "Dupes Only"; ObjectID = "44"; */
+"44.ibShadowedLabels[1]" = "Jen duplicity";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[2] = "Delta"; ObjectID = "44"; */
+"44.ibShadowedLabels[2]" = "Delta";
+
+/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */
+"67.title" = "Menu";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
+"68.title" = "Přidat výběr na seznam výjimek";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */
+"70.title" = "Vybrané přejmenovat";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */
+"71.title" = "Odstranit výběr z výsledků";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */
+"72.title" = "Výběr jako reference";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */
+"73.title" = "Vybrané otevřít ve Finderu";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
+"74.title" = "Vybrané otevřít výchozí aplikací";

cocoa/base/de.lproj/ExtraFairwareReminder.strings

@@ -2,10 +2,10 @@
 "1.title" = "Entschuldigung, ich muss darauf beharren";
 
 /* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
-"4.title" = "Diese Erinnerung erschien, weil:\n\n1. Mehr als 100 Duplikate verarbeitet wurden\n2. Sie noch nicht an dupeGuru gespendet haben\n3. Es unbezahlte Arbeitstunden im Projekt gibt";
+"4.title" = "Diese Erinnerung erschien, weil:\n    \n1. Mehr als 100 Duplikate verarbeitet wurden\n2. Sie noch nicht an dupeGuru gespendet haben\n3. Es unbezahlte Arbeitstunden im Projekt gibt";
 
-/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup."; ObjectID = "6"; */
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
-"6.title" = "Scheinbar haben Sie eine Menge Duplikate gefunden. Schön! Ich muss Sie jedoch daran erinnern das Spenden gewünscht werden, wenn noch nicht alle Arbeitsstunden bezahlt wurden.\n\nSie denken vielleicht \"aber ich nutze dieses Programm doch nur einmal, da brauche ich nicht zu spenden\". Das Problem ist, das die meisten Menschen dupeGuru nur sehr selten nutzen. Wenn jeder so denkt kann die Entwicklung von dupeGuru nicht finanziert werden. Aufgrund dieser, dem Wesen von dupeGuru innenliegenden Eigenschaft, muss ich hier auf Ihre Unterstützung bestehen.\n\nWenn Sie es sich nicht leisten können zu spenden, können Sie diese Erinnerung entweder ignorieren oder mir eine Nachricht an hsoft@hardcoded.net schicken, damit ich ihnen einen Schlüssel gebe um diesen Hinweis zu entfernen.";
+"6.title" = "Scheinbar haben Sie eine Menge Duplikate gefunden. Schön! Ich muss Sie jedoch daran erinnern das Spenden gewünscht werden, wenn noch nicht alle Arbeitsstunden bezahlt wurden.\n\nSie denken vielleicht \"aber ich nutze dieses Programm doch nur einmal, da brauche ich nicht zu spenden\". Das Problem ist, das die meisten Menschen dupeGuru nur sehr selten nutzen. Wenn jeder so denkt kann die Entwicklung von dupeGuru nicht finanziert werden. Aufgrund dieser, dem Wesen von dupeGuru innenliegenden Eigenschaft, muss ich hier auf Ihre Unterstützung bestehen.  \n\nWenn Sie es sich nicht leisten können zu spenden, können Sie diese Erinnerung entweder ignorieren oder mir eine Nachricht an hsoft@hardcoded.net schicken, damit ich ihnen einen Schlüssel gebe um diesen Hinweis zu entfernen.";
 
 /* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */
 "10.title" = "Spenden";

cocoa/base/de.lproj/Localizable.strings

@@ -2,8 +2,38 @@
 "Load from file..." = "Load from file...";
 "Reset to Default" = "Reset to Default";
 
+"Select a results file to load" = "Wählen Sie eine Ergebnisliste zum Laden aus.";
+"You have unsaved results, do you really want to quit?" = "Sie haben ungespeicherte Ergebnisse. Wollen Sie wirklich beenden?";
+"Select a directory to copy marked files to" = "Select a directory to copy marked files to";
+"Select a directory to move marked files to" = "Select a directory to move marked files to";
+"Select a file to save your results to" = "Datei zum Speichern der Ergebnisliste auswählen.";
+"Select a folder to add to the scanning list" = "Wählen Sie einen Ordner aus, um ihn der Scanliste hinzuzufügen.";
+"You have unsaved results, do you really want to continue?" = "Sie haben ungespeicherte Ergebnisse. Möchten Sie wirklich fortfahren?";
+"'%@' already is in the list." = "'%@' already is in the list.";
+"'%@' does not exist." = "'%@' does not exist.";
+"You are about to remove %d files from results. Continue?" = "%d Dateien werden aus der Ergebnisliste entfernt. Fortfahren?";
+"The name '%@' already exists." = "The name '%@' already exists.";
+"You are about to send %d files to Trash. Continue?" = "%d Dateien werden in den Mülleimer zu verschoben. Fortfahren?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "%d Dateien werden gelöscht und mit physikalischen Verknüpfungen ersetzt. Fortfahren?";
+"Do you really want to remove all %d items from the ignore list?" = "Möchten Sie wirklich alle %d Einträge aus der Ignorier-Liste löschen?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "%d Dateien werden in zukünftigen Scans ignoriert werden. Fortfahren?";
+"You have no custom command set up. Set it up in your preferences." = "Sie haben keinen eigenen Befehl erstellt. Bitte in den Einstellungen konfigurieren.";
+"All marked files were copied sucessfully." = "All marked files were copied sucessfully.";
+"All marked files were moved sucessfully." = "All marked files were moved sucessfully.";
+"All marked files were sucessfully sent to Trash." = "All marked files were sucessfully sent to Trash.";
+"No duplicates found." = "Keine Duplikate gefunden.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "Eine vorherige Aktion ist noch in der Bearbeitung. Sie können noch keine Neue starten. Warten Sie einige Sekunden und versuchen es erneut.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"You have no dead tracks in your iTunes Library" = "You have no dead tracks in your iTunes Library";
+"Do you really want to remove all your cached picture analysis?" = "Möchten Sie wirklich alle zwischengespeicherten Bildanalysen entfernen?";
+
+
 "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" = "Bildzwischenspeicher leeren";
+
+"Yes" = "Yes";
+"No" = "No";
+"OK" = "OK";

cocoa/base/de.lproj/ProblemDialog.strings

@@ -5,12 +5,6 @@
 /* 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" = "Es gab Probleme bei der Verarbeitung einiger (aller) Dateien. Der Grund der Probleme ist unten in der Tabelle beschrieben.";
 
-/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */
-"10.headerCell.title" = "Dateipfad";
-
-/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */
-"11.headerCell.title" = "Fehlermeldung";
-
 /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
 "19.title" = "Schließen";
 

cocoa/base/de.lproj/ResultWindow.strings

@@ -5,9 +5,6 @@
 /* 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";
 

cocoa/base/de.lproj/columns.strings

@@ -1,23 +0,0 @@
-"Filename" = "Filename";
-"Folder" = "Ordner";
-"Size" = "Größe";
-"Size (KB)" = "Größe (KB)";
-"Size (MB)" = "Größe (MB)";
-"Kind" = "Typ";
-"Modification" = "Modifikation";
-"Match %" = "Übereinstimmung %";
-"Words Used" = "Wörter genutzt";
-"Dupe Count" = "Anzahl Duplikate";
-
-"Time" = "Zeit";
-"Bitrate" = "Bitrate";
-"Sample Rate" = "Abtastrate";
-"Title" = "Titel";
-"Artist" = "Künstler";
-"Album" = "Album";
-"Genre" = "Genre";
-"Year" = "Jahr";
-"Track Number" = "Stück Nummer";
-"Comment" = "Kommentar";
-
-"Dimensions" = "Dimensionen";

cocoa/base/de.lproj/core.strings

@@ -1,39 +0,0 @@
-"Collecting files to scan" = "Sammle Dateien zum Scannen";
-"%s (%d discarded)" = "%s (%d verworfen)";
-"Scanning for duplicates" = "Suche nach Duplikaten";
-"Loading" = "Laden";
-"Moving" = "Verschieben";
-"Copying" = "Kopieren";
-"Sending to Trash" = "Verschiebe in den Mülleimer";
-"0 matches found" = "0 Paare gefunden";
-"%d matches found" = "%d Paare gefunden";
-"Read size of %d/%d files" = "Lese Größe von %d/%d Dateien";
-"Grouped %d/%d matches" = "%d/%d Paare gruppiert";
-"%d / %d (%s / %s) duplicates marked." = "%d / %d (%s / %s) Duplikate markiert.";
-" filter: %s" = " Filter: %s";
-"Read metadata of %d/%d files" = "Lese Metadaten von %d/%d Dateien";
-"Removing false matches" = "Entferne Falschpositive.";
-"Processed %d/%d matches against the ignore list" = "Verarbeitung von %d/%d Paaren gegen die Ignorier-Liste";
-"Doing group prioritization" = "Gruppenpriorisierung";
-
-"Continue" = "Fortfahren";
-"Continue ({})" = "Fortfahren ({})";
-
-"Analyzed %d/%d pictures" = "Analysiere %d/%d Bilder";
-"Preparing for matching" = "Vorbereitung auf den Vergleich";
-"Performed %d/%d chunk matches" = "Performed %d/%d chunk matches";
-"Verified %d/%d matches" = "%d/%d verifizierte Paare";
-
-"Removing dead tracks from your iTunes Library" = "Entferne tote Stücke aus Ihrer iTunes Bibliothek.";
-"Scanning the iTunes Library" = "Scanne die iTunes Bibiliothek";
-
-"Probing iPhoto. Don't touch it during the operation!" = "Untersuche iPhoto. Während der Operation nicht anfassen!";
-"Sending dupes to the Trash" = "Verschiebe Duplikate in den Mülleimer";
-
-/* Prioritization */
-"Ends with number" = "Ends with number";
-"Doesn't end with number" = "Doesn't end with number";
-"Highest" = "Highest";
-"Lowest" = "Lowest";
-"Newest" = "Newest";
-"Oldest" = "Oldest";

cocoa/base/de.lproj/message.strings

@@ -1,33 +0,0 @@
-"SelectResultToLoadMsg" = "Wählen Sie eine Ergebnisliste zum Laden aus.";
-"SelectCopyDestinationMsg" = "Select a directory to copy marked files to";
-"SelectMoveDestinationMsg" = "Select a directory to move marked files to";
-"SelectResultToSaveMsg" = "Datei zum Speichern der Ergebnisliste auswählen.";
-"SelectFolderToAddMsg" = "Wählen Sie einen Ordner aus, um ihn der Scanliste hinzuzufügen.";
-"ReallyWantToQuitMsg" = "Sie haben ungespeicherte Ergebnisse. Wollen Sie wirklich beenden?";
-"ReallyWantToContinueMsg" = "Sie haben ungespeicherte Ergebnisse. Möchten Sie wirklich fortfahren?";
-"FolderAlreadyInListMsg" = "'%@' already is in the list.";
-"FolderDoesNotExistMsg" = "'%@' does not exist.";
-"FileRemovalConfirmMsg" = "{} Dateien werden aus der Ergebnisliste entfernt. Fortfahren?";
-"FilenameAlreadyExistsMsg" = "The name '%@' already exists.";
-"NoScannableFileMsg" = "Der ausgewählte Ordner enthält keine scannbare Dateien.";
-"UnknownErrorMsg" = "Unknown Error.";
-"SendToTrashConfirmMsg" = "{} Dateien werden in den Mülleimer zu verschoben. Fortfahren?";
-"HardlinkConfirmMsg" = "{} Dateien werden gelöscht und mit physikalischen Verknüpfungen ersetzt. Fortfahren?";
-"ClearIgnoreListConfirmMsg" = "Möchten Sie wirklich alle {} Einträge aus der Ignorier-Liste löschen?";
-"IgnoreConfirmMsg" = "%d Dateien werden in zukünftigen Scans ignoriert werden. Fortfahren?";
-"NoCustomCommandMsg" = "Sie haben keinen eigenen Befehl erstellt. Bitte in den Einstellungen konfigurieren.";
-"CopySuccessMsg" = "All marked files were copied sucessfully.";
-"MoveSuccessMsg" = "All marked files were moved sucessfully.";
-"SendToTrashSuccessMsg" = "All marked files were sucessfully sent to Trash.";
-"NoDuplicateFoundMsg" = "Keine Duplikate gefunden.";
-"TaskHangingMsg" = "Eine vorherige Aktion ist noch in der Bearbeitung. Sie können noch keine Neue starten. Warten Sie einige Sekunden und versuchen es erneut.";
-
-"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" = "Möchten Sie wirklich alle zwischengespeicherten Bildanalysen entfernen?";
-
-/* hscommon */
-"FairwarePromptMsg" = "{name} ist Fairware, das bedeutet \"Open Source Software, entwickelt in der Hoffnung auf einen fairen Beitrag von den Benutzern\". Viel Zeit wurde in die Software investiert, mit der Erwartung der Nutzer möge fair genug sein die Entwickler für ihren Einsatz zu kompensieren. Die \"Unbezahlte Stunden\" Abbildung zeigt die Anzahl der Stunden die noch nicht bezahlt wurden.\nWenn Sie diese Anwendung mögen, so spenden Sie bitte einen Ihrer Ansicht nach angemessenen Betrag. Danke!\n\nWenn Sie es sich nicht leisten können zu spenden, können Sie diese Erinnerung entweder ignorieren oder mir eine Anfrage an hsoft@hardcoded.net schicken, mit der Bitte für einen Registrierungsschlüssel.\n\nDieser Dialog erscheint nicht, wenn es keine unbezahlten Stunden gibt oder Sie einen gültigen Registrierungsschlüssel besitzen.";
-"DemoPromptMsg" = "{name} is fairware, which means \"open source software developed with expectation of fair contributions from users\". It's a very interesting concept, but one year of fairware has shown that most people just want to know how much it costs and not be bothered with theories about intellectual property.\n\nSo I won't bother you and will be very straightforward: You can try {name} for free but you have to buy it in order to use it without limitations. In demo mode, {name} {limitation}.\n\nSo it's as simple as this. If you're curious about fairware, however, I encourage you to read more about it by clicking on the \"Fairware?\" button.";

cocoa/base/en.lproj/DirectoryPanel.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSTextField</string>
@@ -31,7 +31,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="238648523">
 			<object class="NSCustomObject" id="566600593">
 				<string key="NSClassName">DirectoryPanel</string>
@@ -233,7 +236,7 @@
 												</object>
 											</object>
 											<double key="NSRowHeight">14</double>
-											<int key="NSTvFlags">1379958784</int>
+											<int key="NSTvFlags">1514176512</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
 											<int key="NSColumnAutoresizingStyle">1</int>
@@ -510,14 +513,6 @@
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">initialFirstResponder</string>
-						<reference key="source" ref="970147395"/>
-						<reference key="destination" ref="10140319"/>
-					</object>
-					<int key="connectionID">19</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
@@ -542,14 +537,6 @@
 					</object>
 					<int key="connectionID">54</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startScanning:</string>
-						<reference key="source" ref="244639324"/>
-						<reference key="destination" ref="580397230"/>
-					</object>
-					<int key="connectionID">60</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeSelectedDirectory:</string>
@@ -590,6 +577,22 @@
 					</object>
 					<int key="connectionID">78</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">startScanning:</string>
+						<reference key="source" ref="244639324"/>
+						<reference key="destination" ref="580397230"/>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="970147395"/>
+						<reference key="destination" ref="10140319"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1025,6 +1028,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">HSOutlineView</string>
 					<string key="superclassName">NSOutlineView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">copy:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">copy:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">copy:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/HSOutlineView.h</string>
@@ -1064,7 +1078,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>

cocoa/base/en.lproj/ExtraFairwareReminder.strings

@@ -4,8 +4,8 @@
 /* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
 "4.title" = "This reminder showed up because:\n\n1. You are processing more than 100 duplicates\n2. You have not yet contributed to dupeGuru\n3. There are unpaid hours in the project";
 
-/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup."; ObjectID = "6"; */
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
-"6.title" = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.\n\nYou might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded. It's because of this tendency inherent to dupeGuru's nature that I have to insist here.\n\nIf you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup.";
+"6.title" = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.\n\nYou might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded. It's because of this tendency inherent to dupeGuru's nature that I have to insist here.\n\nIf you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder.";
 
 /* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */
 "10.title" = "Contribute";

cocoa/base/en.lproj/ExtraFairwareReminder.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSTextField</string>
@@ -22,7 +22,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
 				<string key="NSClassName">ExtraFairwareReminder</string>
@@ -52,6 +55,7 @@
 							<string key="NSFrame">{{17, 48}, {446, 85}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="789504727"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="855705720">
 								<int key="NSCellFlags">67239424</int>
@@ -89,11 +93,24 @@
 							<string key="NSFrame">{{17, 141}, {446, 229}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="359672030"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="307619415">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">205520896</int>
-								<string key="NSContents">It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think "but I'm only going to use this once, I don't have to contribute". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded. It's because of this tendency inherent to dupeGuru's nature that I have to insist here.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup.</string>
+								<object class="NSMutableString" key="NSContents">
+									<bytes key="NS.bytes">SXQgc2VlbXMgdGhhdCB5b3UgZm91bmQgYSBsb3Qgb2YgZHVwbGljYXRlcy4gTmljZSEgSSBtdXN0IGlu
+c2lzdCwgaG93ZXZlciwgdGhhdCBjb250cmlidXRpb25zIGFyZSBleHBlY3RlZCB3aGVuIHRoZXJlIGFy
+ZSB1bnBhaWQgaG91cnMgb24gdGhlIHByb2plY3Qu4oCo4oCoWW91IG1pZ2h0IHRoaW5rICJidXQgSSdt
+IG9ubHkgZ29pbmcgdG8gdXNlIHRoaXMgb25jZSwgSSBkb24ndCBoYXZlIHRvIGNvbnRyaWJ1dGUiLiBU
+aGUgcHJvYmxlbSBpcyB0aGF0IG1vc3QgcGVvcGxlIHVzZSBkdXBlR3VydSBvbmx5IG9uY2UgaW4gYSB3
+aGlsZS4gSWYgZXZlcnlvbmUgdGhpbmtzIGxpa2UgdGhhdCwgZHVwZUd1cnUgZGV2ZWxvcG1lbnQgY2Fu
+bm90IGJlIGZ1bmRlZC4gSXQncyBiZWNhdXNlIG9mIHRoaXMgdGVuZGVuY3kgaW5oZXJlbnQgdG8gZHVw
+ZUd1cnUncyBuYXR1cmUgdGhhdCBJIGhhdmUgdG8gaW5zaXN0IGhlcmUu4oCo4oCoSWYgeW91IGNhbid0
+IGFmZm9yZCB0byBjb250cmlidXRlLCB5b3UgY2FuIGlnbm9yZSB0aGlzIHJlbWluZGVyIG9yIHNlbmQg
+bWUgYW4gZS1tYWlsIGF0IGhzb2Z0QGhhcmRjb2RlZC5uZXQgc28gSSBjYW4gZ2l2ZSB5b3UgYSBrZXkg
+dG8gcmVtb3ZlIHRoaXMgcmVtaW5kZXIuA</bytes>
+								</object>
 								<object class="NSFont" key="NSSupport">
 									<string key="NSName">LucidaGrande</string>
 									<double key="NSSize">12</double>
@@ -110,6 +127,7 @@
 							<string key="NSFrame">{{338, 12}, {128, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="444055328">
 								<int key="NSCellFlags">67239424</int>
@@ -135,6 +153,7 @@
 							<string key="NSFrame">{{210, 12}, {128, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="858267836"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="639557916">
 								<int key="NSCellFlags">67239424</int>
@@ -154,6 +173,7 @@
 					<string key="NSFrameSize">{480, 390}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="450147645"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -370,7 +390,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>

cocoa/base/en.lproj/Localizable.strings

@@ -2,8 +2,38 @@
 "Load from file..." = "Load from file...";
 "Reset to Default" = "Reset to Default";
 
+"Select a results file to load" = "Select a results file to load";
+"You have unsaved results, do you really want to quit?" = "You have unsaved results, do you really want to quit?";
+"Select a directory to copy marked files to" = "Select a directory to copy marked files to";
+"Select a directory to move marked files to" = "Select a directory to move marked files to";
+"Select a file to save your results to" = "Select a file to save your results to";
+"Select a folder to add to the scanning list" = "Select a folder to add to the scanning list";
+"You have unsaved results, do you really want to continue?" = "You have unsaved results, do you really want to continue?";
+"'%@' already is in the list." = "'%@' already is in the list.";
+"'%@' does not exist." = "'%@' does not exist.";
+"You are about to remove %d files from results. Continue?" = "You are about to remove %d files from results. Continue?";
+"The name '%@' already exists." = "The name '%@' already exists.";
+"You are about to send %d files to Trash. Continue?" = "You are about to send %d files to Trash. Continue?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "You are about to send %d files to Trash (and hardlink them afterwards). Continue?";
+"Do you really want to remove all %d items from the ignore list?" = "Do you really want to remove all %d items from the ignore list?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "All selected %d matches are going to be ignored in all subsequent scans. Continue?";
+"You have no custom command set up. Set it up in your preferences." = "You have no custom command set up. Set it up in your preferences.";
+"All marked files were copied sucessfully." = "All marked files were copied sucessfully.";
+"All marked files were moved sucessfully." = "All marked files were moved sucessfully.";
+"All marked files were sucessfully sent to Trash." = "All marked files were sucessfully sent to Trash.";
+"No duplicates found." = "No duplicates found.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"You have no dead tracks in your iTunes Library" = "You have no dead tracks in your iTunes Library";
+"Do you really want to remove all your cached picture analysis?" = "Do you really want to remove all your cached picture analysis?";
+
+
 "Add iTunes Directory" = "Add iTunes Directory";
 "Remove Dead Tracks in iTunes" = "Remove Dead Tracks in iTunes";
 
 "Add iPhoto Library" = "Add iPhoto Library";
 "Clear Picture Cache" = "Clear Picture Cache";
+
+"Yes" = "Yes";
+"No" = "No";
+"OK" = "OK";

cocoa/base/en.lproj/MainMenu.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSMenu</string>
@@ -18,7 +18,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="248533267">
 			<object class="NSCustomObject" id="77446904">
 				<string key="NSClassName">NSApplication</string>
@@ -668,31 +671,12 @@
 			<object class="NSCustomObject" id="91622651">
 				<string key="NSClassName">AppDelegate</string>
 			</object>
-			<object class="NSCustomObject" id="875360857">
-				<string key="NSClassName">PyDupeGuru</string>
-			</object>
 			<object class="NSCustomObject" id="23220930">
 				<string key="NSClassName">SUUpdater</string>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="1033736835"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="941358624"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">terminate:</string>
@@ -725,14 +709,6 @@
 					</object>
 					<int key="connectionID">153</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="781972485"/>
-					</object>
-					<int key="connectionID">198</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -742,20 +718,28 @@
 					<int key="connectionID">207</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
+					<object class="IBActionConnection" key="connection">
-						<string key="label">delegate</string>
+						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="133452984"/>
+						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="91622651"/>
+						<reference key="destination" ref="1033736835"/>
 					</object>
-					<int key="connectionID">208</int>
+					<int key="connectionID">37</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
+					<object class="IBActionConnection" key="connection">
-						<string key="label">py</string>
+						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="91622651"/>
+						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="875360857"/>
+						<reference key="destination" ref="941358624"/>
 					</object>
-					<int key="connectionID">614</int>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performZoom:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="781972485"/>
+					</object>
+					<int key="connectionID">198</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -765,14 +749,6 @@
 					</object>
 					<int key="connectionID">925</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkForUpdates:</string>
-						<reference key="source" ref="23220930"/>
-						<reference key="destination" ref="688262014"/>
-					</object>
-					<int key="connectionID">951</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">cut:</string>
@@ -797,46 +773,6 @@
 					</object>
 					<int key="connectionID">1005</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openWebsite:</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="440547877"/>
-					</object>
-					<int key="connectionID">1024</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="23220930"/>
-						<reference key="destination" ref="91622651"/>
-					</object>
-					<int key="connectionID">1175</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showAboutBox:</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="436112936"/>
-					</object>
-					<int key="connectionID">1232</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openHelp:</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="914881560"/>
-					</object>
-					<int key="connectionID">1233</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">recentResultsMenu</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="782784943"/>
-					</object>
-					<int key="connectionID">1242</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">clearIgnoreList:</string>
@@ -1013,6 +949,70 @@
 					</object>
 					<int key="connectionID">1266</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reprioritizeResults:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="200019883"/>
+					</object>
+					<int key="connectionID">1278</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeMarked:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="733607971"/>
+					</object>
+					<int key="connectionID">1279</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleQuicklookPanel:</string>
+						<reference key="source" ref="83466988"/>
+						<reference key="destination" ref="343354529"/>
+					</object>
+					<int key="connectionID">1282</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="133452984"/>
+						<reference key="destination" ref="91622651"/>
+					</object>
+					<int key="connectionID">208</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openWebsite:</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="440547877"/>
+					</object>
+					<int key="connectionID">1024</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showAboutBox:</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="436112936"/>
+					</object>
+					<int key="connectionID">1232</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openHelp:</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="914881560"/>
+					</object>
+					<int key="connectionID">1233</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">recentResultsMenu</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="782784943"/>
+					</object>
+					<int key="connectionID">1242</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">columnsMenu</string>
@@ -1063,27 +1063,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">reprioritizeResults:</string>
+						<string key="label">checkForUpdates:</string>
-						<reference key="source" ref="83466988"/>
+						<reference key="source" ref="23220930"/>
-						<reference key="destination" ref="200019883"/>
+						<reference key="destination" ref="688262014"/>
 					</object>
-					<int key="connectionID">1278</int>
+					<int key="connectionID">951</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
+					<object class="IBOutletConnection" key="connection">
-						<string key="label">removeMarked:</string>
+						<string key="label">delegate</string>
-						<reference key="source" ref="83466988"/>
+						<reference key="source" ref="23220930"/>
-						<reference key="destination" ref="733607971"/>
+						<reference key="destination" ref="91622651"/>
 					</object>
-					<int key="connectionID">1279</int>
+					<int key="connectionID">1175</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleQuicklookPanel:</string>
-						<reference key="source" ref="83466988"/>
-						<reference key="destination" ref="343354529"/>
-					</object>
-					<int key="connectionID">1282</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1508,12 +1500,6 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">AppDelegate</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">613</int>
-						<reference key="object" ref="875360857"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">PyDupeGuru</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">949</int>
 						<reference key="object" ref="23220930"/>
@@ -1654,7 +1640,6 @@
 				<string key="603.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="604.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="613.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="618.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="619.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="707.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1772,6 +1757,25 @@
 						<string key="minorKey">./Classes/AppDelegateBase.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">HSOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">copy:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">copy:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">copy:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HSOutlineView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">HSTableView</string>
 					<string key="superclassName">NSTableView</string>
@@ -1780,17 +1784,9 @@
 						<string key="minorKey">./Classes/HSTableView.h</string>
 					</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">./Classes/HSWindowController.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PrioritizeDialog</string>
-					<string key="superclassName">HSWindowController</string>
+					<string key="superclassName">NSWindowController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="addSelected:">id</string>
 						<string key="cancel:">id</string>
@@ -1841,7 +1837,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ProblemDialog</string>
-					<string key="superclassName">HSWindowController</string>
+					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
 						<string key="NS.key.0">revealSelected:</string>
 						<string key="NS.object.0">id</string>
@@ -1869,38 +1865,6 @@
 						<string key="minorKey">./Classes/ProblemDialog.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyApp</string>
-					<string key="superclassName">PyFairware</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PyApp.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyDupeGuru</string>
-					<string key="superclassName">PyDupeGuruBase</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PyDupeGuru.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyDupeGuruBase</string>
-					<string key="superclassName">PyApp</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PyDupeGuruBase.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyFairware</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PyFairware.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindowBase</string>
 					<string key="superclassName">NSWindowController</string>
@@ -2127,7 +2091,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>

cocoa/base/en.lproj/ProblemDialog.strings

@@ -5,12 +5,6 @@
 /* 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";
 

cocoa/base/en.lproj/ProblemDialog.xib

@@ -2,32 +2,34 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSScroller</string>
+			<string>NSTextField</string>
-			<string>NSTableHeaderView</string>
-			<string>NSButton</string>
-			<string>NSScrollView</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSTableView</string>
-			<string>NSCustomObject</string>
 			<string>NSView</string>
 			<string>NSWindowTemplate</string>
-			<string>NSTextField</string>
+			<string>NSScrollView</string>
-			<string>NSTableColumn</string>
+			<string>NSCustomObject</string>
+			<string>NSTableView</string>
+			<string>NSTableHeaderView</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSScroller</string>
+			<string>NSTextFieldCell</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
 				<string key="NSClassName">ProblemDialog</string>
@@ -77,11 +79,11 @@
 										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 									</object>
 								</object>
-								<object class="NSColor" key="NSTextColor" id="87662436">
+								<object class="NSColor" key="NSTextColor">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor" id="665310199">
+									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MAA</bytes>
 									</object>
@@ -118,81 +120,7 @@
 												<reference key="NSSuperview" ref="458371270"/>
 												<reference key="NSWindow"/>
 											</object>
-											<array class="NSMutableArray" key="NSTableColumns">
+											<array class="NSMutableArray" key="NSTableColumns"/>
-												<object class="NSTableColumn" id="152748337">
-													<string key="NSIdentifier">path</string>
-													<double key="NSWidth">202</double>
-													<double key="NSMinWidth">40</double>
-													<double key="NSMaxWidth">1000</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">File Path</string>
-														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">3100</int>
-														</object>
-														<object class="NSColor" key="NSBackgroundColor" id="505238712">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-														</object>
-														<object class="NSColor" key="NSTextColor" id="899094524">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerTextColor</string>
-															<reference key="NSColor" ref="665310199"/>
-														</object>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="182886300">
-														<int key="NSCellFlags">337772096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<object class="NSFont" key="NSSupport" id="578468928">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">16</int>
-														</object>
-														<reference key="NSControlView" ref="252791348"/>
-														<object class="NSColor" key="NSBackgroundColor" id="765209443">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlBackgroundColor</string>
-															<reference key="NSColor" ref="869923403"/>
-														</object>
-														<reference key="NSTextColor" ref="87662436"/>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<reference key="NSTableView" ref="252791348"/>
-												</object>
-												<object class="NSTableColumn" id="579292183">
-													<string key="NSIdentifier">msg</string>
-													<double key="NSWidth">228</double>
-													<double key="NSMinWidth">40</double>
-													<double key="NSMaxWidth">1000</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Error Message</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSBackgroundColor" ref="505238712"/>
-														<reference key="NSTextColor" ref="899094524"/>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="630211358">
-														<int key="NSCellFlags">337772096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="578468928"/>
-														<reference key="NSControlView" ref="252791348"/>
-														<reference key="NSBackgroundColor" ref="765209443"/>
-														<reference key="NSTextColor" ref="87662436"/>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<reference key="NSTableView" ref="252791348"/>
-												</object>
-											</array>
 											<double key="NSIntercellSpacingWidth">3</double>
 											<double key="NSIntercellSpacingHeight">2</double>
 											<object class="NSColor" key="NSBackgroundColor">
@@ -225,7 +153,12 @@
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="252791348"/>
 									<reference key="NSDocView" ref="252791348"/>
-									<reference key="NSBGColor" ref="765209443"/>
+									<object class="NSColor" key="NSBGColor" id="765209443">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlBackgroundColor</string>
+										<reference key="NSColor" ref="869923403"/>
+									</object>
 									<int key="NScvFlags">4</int>
 								</object>
 								<object class="NSScroller" id="99096694">
@@ -352,14 +285,6 @@
 					</object>
 					<int key="connectionID">24</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performClose:</string>
-						<reference key="source" ref="359561441"/>
-						<reference key="destination" ref="4380169"/>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">problemTableView</string>
@@ -368,6 +293,14 @@
 					</object>
 					<int key="connectionID">26</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="359561441"/>
+						<reference key="destination" ref="4380169"/>
+					</object>
+					<int key="connectionID">25</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -451,10 +384,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
 						<reference key="object" ref="252791348"/>
-						<array class="NSMutableArray" key="children">
+						<array class="NSMutableArray" key="children"/>
-							<reference ref="152748337"/>
-							<reference ref="579292183"/>
-						</array>
 						<reference key="parent" ref="458371270"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -462,32 +392,6 @@
 						<reference key="object" ref="903452051"/>
 						<reference key="parent" ref="458371270"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="152748337"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="182886300"/>
-						</array>
-						<reference key="parent" ref="252791348"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="579292183"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="630211358"/>
-						</array>
-						<reference key="parent" ref="252791348"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="630211358"/>
-						<reference key="parent" ref="579292183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="182886300"/>
-						<reference key="parent" ref="152748337"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">18</int>
 						<reference key="object" ref="4380169"/>
@@ -523,10 +427,6 @@
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1.IBWindowTemplateEditedContentRect">{{477, 306}, {480, 309}}</string>
 				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -596,7 +496,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>

cocoa/base/en.lproj/ResultWindow.strings

@@ -5,9 +5,6 @@
 /* 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";
 

cocoa/base/en.lproj/ResultWindow.xib

@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">1938</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSPopUpButton</string>
@@ -18,13 +18,12 @@
 			<string>NSToolbarFlexibleSpaceItem</string>
 			<string>NSCustomObject</string>
 			<string>NSTableView</string>
-			<string>NSTextField</string>
 			<string>NSSearchField</string>
+			<string>NSTextField</string>
 			<string>NSSearchFieldCell</string>
 			<string>NSWindowTemplate</string>
 			<string>NSTextFieldCell</string>
 			<string>NSButtonCell</string>
-			<string>NSTableColumn</string>
 			<string>NSSegmentedControl</string>
 			<string>NSToolbarSpaceItem</string>
 			<string>NSPopUpButtonCell</string>
@@ -40,7 +39,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
 				<string key="NSClassName">ResultWindow</string>
@@ -162,7 +164,7 @@
 								<object class="NSSegmentedCell" key="NSCell" id="993391476">
 									<int key="NSCellFlags">67239424</int>
 									<int key="NSCellFlags2">0</int>
-									<object class="NSFont" key="NSSupport" id="241613967">
+									<object class="NSFont" key="NSSupport">
 										<string key="NSName">LucidaGrande</string>
 										<double key="NSSize">11</double>
 										<int key="NSfFlags">16</int>
@@ -240,7 +242,7 @@
 										<int key="NSColorSpace">6</int>
 										<string key="NSCatalogName">System</string>
 										<string key="NSColorName">controlTextColor</string>
-										<object class="NSColor" key="NSColor" id="300787132">
+										<object class="NSColor" key="NSColor">
 											<int key="NSColorSpace">3</int>
 											<bytes key="NSWhite">MAA</bytes>
 										</object>
@@ -703,94 +705,7 @@
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="607866053"/>
 											</object>
-											<array class="NSMutableArray" key="NSTableColumns">
+											<array class="NSMutableArray" key="NSTableColumns"/>
-												<object class="NSTableColumn" id="442382151">
-													<string key="NSIdentifier">marked</string>
-													<double key="NSWidth">26</double>
-													<double key="NSMinWidth">26</double>
-													<double key="NSMaxWidth">26</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">134219776</int>
-														<string key="NSContents"/>
-														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">3100</int>
-														</object>
-														<object class="NSColor" key="NSBackgroundColor" id="980928921">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerColor</string>
-															<reference key="NSColor" ref="552368973"/>
-														</object>
-														<object class="NSColor" key="NSTextColor" id="532863179">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerTextColor</string>
-															<reference key="NSColor" ref="300787132"/>
-														</object>
-													</object>
-													<object class="NSButtonCell" key="NSDataCell" id="777504751">
-														<int key="NSCellFlags">67239424</int>
-														<int key="NSCellFlags2">131072</int>
-														<string key="NSContents"/>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSControlView" ref="387493015"/>
-														<int key="NSButtonFlags">1211912703</int>
-														<int key="NSButtonFlags2">2</int>
-														<object class="NSCustomResource" key="NSNormalImage">
-															<string key="NSClassName">NSImage</string>
-															<string key="NSResourceName">NSSwitch</string>
-														</object>
-														<object class="NSButtonImageSource" key="NSAlternateImage">
-															<string key="NSImageName">NSSwitch</string>
-														</object>
-														<string key="NSAlternateContents"/>
-														<string key="NSKeyEquivalent"/>
-														<int key="NSPeriodicDelay">200</int>
-														<int key="NSPeriodicInterval">25</int>
-													</object>
-													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="387493015"/>
-												</object>
-												<object class="NSTableColumn" id="418301244">
-													<string key="NSIdentifier">0</string>
-													<double key="NSWidth">195</double>
-													<double key="NSMinWidth">16</double>
-													<double key="NSMaxWidth">3.4028234663852886e+38</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Name</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSBackgroundColor" ref="980928921"/>
-														<reference key="NSTextColor" ref="532863179"/>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="270170598">
-														<int key="NSCellFlags">337772096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="241613967"/>
-														<reference key="NSControlView" ref="387493015"/>
-														<object class="NSColor" key="NSBackgroundColor" id="1072464721">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlBackgroundColor</string>
-															<reference key="NSColor" ref="359204506"/>
-														</object>
-														<reference key="NSTextColor" ref="453389366"/>
-													</object>
-													<int key="NSResizingMask">2</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<reference key="NSTableView" ref="387493015"/>
-													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-														<string key="NSKey">0</string>
-														<bool key="NSAscending">YES</bool>
-														<string key="NSSelector">compare:</string>
-													</object>
-												</object>
-											</array>
 											<double key="NSIntercellSpacingWidth">3</double>
 											<double key="NSIntercellSpacingHeight">2</double>
 											<reference key="NSBackgroundColor" ref="552368973"/>
@@ -821,7 +736,12 @@
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="387493015"/>
 									<reference key="NSDocView" ref="387493015"/>
-									<reference key="NSBGColor" ref="1072464721"/>
+									<object class="NSColor" key="NSBGColor" id="1072464721">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlBackgroundColor</string>
+										<reference key="NSColor" ref="359204506"/>
+									</object>
 									<int key="NScvFlags">4</int>
 								</object>
 								<object class="NSScroller" id="777138208">
@@ -894,14 +814,6 @@
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="866620243"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">45</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
@@ -1094,6 +1006,14 @@
 					</object>
 					<int key="connectionID">81</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleQuicklookPanel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="831294603"/>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showDirectoryWindow:</string>
@@ -1102,6 +1022,14 @@
 					</object>
 					<int key="connectionID">82</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="866620243"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">45</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
@@ -1110,14 +1038,6 @@
 					</object>
 					<int key="connectionID">83</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleQuicklookPanel:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="831294603"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">rowHeight: values.TableFontSize</string>
@@ -1216,10 +1136,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
 						<reference key="object" ref="387493015"/>
-						<array class="NSMutableArray" key="children">
+						<array class="NSMutableArray" key="children"/>
-							<reference ref="418301244"/>
-							<reference ref="442382151"/>
-						</array>
 						<reference key="parent" ref="489091452"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1232,32 +1149,6 @@
 						<reference key="object" ref="777138208"/>
 						<reference key="parent" ref="489091452"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="418301244"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="270170598"/>
-						</array>
-						<reference key="parent" ref="387493015"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="442382151"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="777504751"/>
-						</array>
-						<reference key="parent" ref="387493015"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="777504751"/>
-						<reference key="parent" ref="442382151"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="270170598"/>
-						<reference key="parent" ref="418301244"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">67</int>
 						<reference key="object" ref="593436906"/>
@@ -1530,10 +1421,6 @@
 				<string key="1.IBWindowTemplateEditedContentRect">{{324, 305}, {557, 400}}</string>
 				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
 				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1905,7 +1792,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -1918,7 +1805,6 @@
 			<string key="NSMenuCheckmark">{9, 8}</string>
 			<string key="NSMenuMixedState">{7, 2}</string>
 			<string key="NSQuickLookTemplate">{21, 16}</string>
-			<string key="NSSwitch">{15, 15}</string>
 			<string key="folder32">{32, 32}</string>
 		</dictionary>
 	</data>

cocoa/base/en.lproj/columns.strings

@@ -1,23 +0,0 @@
-"Filename" = "Filename";
-"Folder" = "Folder";
-"Size" = "Size";
-"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";

cocoa/base/en.lproj/core.strings

@@ -1,39 +0,0 @@
-"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 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";
-
-"Continue" = "Continue";
-"Continue ({})" = "Continue ({})";
-
-"Analyzed %d/%d pictures" = "Analyzed %d/%d pictures";
-"Preparing for matching" = "Preparing for matching";
-"Performed %d/%d chunk matches" = "Performed %d/%d chunk matches";
-"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";
-
-/* Prioritization */
-"Ends with number" = "Ends with number";
-"Doesn't end with number" = "Doesn't end with number";
-"Highest" = "Highest";
-"Lowest" = "Lowest";
-"Newest" = "Newest";
-"Oldest" = "Oldest";

cocoa/base/en.lproj/message.strings

@@ -1,33 +0,0 @@
-"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?";
-
-/* hscommon */
-"FairwarePromptMsg" = "{name} is Fairware, which means \"open source software developed with expectation of fair contributions from users\". Hours have been invested in this software with the expectation that users will be fair enough to compensate them. The \"Unpaid hours\" figure you see below is the hours that have yet to be compensated for this project.\n\nIf you like this application, please make a contribution that you consider fair. Thanks!\n\nIf you cannot afford to contribute, you can either ignore this reminder or send an e-mail at support@hardcoded.net so I can send you a registration key.\n\nThis dialog doesn't show when there are no unpaid hours or when you have a valid contribution key.";
-"DemoPromptMsg" = "{name} is fairware, which means \"open source software developed with expectation of fair contributions from users\". It's a very interesting concept, but one year of fairware has shown that most people just want to know how much it costs and not be bothered with theories about intellectual property.\n\nSo I won't bother you and will be very straightforward: You can try {name} for free but you have to buy it in order to use it without limitations. In demo mode, {name} {limitation}.\n\nSo it's as simple as this. If you're curious about fairware, however, I encourage you to read more about it by clicking on the \"Fairware?\" button.";

cocoa/base/fr.lproj/DirectoryPanel.strings

@@ -17,7 +17,7 @@
 "57.title" = "Exclu";
 
 /* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
-"71.title" = "Sélectionnez les dossiers à scanner et cliquez sur Scan.";
+"71.title" = "Sélectionnez les dossiers à scanner puis faites \"Scan\".";
 
 /* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
 "73.title" = "Charger";

cocoa/base/fr.lproj/ExtraFairwareReminder.strings

@@ -4,7 +4,7 @@
 /* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
 "4.title" = "Ce rappel apparaît parce que:\n\n1. Plus de 100 doublons sont traités\n2. Vous n'avez pas encore contribué à dupeGuru\n3. Il y a des heures non-payées au projet";
 
-/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup."; ObjectID = "6"; */
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
 "6.title" = "Il semble que vous ayez trouvé beaucoup de doublons. Super! Je dois par contre insister que des contributions sont attendues lorsqu'il y'a des heures non-payées au projet.\n\nVous pensez peut-être \"je n'utiliserai ce programme qu'une fois, pas besoin de contribuer\". Le problème c'est que la plupart des utilisateurs de dupeGuru ne l'utilisent qu'une fois. Si tous suivent ce raisonnement, le développement de dupeGuru ne peut pas continuer. C'est à cause de cette tendance inhérente à la nature de dupeGuru que je me vois contraint d'insister ici.\n\nSi vous n'avez pas les moyens de contribuer, ignorez ce message ou envoyez moi un message à hsoft@hardcoded.net pour que je vous envoie une clé d'enregistrement.";
 
 /* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */

cocoa/base/fr.lproj/Localizable.strings

@@ -2,8 +2,38 @@
 "Load from file..." = "Charger un fichier...";
 "Reset to Default" = "Colonnes par défault";
 
+"Select a results file to load" = "Sélectionnez un fichier résultats à charger";
+"You have unsaved results, do you really want to quit?" = "Vos résultats ne sont pas sauvegardés. Voulez-vous vraiment quitter?";
+"Select a directory to copy marked files to" = "Sélectionnez un dossier vers lequel copier les fichiers";
+"Select a directory to move marked files to" = "Sélectionnez un dossier vers lequel déplacer les fichiers";
+"Select a file to save your results to" = "Sélectionnez un fichier résultats dans lequel sauvegarder";
+"Select a folder to add to the scanning list" = "Sélectionnez un dossier à ajouter à la liste";
+"You have unsaved results, do you really want to continue?" = "Vos résultats ne sont pas sauvegardés. Voulez-vous vraiment continuer?";
+"'%@' already is in the list." = "'%@' est déjà dans la liste.";
+"'%@' does not exist." = "'%@' n'existe pas.";
+"You are about to remove %d files from results. Continue?" = "%d fichiers seront retirés des résultats. Continuer?";
+"The name '%@' already exists." = "Le nom '%@' existe déjà.";
+"You are about to send %d files to Trash. Continue?" = "%d fichiers seront envoyés à la corbeille. Continuer?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "%d fichiers seront envoyés à la corbeille (puis 'hardlinkés'). Continuer?";
+"Do you really want to remove all %d items from the ignore list?" = "Voulez-vous vider la liste de fichiers ignorés des %d items qu'elle contient?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "%d fichiers seront ignorés des prochains scans. Continuer?";
+"You have no custom command set up. Set it up in your preferences." = "Vous n'avez pas de commande personnalisée. Ajoutez-la dans vos préférences.";
+"All marked files were copied sucessfully." = "Tous les fichiers marqués ont été copiés correctement.";
+"All marked files were moved sucessfully." = "Tous les fichiers déplacés ont été copiés correctement.";
+"All marked files were sucessfully sent to Trash." = "Tous les fichiers marqués ont été correctement envoyés à la corbeille.";
+"No duplicates found." = "Aucun doublon trouvé.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "Une action précédente est encore en cours. Attendez quelques secondes avant d'en repartir une nouvelle.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Votre librairie iTunes contient %d tracks mortes qui seront retirées. Continuer?";
+"You have no dead tracks in your iTunes Library" = "Votre librairie iTunes ne contient aucune track morte.";
+"Do you really want to remove all your cached picture analysis?" = "Voulez-vous vraiment vider la cache de vos analyses précédentes?";
+
+
 "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";
+
+"Yes" = "Oui";
+"No" = "Non";
+"OK" = "OK";

cocoa/base/fr.lproj/ProblemDialog.strings

@@ -3,14 +3,7 @@
 "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" = "Des problèmes ont été rencontrés lors du traitement de certains fichiers. La nature de ces problèmes est décrite dans la liste ci-dessous. Ces fichiers n'ont pas été retirés des résultats.";
-"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";

cocoa/base/fr.lproj/ResultWindow.strings

@@ -5,9 +5,6 @@
 /* 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";
 
@@ -77,6 +74,9 @@
 /* Class = "NSSegmentedCell"; 44.ibShadowedLabels[2] = "Delta"; ObjectID = "44"; */
 "44.ibShadowedLabels[2]" = "Delta";
 
+/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */
+"67.title" = "Menu";
+
 /* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
 "68.title" = "Ajouter sélectionnés à la liste de fichiers ignorés";
 

cocoa/base/fr.lproj/columns.strings

@@ -1,23 +0,0 @@
-"Filename" = "Nom de fichier";
-"Folder" = "Dossier";
-"Size" = "Taille";
-"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";

cocoa/base/fr.lproj/core.strings

@@ -1,39 +0,0 @@
-"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";
-
-"Continue" = "Continuer";
-"Continue ({})" = "Continuer ({})";
-
-"Analyzed %d/%d pictures" = "Analyzé %d/%d images";
-"Preparing for matching" = "Préparation pour la comparaison";
-"Performed %d/%d chunk matches" = "%d/%d blocs d'images comparés";
-"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";
-
-/* Prioritization */
-"Ends with number" = "Chiffres à la fin";
-"Doesn't end with number" = "Pas de chiffres à la finr";
-"Highest" = "Plus grand";
-"Lowest" = "Moins grand";
-"Newest" = "Plus récent";
-"Oldest" = "Moins récent";

cocoa/base/fr.lproj/message.strings

@@ -1,33 +0,0 @@
-"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 contiennent 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?";
-
-/* hscommon */
-"FairwarePromptMsg" = "{name} est Fairware, ce qui signifie \"open source développé avec des attentes de contributions justes de la part des utilisateurs\". Les heures investies dans ce programme l'ont été avec l'attente que les utilisateurs seront assez honnêtes pour les compenser. Les \"Heures impayées\" que vous voyez ci-dessous sont le nombre d'heures qui n'ont pas encore été compensées.\n\nSi vous aimez cette application, veuillez faire une contribution qui vous semble juste. Merci!\n\nSi vous n'avez pas les moyens de contribuer, vous pouvez soit ignorer ce message soit envoyer un e-mail à support@hardcoded.net pour avoir une clé d'enregistrement.\n\nCette fenêtre n'apparaît pas lorsque vous avez contribué ou qu'il n'y a aucune heure impayée.";
-"DemoPromptMsg" = "{name} is fairware, which means \"open source software developed with expectation of fair contributions from users\". It's a very interesting concept, but one year of fairware has shown that most people just want to know how much it costs and not be bothered with theories about intellectual property.\n\nSo I won't bother you and will be very straightforward: You can try {name} for free but you have to buy it in order to use it without limitations. In demo mode, {name} {limitation}.\n\nSo it's as simple as this. If you're curious about fairware, however, I encourage you to read more about it by clicking on the \"Fairware?\" button.";

cocoa/base/it.lproj/DetailsPanel.strings

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

cocoa/base/it.lproj/DirectoryPanel.strings

@@ -0,0 +1,23 @@
+/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */
+"13.headerCell.title" = "Stato";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */
+"15.headerCell.title" = "Nome";
+
+/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */
+"48.title" = "Scansiona";
+
+/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */
+"55.title" = "Normale";
+
+/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */
+"56.title" = "Riferimento";
+
+/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
+"57.title" = "Escluso";
+
+/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
+"71.title" = "Seleziona le cartelle da scansionare e premi \"Scansiona\".";
+
+/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
+"73.title" = "Carica i risultati";

cocoa/base/it.lproj/ExtraFairwareReminder.strings

@@ -0,0 +1,11 @@
+/* Class = "NSWindow"; title = "Sorry, I must insist"; ObjectID = "1"; */
+"1.title" = "Chiedo scusa, devo insistere";
+
+/* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
+"4.title" = "Questo promemoria viene visualizzato perché:\n\n1. Avete trovato più di 100 duplicati\n2. Non avete ancora contribuito per dupeGuru\n3. Ci sono ore non pagate nel progetto";
+
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
+"6.title" = "Sembra che abbiate trovato molti duplicati. Ottimo! Devo insistere, però, affinché contribuiate per tutte le ore non pagate che rimangono nel progetto.\n\nVoi penserete: \"ma io l'userò solo una volta, non devo contribuire\". Il problema è che la maggior parte delle persone userà dupeGuru solo una volta. Se tutti la pensassero così lo sviluppo di dupeGuru non potrebbe proseguire. E' proprio per la natura dei programmi come dupeGuru che devo insistere su questo punto.\n\nSe non siete in grado di offrire questo contributo potete ignorare questo avviso o spedirmi una e-mail a hsoft@hardcoded.net, così che possa darvi un codice per rimuovere questo avviso.";
+
+/* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */
+"10.title" = "Contribuisci";

cocoa/base/it.lproj/Localizable.strings

@@ -0,0 +1,39 @@
+"Add New Folder..." = "Aggiungi una nuova cartella...";
+"Load from file..." = "Carica dal file...";
+"Reset to Default" = "Ripristina le impostazioni predefinite";
+
+"Select a results file to load" = "Seleziona un risultato (file) da caricare";
+"You have unsaved results, do you really want to quit?" = "Hai dei risultati non salvati. Vuoi veramente chiudere?";
+"Select a directory to copy marked files to" = "Seleziona una cartella in cui copiare i file marcati";
+"Select a directory to move marked files to" = "Seleziona una cartella in cui spostare i file marcati";
+"Select a file to save your results to" = "Seleziona un file dove salvare i tuoi risultati";
+"Select a folder to add to the scanning list" = "Seleziona una cartella da aggiungere alla lista delle cartelle da scansionare";
+"You have unsaved results, do you really want to continue?" = "Hai dei risultati non salvati. Vuoi veramente continuare?";
+"'%@' already is in the list." = "'%@' è già nella lista.";
+"'%@' does not exist." = "'%@' non esiste.";
+"You are about to remove %d files from results. Continue?" = "Stai per rimuovere %d file dai risultati. Continuare?";
+"The name '%@' already exists." = "Il nome '%@' è già esistente.";
+"You are about to send %d files to Trash. Continue?" = "Stai per inviare %d file nel cestino. Continuare?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "Stai per inviare %d file nel cestino (compresi gli hardlink). Continuare?";
+"Do you really want to remove all %d items from the ignore list?" = "Vuoi veramente rimuovere tutti i %d elementi dalla lista dei file da ignorare?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "Tutti i %d elementi che coincidono verranno ignorati in tutte le scansioni successive. Continuare?";
+"You have no custom command set up. Set it up in your preferences." = "Non hai impostato nessun comando personalizzato. Impostalo nelle tue preferenze.";
+"All marked files were copied sucessfully." = "Tutti i file marcati sono stati copiati correttamente.";
+"All marked files were moved sucessfully." = "Tutti i file marcati sono stati spostati correttamente.";
+"All marked files were sucessfully sent to Trash." = "Tutti i file marcati sono stati inviati nel cestino.";
+"No duplicates found." = "Non sono stati trovati dei duplicati.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "Un'azione precedente è ancora in corso. Non puoi cominciarne una nuova. Aspetta qualche secondo e quindi riprova.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "La tua libreria di iTunes contiene %d tracce inesistenti pronte per essere rimosse. Continuare?";
+"You have no dead tracks in your iTunes Library" = "La tua libreria di iTunes non contiene tracce inesistenti";
+"Do you really want to remove all your cached picture analysis?" = "Vuoi veramente rimuovere tutte le analisi delle immagini memorizzate nella cache?";
+
+
+"Add iTunes Directory" = "Aggiungi alla lista di iTunes";
+"Remove Dead Tracks in iTunes" = "Rimuovi le tracce inesistenti da iTunes";
+
+"Add iPhoto Library" = "Aggiungi alla libreria di iPhoto";
+"Clear Picture Cache" = "Cancella la cache delle immagini";
+
+"Yes" = "Si";
+"No" = "No";
+"OK" = "OK";

cocoa/base/it.lproj/MainMenu.strings

@@ -0,0 +1,177 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Porta tutto in primo piano";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Finestra";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimizza";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Finestra";
+
+/* Class = "NSMenuItem"; title = "About dupeGuru"; ObjectID = "58"; */
+"58.title" = "Informazioni su dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Aiuto";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Aiuto";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Help"; ObjectID = "111"; */
+"111.title" = "Aiuto di dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide dupeGuru"; ObjectID = "134"; */
+"134.title" = "Nascondi dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Quit dupeGuru"; ObjectID = "136"; */
+"136.title" = "Chiudi dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Nascondi gli altri";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Mostra tutto";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "Details Panel"; ObjectID = "398"; */
+"398.title" = "Scheda dettagliata";
+
+/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "541"; */
+"541.title" = "Preferenze...";
+
+/* Class = "NSMenuItem"; title = "Folder Selection Window"; ObjectID = "579"; */
+"579.title" = "Finestra di selezione della cartella";
+
+/* Class = "NSMenuItem"; title = "Actions"; ObjectID = "597"; */
+"597.title" = "Azioni";
+
+/* Class = "NSMenu"; title = "Actions"; ObjectID = "598"; */
+"598.title" = "Azioni";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "599"; */
+"599.title" = "Sposta gli elementi marcati nel cestino";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
+"600.title" = "Sposta gli elementi marcati nel...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "601"; */
+"601.title" = "Copia gli elementi evidenziati nel...";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "602"; */
+"602.title" = "Imposta gli elementi selezionati come riferimento";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "603"; */
+"603.title" = "Rimuovi gli elementi marcati dai risultati";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "605"; */
+"605.title" = "Rimuovi gli elementi selezionati dai risultati";
+
+/* Class = "NSMenuItem"; title = "Columns"; ObjectID = "618"; */
+"618.title" = "Colonne";
+
+/* Class = "NSMenu"; title = "Columns"; ObjectID = "619"; */
+"619.title" = "Colonne";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "708"; */
+"708.title" = "Apri gli elementi selezionati con l'applicazione predefinita";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "710"; */
+"710.title" = "Mostra gli elementi selezionati nel Finder";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "922"; */
+"922.title" = "Aggiungi gli elementi selezionati alla lista da ignorare";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "924"; */
+"924.title" = "Chiudi la finestra";
+
+/* Class = "NSMenuItem"; title = "Start Duplicate Scan"; ObjectID = "926"; */
+"926.title" = "Inizia la scansione dei duplicati";
+
+/* Class = "NSMenuItem"; title = "Clear Ignore List"; ObjectID = "927"; */
+"927.title" = "Cancella la lista degli elementi da ignorare";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "933"; */
+"933.title" = "Rinomina gli elementi selezionati";
+
+/* Class = "NSMenuItem"; title = "Export Results to XHTML"; ObjectID = "947"; */
+"947.title" = "Esporta i risultati in formato XHTML";
+
+/* Class = "NSMenuItem"; title = "Check for update..."; ObjectID = "950"; */
+"950.title" = "Controlla gli aggiornamenti...";
+
+/* Class = "NSMenuItem"; title = "Mode"; ObjectID = "959"; */
+"959.title" = "Modo";
+
+/* Class = "NSMenu"; title = "Mode"; ObjectID = "960"; */
+"960.title" = "Modo";
+
+/* Class = "NSMenuItem"; title = "Show Dupes Only"; ObjectID = "961"; */
+"961.title" = "Visualizza solo i duplicati";
+
+/* Class = "NSMenuItem"; title = "Show Delta Values"; ObjectID = "962"; */
+"962.title" = "Visualizza le differenze";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "965"; */
+"965.title" = "Edita";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "966"; */
+"966.title" = "Edita";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "985"; */
+"985.title" = "Taglia";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "986"; */
+"986.title" = "Copia";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "991"; */
+"991.title" = "Incolla";
+
+/* Class = "NSMenuItem"; title = "Mark All"; ObjectID = "1011"; */
+"1011.title" = "Marca tutti";
+
+/* Class = "NSMenuItem"; title = "Mark None"; ObjectID = "1012"; */
+"1012.title" = "Deseleziona tutti";
+
+/* Class = "NSMenuItem"; title = "Invert Marking"; ObjectID = "1013"; */
+"1013.title" = "Inverti la selezione";
+
+/* Class = "NSMenuItem"; title = "Mark Selected"; ObjectID = "1014"; */
+"1014.title" = "Marca i selezionati";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Website"; ObjectID = "1023"; */
+"1023.title" = "Sito Web di dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Invoke Custom Command"; ObjectID = "1177"; */
+"1177.title" = "Invoca comando personalizzato";
+
+/* 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" = "Carica i risultati...";
+
+/* Class = "NSMenuItem"; title = "Save Results..."; ObjectID = "1206"; */
+"1206.title" = "Salva i risultati...";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "1227"; */
+"1227.title" = "Cancella gli elementi marcati e sostituiscili con degli Hardlinks";
+
+/* Class = "NSMenuItem"; title = "Load Recent Results"; ObjectID = "1239"; */
+"1239.title" = "Carica i risultati recenti";
+
+/* Class = "NSMenu"; title = "Load Recent Results"; ObjectID = "1240"; */
+"1240.title" = "Carica i risultati recenti";
+
+/* Class = "NSMenuItem"; title = "Results Window"; ObjectID = "1272"; */
+"1272.title" = "Finestra dei risultati";
+
+/* Class = "NSMenuItem"; title = "Re-Prioritize Results"; ObjectID = "1276"; */
+"1276.title" = "Cambia la priorità dei risultati";

cocoa/base/it.lproj/PrioritizeDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Re-Prioritize duplicates"; ObjectID = "1"; */
+"1.title" = "Cambia la priorità dei duplicati";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "37"; */
+"37.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "39"; */
+"39.title" = "Cancella";
+
+/* Class = "NSTextFieldCell"; title = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; ObjectID = "41"; */
+"41.title" = "Aggiungi dei criteri di selezione nel riquadro a destra e clicca su 'OK' per inviare i duplicati che meglio corrispondono a questi criteri al loro gruppo di appartenenza. Per maggiori informazioni leggere il file di 'help'.";

cocoa/base/it.lproj/ProblemDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Problems!"; ObjectID = "1"; */
+"1.title" = "Problemi!";
+
+/* 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" = "Sono stati riscontrati dei problemi elaborando alcuni (o tutti) i file. La causa di questi problemi è descritta nella tabella sottostante. Questi file non stati rimossi dai vostri risultati.";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Chiudi";
+
+/* Class = "NSButtonCell"; title = "Reveal Selected"; ObjectID = "21"; */
+"21.title" = "Mostra i selezionati";

cocoa/base/it.lproj/ResultWindow.strings

@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */
+"1.title" = "Risultati di dupeGuru";
+
+/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */
+"6.title" = "Marcati: 0 files, 0 B. Totale: 0 files, 0 B.";
+
+/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
+"15.label" = "Opzioni";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */
+"15.paletteLabel" = "Opzioni";
+
+/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */
+"16.label" = "Filtro";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */
+"16.paletteLabel" = "Filtro";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */
+"17.label" = "Azione";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */
+"17.paletteLabel" = "Azione";
+
+/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */
+"19.label" = "Cartelle";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
+"19.paletteLabel" = "Cartelle";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "27"; */
+"27.title" = "Cancella gli elementi marcati e sostituiscili con degli Hardlinks";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
+"29.title" = "Sposta gli elementi marcati nel cestino";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
+"30.title" = "Sposta gli elementi marcati nel...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */
+"31.title" = "Copia gli elementi evidenziati nel...";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */
+"32.title" = "Rimuovi gli elementi marcati dai risultati";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */
+"34.title" = "Rimuovi gli elementi selezionati dai risultati";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */
+"35.title" = "Aggiungi gli elementi selezionati alla lista da ignorare";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */
+"36.title" = "Imposta gli elementi selezionati come riferimento";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */
+"38.title" = "Apri gli elementi selezionati con l'applicazione predefinita";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */
+"39.title" = "Mostra gli elementi selezionati nel Finder";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */
+"40.title" = "Rinomina gli elementi selezionati";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */
+"42.placeholderString" = "Filtro";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[0] = "Details"; ObjectID = "44"; */
+"44.ibShadowedLabels[0]" = "Dettagli";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[1] = "Dupes Only"; ObjectID = "44"; */
+"44.ibShadowedLabels[1]" = "Solo duplicati";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[2] = "Delta"; ObjectID = "44"; */
+"44.ibShadowedLabels[2]" = "Delta";
+
+/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */
+"67.title" = "Menu";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
+"68.title" = "Aggiungi gli elementi selezionati alla lista da ignorare";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */
+"70.title" = "Rinomina gli elementi selezionati";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */
+"71.title" = "Rimuovi gli elementi selezionati dai risultati";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */
+"72.title" = "Imposta gli elementi selezionati come riferimento";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */
+"73.title" = "Mostra gli elementi selezionati nel Finder";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
+"74.title" = "Apri gli elementi selezionati con l'applicazione predefinita";

cocoa/base/main.m

@@ -0,0 +1,41 @@
+/* 
+Copyright 2011 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 <Python.h>
+#import <wchar.h>
+#import <locale.h>
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    /* We have to set the locate to UTF8 for mbstowcs() to correctly convert non-ascii chars in paths */
+    setlocale(LC_ALL, "en_US.UTF-8");
+    NSString *respath = [[NSBundle mainBundle] resourcePath];
+    NSString *mainpy = [respath stringByAppendingPathComponent:@"dg_cocoa.py"];
+    wchar_t wPythonPath[PATH_MAX+1];
+    NSString *pypath = [respath stringByAppendingPathComponent:@"py"];
+    mbstowcs(wPythonPath, [pypath fileSystemRepresentation], PATH_MAX+1);
+    Py_SetPath(wPythonPath);
+    Py_SetPythonHome(wPythonPath);
+    Py_Initialize();
+    PyEval_InitThreads();
+    PyGILState_STATE gilState = PyGILState_Ensure();
+    FILE* fp = fopen([mainpy UTF8String], "r");
+    PyRun_SimpleFile(fp, [mainpy UTF8String]);
+    fclose(fp);
+    PyGILState_Release(gilState);
+    if (gilState == PyGILState_LOCKED) {
+        PyThreadState_Swap(NULL);
+        PyEval_ReleaseLock();
+    }
+    int result = NSApplicationMain(argc,  (const char **) argv);
+    Py_Finalize();
+    [pool release];
+    return result;
+}

cocoa/base/zh_CN.lproj/DirectoryPanel.strings

@@ -17,7 +17,7 @@
 "57.title" = "不包含";
 
 /* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
-"71.title" = "Select folders to scan and press \"Scan\".";
+"71.title" = "请选择要扫描的文件夹，然后点击 \"扫描\"。";
 
 /* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
 "73.title" = "载入结果";

cocoa/base/zh_CN.lproj/ExtraFairwareReminder.strings

@@ -4,8 +4,8 @@
 /* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */
 "4.title" = "此提醒框弹出的原因如下:\n\n1. 您正在处理超过100个重复文件\n2. 您没有捐助过dupeGuru\n3. 此软件中还有未支付时间";
 
-/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this popup."; ObjectID = "6"; */
+/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */
-"6.title" = "看起来似乎您找到了很多重复文件。这也是我继续精进这个软件的动力之一。然而，我衷心的希望能够得到您的捐助，因为我会日夜奋战于这个软件并且没有任何报酬。\n\n您可能会觉得 "反正这个软件我只用一次，我不需要给开发者任何捐助". 问题是大多数人都只用一次dupeGuru。如果每一位都这样想，dupeGuru的开发也就没有资金支持了。也正是因为dupeGuru自身的性质决定了它有着仅用一次的内在倾向，所以我还必须坚持致力于这个软件的开发与精进。\n\n如果您无法承担捐助，您也可以忽略此提醒，或者发送电子邮件至 support@hardcoded.net ，我会发送给您一个注册密钥。";
+"6.title" = "看起来似乎您找到了很多重复文件。这也是我继续精进这个软件的动力之一。然而，我衷心的希望能够得到您的捐助，因为我会日夜奋战于这个软件并且没有任何报酬。\n\n您可能会觉得 \"反正这个软件我只用一次，我不需要给开发者任何捐助\". 问题是大多数人都只用一次dupeGuru。如果每一位都这样想，dupeGuru的开发也就没有资金支持了。也正是因为dupeGuru自身的性质决定了它有着仅用一次的内在倾向，所以我还必须坚持致力于这个软件的开发与精进。\n\n如果您无法承担捐助，您也可以忽略此提醒，或者发送电子邮件至 support@hardcoded.net ，我会发送给您一个注册密钥。";
 
 /* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */
 "10.title" = "捐助";

cocoa/base/zh_CN.lproj/Localizable.strings

@@ -2,8 +2,38 @@
 "Load from file..." = "Load from file...";
 "Reset to Default" = "Reset to Default";
 
+"Select a results file to load" = "选择一个结果文件并载入";
+"You have unsaved results, do you really want to quit?" = "您还没有保存扫描结果，确定要退出吗?";
+"Select a directory to copy marked files to" = "Select a directory to copy marked files to";
+"Select a directory to move marked files to" = "Select a directory to move marked files to";
+"Select a file to save your results to" = "将结果保存为...";
+"Select a folder to add to the scanning list" = "请选择一个文件夹并加入到扫描列表中";
+"You have unsaved results, do you really want to continue?" = "目前还有结果尚未保存，确定要继续吗?";
+"'%@' already is in the list." = "'%@' already is in the list.";
+"'%@' does not exist." = "'%@' does not exist.";
+"You are about to remove %d files from results. Continue?" = "你将从结果中移除 %d 个文件。继续吗?";
+"The name '%@' already exists." = "The name '%@' already exists.";
+"You are about to send %d files to Trash. Continue?" = "即将有 %d 个文件被移到回收站。继续吗?";
+"You are about to send %d files to Trash (and hardlink them afterwards). Continue?" = "即将有 %d 个文件被移动垃圾桶并删除硬盘上的文件。继续吗?";
+"Do you really want to remove all %d items from the ignore list?" = "确定要从忽略列表中移除 %d 项吗?";
+"All selected %d matches are going to be ignored in all subsequent scans. Continue?" = "目前已选的 %d 个匹配项将在后续的扫描中被忽略。继续吗?";
+"You have no custom command set up. Set it up in your preferences." = "你没有设定自定义命令。请在首选项中进行设定。";
+"All marked files were copied sucessfully." = "All marked files were copied sucessfully.";
+"All marked files were moved sucessfully." = "All marked files were moved sucessfully.";
+"All marked files were sucessfully sent to Trash." = "All marked files were sucessfully sent to Trash.";
+"No duplicates found." = "没有找到重复文件。";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "目前还有任务在执行，新任务无法开启。请等待几秒钟后再重新试一次。";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"You have no dead tracks in your iTunes Library" = "You have no dead tracks in your iTunes Library";
+"Do you really want to remove all your cached picture analysis?" = "确定要移除所有缓存图片?";
+
+
 "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" = "清空图片缓存";
+
+"Yes" = "Yes";
+"No" = "No";
+"OK" = "OK";

cocoa/base/zh_CN.lproj/ProblemDialog.strings

@@ -3,13 +3,7 @@
 "1.title" = "有问题!";
 
 /* 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" = "在处理部分或全部文件时发现问题。产生问题的原因在下表中进行描述。这些文件将不会从结果中移除。";
-
-/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */
-"10.headerCell.title" = "文件路径";
-
-/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */
-"11.headerCell.title" = "错误信息";
 
 /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
 "19.title" = "关闭";

cocoa/base/zh_CN.lproj/ResultWindow.strings

@@ -5,9 +5,6 @@
 /* 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" = "名称";
-
 /* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
 "15.label" = "Options";
 
@@ -69,7 +66,7 @@
 "42.placeholderString" = "Filter";
 
 /* Class = "NSSegmentedCell"; 44.ibShadowedLabels[0] = "Details"; ObjectID = "44"; */
-"44.ibShadowedLabels[0]" = "Details";
+"44.ibShadowedLabels[0]" = "详细说明";
 
 /* Class = "NSSegmentedCell"; 44.ibShadowedLabels[1] = "Dupes Only"; ObjectID = "44"; */
 "44.ibShadowedLabels[1]" = "Dupes Only";

cocoa/base/zh_CN.lproj/columns.strings

@@ -1,23 +0,0 @@
-"Filename" = "Filename";
-"Folder" = "文件夹";
-"Size" = "大小";
-"Size (KB)" = "大小 (KB)";
-"Size (MB)" = "大小 (MB)";
-"Kind" = "类型";
-"Modification" = "编辑日期";
-"Match %" = "匹配度 %";
-"Words Used" = "使用过的词语";
-"Dupe Count" = "重复文件数";
-
-"Time" = "时间";
-"Bitrate" = "比特";
-"Sample Rate" = "采样率";
-"Title" = "歌曲名";
-"Artist" = "演唱者";
-"Album" = "专辑";
-"Genre" = "音乐类型";
-"Year" = "年";
-"Track Number" = "音轨号";
-"Comment" = "注释";
-
-"Dimensions" = "规格";

cocoa/base/zh_CN.lproj/core.strings

@@ -1,39 +0,0 @@
-"Collecting files to scan" = "收集文件以备扫描";
-"%s (%d discarded)" = "%s (%d 无效)";
-"Scanning for duplicates" = "重复文件扫描中";
-"Loading" = "载入中";
-"Moving" = "移动中";
-"Copying" = "复制中";
-"Sending to Trash" = "移到垃圾桶";
-"0 matches found" = "未找到匹配项";
-"%d matches found" = "找到 %d 个匹配项";
-"Read size of %d/%d files" = "读取 %d/%d 文件大小";
-"Grouped %d/%d matches" = "%d/%d 匹配项组合在一起";
-"%d / %d (%s / %s) duplicates marked." = "已标记 %d / %d (%s / %s) 个重复项。";
-" filter: %s" = " 筛选: %s";
-"Read metadata of %d/%d files" = "读取 %d/%d 文件元数据";
-"Removing false matches" = "移除错误匹配项";
-"Processed %d/%d matches against the ignore list" = "在忽略列表之外已处理 %d/%d 匹配项";
-"Doing group prioritization" = "优化分组";
-
-"Continue" = "继续";
-"Continue ({})" = "继续 ({})";
-
-"Analyzed %d/%d pictures" = "分析 %d/%d 图像";
-"Preparing for matching" = "准备进行匹配";
-"Performed %d/%d chunk matches" = "Performed %d/%d chunk matches";
-"Verified %d/%d matches" = "验证 %d/%d 匹配项";
-
-"Removing dead tracks from your iTunes Library" = "从你的iTunes库中移除无效的音轨";
-"Scanning the iTunes Library" = "正在扫描iTunes库";
-
-"Probing iPhoto. Don't touch it during the operation!" = "正在对iPhoto进行搜索.请在此过程中不要触碰任何按键!";
-"Sending dupes to the Trash" = "将重复文件移到垃圾桶";
-
-/* Prioritization */
-"Ends with number" = "Ends with number";
-"Doesn't end with number" = "Doesn't end with number";
-"Highest" = "Highest";
-"Lowest" = "Lowest";
-"Newest" = "Newest";
-"Oldest" = "Oldest";

cocoa/base/zh_CN.lproj/message.strings

@@ -1,33 +0,0 @@
-"SelectResultToLoadMsg" = "选择一个结果文件并载入";
-"SelectCopyDestinationMsg" = "Select a directory to copy marked files to";
-"SelectMoveDestinationMsg" = "Select a directory to move marked files to";
-"SelectResultToSaveMsg" = "将结果保存为...";
-"SelectFolderToAddMsg" = "请选择一个文件夹并加入到扫描列表中";
-"ReallyWantToQuitMsg" = "您还没有保存扫描结果，确定要退出吗?";
-"ReallyWantToContinueMsg" = "目前还有结果尚未保存，确定要继续吗?";
-"FolderAlreadyInListMsg" = "'%@' already is in the list.";
-"FolderDoesNotExistMsg" = "'%@' does not exist.";
-"FileRemovalConfirmMsg" = "你将从结果中移除 {} 个文件。继续吗?";
-"FilenameAlreadyExistsMsg" = "The name '%@' already exists.";
-"NoScannableFileMsg" = "所选文件夹中不包含可供扫描的文件。";
-"UnknownErrorMsg" = "Unknown Error.";
-"SendToTrashConfirmMsg" = "即将有 {} 个文件被移到回收站。继续吗?";
-"HardlinkConfirmMsg" = "即将有 {} 个文件被移动垃圾桶并删除硬盘上的文件。继续吗?";
-"ClearIgnoreListConfirmMsg" = "确定要从忽略列表中移除 {} 项吗?";
-"IgnoreConfirmMsg" = "目前已选的 {} 个匹配项将在后续的扫描中被忽略。继续吗?";
-"NoCustomCommandMsg" = "你没有设定自定义命令。请在首选项中进行设定。";
-"CopySuccessMsg" = "All marked files were copied sucessfully.";
-"MoveSuccessMsg" = "All marked files were moved sucessfully.";
-"SendToTrashSuccessMsg" = "All marked files were sucessfully sent to Trash.";
-"NoDuplicateFoundMsg" = "没有找到重复文件。";
-"TaskHangingMsg" = "目前还有任务在执行，新任务无法开启。请等待几秒钟后再重新试一次。";
-
-"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" = "确定要移除所有缓存图片?";
-
-/* hscommon */
-"FairwarePromptMsg" = "{name} 是一款捐助软件,也就是说 \"用户对研发开源软件所花费的时间进行符合用户意愿的捐助\"。用户可以根据研发人员花费在开发软件上的时间进行合理的补偿。用户在下面看到的 \"未支付的时间\" (Unpaid hours)表示需要对该软件进行补偿的时间。\n\n如果您喜欢这款软件，我诚挚的希望您可以进行必要的捐助。谢谢！\n\n如果您无法承担捐助，您也可以忽略此提醒，或者发送电子邮件至 support@hardcoded.net ，我会发送给您一个注册密钥。\n\n当软件没有未支付的时间或您已使用一个有效的注册密钥，此对话框将不会再显示。";
-"DemoPromptMsg" = "{name} is fairware, which means \"open source software developed with expectation of fair contributions from users\". It's a very interesting concept, but one year of fairware has shown that most people just want to know how much it costs and not be bothered with theories about intellectual property.\n\nSo I won't bother you and will be very straightforward: You can try {name} for free but you have to buy it in order to use it without limitations. In demo mode, {name} {limitation}.\n\nSo it's as simple as this. If you're curious about fairware, however, I encourage you to read more about it by clicking on the \"Fairware?\" button.";

cocoa/inter/app.py

@@ -1,15 +1,16 @@
 import logging
 
+from objp.util import pyref, dontwrap
 from jobprogress import job
-from hscommon import cocoa
+import cocoa
-from hscommon.cocoa import install_exception_hook
+from cocoa import install_exception_hook, proxy
-from hscommon.cocoa.inter import signature, PyFairware
+from cocoa.inter import PyFairware, FairwareView
-from hscommon.cocoa.objcmin import (NSNotificationCenter, NSSearchPathForDirectoriesInDomains,
+from hscommon.trans import trget
-    NSApplicationSupportDirectory, NSUserDomainMask, NSWorkspace)
-from hscommon.trans import tr
 
 from core.app import JobType
 
+tr = trget('ui')
+
 JOBID2TITLE = {
     JobType.Scan: tr("Scanning for duplicates"),
     JobType.Load: tr("Loading"),
@@ -18,132 +19,136 @@ JOBID2TITLE = {
     JobType.Delete: tr("Sending to Trash"),
 }
 
+class DupeGuruView(FairwareView):
+    def showExtraFairwareReminder(self): pass
+
 class PyDupeGuruBase(PyFairware):
+    FOLLOW_PROTOCOLS = ['Worker']
+    
+    @dontwrap
     def _init(self, modelclass):
         logging.basicConfig(level=logging.WARNING, format='%(levelname)s %(message)s')
         install_exception_hook()
-        appdata = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
+        appdata = proxy.getAppdataPath()
-        self.py = modelclass(self, appdata)
+        self.model = modelclass(self, appdata)
         self.progress = cocoa.ThreadedJobPerformer()
     
-    def bindCocoa_(self, cocoa):
+    #---Sub-proxies
-        self.cocoa = cocoa
+    def detailsPanel(self) -> pyref:
+        return self.model.details_panel
+    
+    def directoryTree(self) -> pyref:
+        return self.model.directory_tree
+    
+    def problemDialog(self) -> pyref:
+        return self.model.problem_dialog
+    
+    def statsLabel(self) -> pyref:
+        return self.model.stats_label
+    
+    def resultTable(self) -> pyref:
+        return self.model.result_table
     
     #---Directories
-    def addDirectory_(self, directory):
+    def addDirectory_(self, directory: str) -> int:
-        return self.py.add_directory(directory)
+        return self.model.add_directory(directory)
-    
-    def removeDirectory_(self, index):
-        self.py.remove_directory(index)
     
     #---Results
     def clearIgnoreList(self):
-        self.py.scanner.ignore_list.Clear()
+        self.model.scanner.ignore_list.Clear()
     
     def doScan(self):
-        self.py.start_scanning()
+        self.model.start_scanning()
     
-    def exportToXHTMLwithColumns_(self, column_ids):
+    def exportToXHTML(self) -> str:
-        return self.py.export_to_xhtml(column_ids)
+        return self.model.export_to_xhtml()
     
     def loadSession(self):
-        self.py.load()
+        self.model.load()
     
-    def loadResultsFrom_(self, filename):
+    def loadResultsFrom_(self, filename: str):
-        self.py.load_from(filename)
+        self.model.load_from(filename)
     
     def markAll(self):
-        self.py.mark_all()
+        self.model.mark_all()
     
     def markNone(self):
-        self.py.mark_none()
+        self.model.mark_none()
     
     def markInvert(self):
-        self.py.mark_invert()
+        self.model.mark_invert()
     
     def purgeIgnoreList(self):
-        self.py.purge_ignore_list()
+        self.model.purge_ignore_list()
     
     def toggleSelectedMark(self):
-        self.py.toggle_selected_mark_state()
+        self.model.toggle_selected_mark_state()
     
     def saveSession(self):
-        self.py.save()
+        self.model.save()
     
-    def saveResultsAs_(self, filename):
+    def saveResultsAs_(self, filename: str):
-        self.py.save_as(filename)
+        self.model.save_as(filename)
     
     #---Actions
     def addSelectedToIgnoreList(self):
-        self.py.add_selected_to_ignore_list()
+        self.model.add_selected_to_ignore_list()
     
     def deleteMarked(self):
-        self.py.delete_marked()
+        self.model.delete_marked()
     
     def hardlinkMarked(self):
-        self.py.delete_marked(replace_with_hardlinks=True)
+        self.model.delete_marked(replace_with_hardlinks=True)
     
-    def applyFilter_(self, filter):
+    def applyFilter_(self, filter: str):
-        self.py.apply_filter(filter)
+        self.model.apply_filter(filter)
     
     def makeSelectedReference(self):
-        self.py.make_selected_reference()
+        self.model.make_selected_reference()
     
-    def copyOrMove_markedTo_recreatePath_(self, copy, destination, recreate_path):
+    def copyOrMove_markedTo_recreatePath_(self, copy: bool, destination: str, recreate_path: bool):
-        self.py.copy_or_move_marked(copy, destination, recreate_path)
+        self.model.copy_or_move_marked(copy, destination, recreate_path)
     
     def openSelected(self):
-        self.py.open_selected()
+        self.model.open_selected()
     
     def removeMarked(self):
-        self.py.remove_marked()
+        self.model.remove_marked()
-    
-    def renameSelected_(self,newname):
-        return self.py.rename_selected(newname)
     
     def revealSelected(self):
-        self.py.reveal_selected()
+        self.model.reveal_selected()
     
-    def invokeCommand_(self, cmd):
+    def invokeCommand_(self, cmd: str):
-        self.py.invoke_command(cmd)
+        self.model.invoke_command(cmd)
     
     #---Information
-    def getIgnoreListCount(self):
+    def getIgnoreListCount(self) -> int:
-        return len(self.py.scanner.ignore_list)
+        return len(self.model.scanner.ignore_list)
     
-    def getMarkCount(self):
+    def getMarkCount(self) -> int:
-        return self.py.results.mark_count
+        return self.model.results.mark_count
     
-    @signature('i@:')
+    def scanWasProblematic(self) -> bool:
-    def scanWasProblematic(self):
+        return bool(self.model.results.problems)
-        return bool(self.py.results.problems)
     
-    @signature('i@:')
+    def resultsAreModified(self) -> bool:
-    def resultsAreModified(self):
+        return self.model.results.is_modified
-        return self.py.results.is_modified
-    
-    def deltaColumns(self):
-        return list(self.py.DELTA_COLUMNS)
     
     #---Properties
-    @signature('v@:c')
+    def setMixFileKind_(self, mix_file_kind: bool):
-    def setMixFileKind_(self, mix_file_kind):
+        self.model.scanner.mix_file_kind = mix_file_kind
-        self.py.scanner.mix_file_kind = mix_file_kind
     
-    @signature('v@:c')
+    def setEscapeFilterRegexp_(self, escape_filter_regexp: bool):
-    def setEscapeFilterRegexp_(self, escape_filter_regexp):
+        self.model.options['escape_filter_regexp'] = escape_filter_regexp
-        self.py.options['escape_filter_regexp'] = escape_filter_regexp
     
-    @signature('v@:c')
+    def setRemoveEmptyFolders_(self, remove_empty_folders: bool):
-    def setRemoveEmptyFolders_(self, remove_empty_folders):
+        self.model.options['clean_empty_dirs'] = remove_empty_folders
-        self.py.options['clean_empty_dirs'] = remove_empty_folders
     
-    @signature('v@:c')
+    def setIgnoreHardlinkMatches_(self, ignore_hardlink_matches: bool):
-    def setIgnoreHardlinkMatches_(self, ignore_hardlink_matches):
+        self.model.options['ignore_hardlink_matches'] = ignore_hardlink_matches
-        self.py.options['ignore_hardlink_matches'] = ignore_hardlink_matches
     
     #---Worker
-    def getJobProgress(self):
+    def getJobProgress(self) -> object: # NSNumber
         try:
             return self.progress.last_progress
         except AttributeError:
@@ -152,7 +157,7 @@ class PyDupeGuruBase(PyFairware):
             # is sent), but it happens anyway, so there we go. ref: #106
             return -1
     
-    def getJobDesc(self):
+    def getJobDesc(self) -> str:
         try:
             return self.progress.last_desc
         except AttributeError:
@@ -162,30 +167,31 @@ class PyDupeGuruBase(PyFairware):
     def cancelJob(self):
         self.progress.job_cancelled = True
     
-    def jobCompleted_(self, jobid):
+    def jobCompleted_(self, jobid: str):
-        self.py._job_completed(jobid)
+        self.model._job_completed(jobid)
     
     #--- model --> view
+    @dontwrap
     def open_path(self, path):
-        NSWorkspace.sharedWorkspace().openFile_(str(path))
+        proxy.openPath_(str(path))
     
+    @dontwrap
     def reveal_path(self, path):
-        NSWorkspace.sharedWorkspace().selectFile_inFileViewerRootedAtPath_(str(path), '')
+        proxy.revealPath_(str(path))
     
+    @dontwrap
     def start_job(self, jobid, func, args=()):
         try:
             j = self.progress.create_job()
             args = tuple([j] + list(args))
             self.progress.run_threaded(func, args=args)
         except job.JobInProgressError:
-            NSNotificationCenter.defaultCenter().postNotificationName_object_('JobInProgress', self)
+            proxy.postNotification_userInfo_('JobInProgress', None)
         else:
             ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid}
-            NSNotificationCenter.defaultCenter().postNotificationName_object_userInfo_('JobStarted', self, ud)
+            proxy.postNotification_userInfo_('JobStarted', ud)
     
+    @dontwrap
     def show_extra_fairware_reminder(self):
         self.cocoa.showExtraFairwareReminder()
     
-    def show_message(self, msg):
-        self.cocoa.showMessage_(msg)
-    

cocoa/inter/app_me.py

@@ -11,12 +11,13 @@ from appscript import app, k, CommandError
 import time
 import os.path as op
 
-from hscommon.cocoa import as_fetch
+from cocoa import as_fetch
 from hscommon.trans import tr
 
 from core.app import JobType
+from core.scanner import ScanType
 from core_me.app import DupeGuru as DupeGuruBase
-from .app import JOBID2TITLE
+from .app import JOBID2TITLE, PyDupeGuruBase
 
 JobType.RemoveDeadTracks = 'jobRemoveDeadTracks'
 JobType.ScanDeadTracks = 'jobScanDeadTracks'
@@ -67,3 +68,45 @@ class DupeGuruME(DupeGuruBase):
         
         self.view.start_job(JobType.ScanDeadTracks, do)
     
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuruME)
+    
+    def removeDeadTracks(self):
+        self.model.remove_dead_tracks()
+    
+    def scanDeadTracks(self):
+        self.model.scan_dead_tracks()
+    
+    #---Information
+    def deadTrackCount(self) -> int:
+        return len(self.model.dead_tracks)
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.min_match_percentage = percentage
+    
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.Filename,
+                ScanType.Fields,
+                ScanType.FieldsNoOrder,
+                ScanType.Tag,
+                ScanType.Contents,
+                ScanType.ContentsAudio,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self, words_are_weighted: bool):
+        self.model.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self, match_similar_words: bool):
+        self.model.scanner.match_similar_words = match_similar_words
+    
+    def enable_scanForTag_(self, enable: bool, scan_tag: str):
+        if enable:
+            self.model.scanner.scanned_tags.add(scan_tag)
+        else:
+            self.model.scanner.scanned_tags.discard(scan_tag)

cocoa/inter/app_pe.py

@@ -16,13 +16,15 @@ from appscript import app, its, CommandError, ApplicationNotFoundError
 from hscommon import io
 from hscommon.util import remove_invalid_xml
 from hscommon.path import Path
-from hscommon.cocoa.objcmin import NSUserDefaults, NSURL
+from hscommon.trans import tr
-from hscommon.trans import tr, trmsg
+from cocoa import proxy
 
+from core.scanner import ScanType
 from core import directories
 from core_pe import _block_osx
 from core_pe.photo import Photo as PhotoBase
 from core_pe.app import DupeGuru as DupeGuruBase
+from .app import PyDupeGuruBase
 
 IPHOTO_PATH = Path('iPhoto Library')
 
@@ -49,14 +51,11 @@ class IPhoto(Photo):
         return IPHOTO_PATH
     
 def get_iphoto_database_path():
-    ud = NSUserDefaults.standardUserDefaults()
+    plisturls = proxy.prefValue_inDomain_('iPhotoRecentDatabases', 'com.apple.iApps')
-    prefs = ud.persistentDomainForName_('com.apple.iApps')
+    if not plisturls:
-    if prefs is None:
         raise directories.InvalidPathError()
-    if 'iPhotoRecentDatabases' not in prefs:
+    plistpath = proxy.url2path_(plisturls[0])
-        raise directories.InvalidPathError()
+    return Path(plistpath)
-    plisturl = NSURL.URLWithString_(prefs['iPhotoRecentDatabases'][0])
-    return Path(plisturl.path())
 
 def get_iphoto_pictures(plistpath):
     if not io.exists(plistpath):
@@ -193,7 +192,36 @@ class DupeGuruPE(DupeGuruBase):
             try:
                 app('iPhoto')
             except ApplicationNotFoundError:
-                self.view.show_message(trmsg("IPhotoAppNotFoundMsg"))
+                self.view.show_message(tr("The iPhoto application couldn't be found."))
                 return
         DupeGuruBase.start_scanning(self)
     
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuruPE)
+    
+    def clearPictureCache(self):
+        self.model.scanner.clear_picture_cache()
+    
+    #---Information    
+    def getSelectedDupePath(self) -> str:
+        return str(self.model.selected_dupe_path())
+    
+    def getSelectedDupeRefPath(self) -> str:
+        return str(self.model.selected_dupe_ref_path())
+    
+    #---Properties
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.FuzzyBlock,
+                ScanType.ExifTimestamp,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setMatchScaled_(self, match_scaled: bool):
+        self.model.scanner.match_scaled = match_scaled
+    
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.threshold = percentage

cocoa/inter/app_se.py

@@ -11,18 +11,19 @@ import os.path as op
 
 from hscommon import io
 from hscommon.path import Path
-from hscommon.cocoa.objcmin import NSWorkspace
+from cocoa import proxy
 
+from core.scanner import ScanType
 from core import fs
 from core.directories import Directories as DirectoriesBase, DirectoryState
 from core_se.app import DupeGuru as DupeGuruBase
+from .app import PyDupeGuruBase
 
 def is_bundle(str_path):
-    sw = NSWorkspace.sharedWorkspace()
+    uti = proxy.getUTI_(str_path)
-    uti, error = sw.typeOfFile_error_(str_path, None)
+    if uti is None:
-    if error is not None:
         logging.warning('There was an error trying to detect the UTI of %s', str_path)
-    return sw.type_conformsToType_(uti, 'com.apple.bundle') or sw.type_conformsToType_(uti, 'com.apple.package')
+    return proxy.type_conformsToType_(uti, 'com.apple.bundle') or proxy.type_conformsToType_(uti, 'com.apple.package')
 
 class Bundle(fs.Folder):
     @classmethod
@@ -71,3 +72,31 @@ class DupeGuru(DupeGuruBase):
         DupeGuruBase.__init__(self, view, appdata)
         self.directories = Directories()
     
+
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuru)
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.Filename,
+                ScanType.Contents,
+                ScanType.Folders,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self, words_are_weighted: bool):
+        self.model.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self, match_similar_words: bool):
+        self.model.scanner.match_similar_words = match_similar_words
+    
+    def setSizeThreshold_(self, size_threshold: int):
+        self.model.scanner.size_threshold = size_threshold
+    

cocoa/inter/details_panel.py

@@ -1,13 +1,11 @@
-from hscommon.cocoa.inter import signature, PyGUIObject
+from cocoa.inter import PyGUIObject, GUIObjectView
 
-from core.gui.details_panel import DetailsPanel
+class DetailsPanelView(GUIObjectView):
+    pass
 
 class PyDetailsPanel(PyGUIObject):
-    py_class = DetailsPanel
+    def numberOfRows(self) -> int:
-    @signature('i@:')
+        return self.model.row_count()
-    def numberOfRows(self):
-        return self.py.row_count()
     
-    @signature('@@:@i')
+    def valueForColumn_row_(self, column: str, row: int) -> object:
-    def valueForColumn_row_(self, column, row):
+        return self.model.row(row)[int(column)]
-        return self.py.row(row)[int(column)]

cocoa/inter/directory_outline.py

@@ -1,14 +1,18 @@
-from hscommon.cocoa.inter import PyOutline
+from objp.util import dontwrap
+from cocoa.inter import PyOutline, GUIObjectView
 
-from core.gui.directory_tree import DirectoryTree
+class DirectoryOutlineView(GUIObjectView):
+    pass
 
 class PyDirectoryOutline(PyOutline):
-    py_class = DirectoryTree
+    def addDirectory_(self, path: str):
+        self.model.add_directory(path)
     
-    def addDirectory_(self, path):
+    def removeSelectedDirectory(self):
-        self.py.add_directory(path)
+        self.model.remove_selected()
     
     # python --> cocoa
+    @dontwrap
     def refresh_states(self):
         # Under cocoa, both refresh() and refresh_states() do the same thing.
-        self.cocoa.refresh()
+        self.callback.refresh()

cocoa/inter/extra_fairware_reminder.py

@@ -1,25 +1,37 @@
-from hscommon.cocoa.inter import PyGUIObject
+from objp.util import pyref, dontwrap
-
+from cocoa.inter import PyGUIObject
 from core.gui.extra_fairware_reminder import ExtraFairwareReminder
 
+class ExtraFairwareReminderView:
+    def startTimer(self): pass
+    def stopTimer(self): pass
+    def setButtonText_(self, text: str): pass;
+    def enableButton(self): pass
+
 class PyExtraFairwareReminder(PyGUIObject):
-    py_class = ExtraFairwareReminder
+    def __init__(self, app: pyref):
+        model = ExtraFairwareReminder(app.model)
+        PyGUIObject.__init__(self, model)
     
     def start(self):
-        self.py.start()
+        self.model.start()
     
     def updateButton(self):
-        self.py.update_button()
+        self.model.update_button()
     
     # model --> view
+    @dontwrap
     def start_timer(self):
-        self.cocoa.startTimer()
+        self.callback.startTimer()
     
+    @dontwrap
     def stop_timer(self):
-        self.cocoa.stopTimer()
+        self.callback.stopTimer()
     
+    @dontwrap
     def enable_button(self):
-        self.cocoa.enableButton()
+        self.callback.enableButton()
     
+    @dontwrap
     def set_button_text(self, text):
-        self.cocoa.setButtonText_(text)
+        self.callback.setButtonText_(text)

cocoa/inter/prioritize_dialog.py

@@ -1,31 +1,29 @@
-from hscommon.cocoa.inter import PyGUIObject, PySelectableList
+from objp.util import pyref
-
+from cocoa.inter import PyGUIObject, GUIObjectView
 from core.gui.prioritize_dialog import PrioritizeDialog
-from .prioritize_list import PyPrioritizeList
+
+class PrioritizeDialogView(GUIObjectView):
+    pass
 
 class PyPrioritizeDialog(PyGUIObject):
-    py_class = PrioritizeDialog
+    def __init__(self, app: pyref):
+        model = PrioritizeDialog(app.model)
+        PyGUIObject.__init__(self, model)
     
-    def categoryList(self):
+    def categoryList(self) -> pyref:
-        if not hasattr(self, '_categoryList'):
+        return self.model.category_list
-            self._categoryList = PySelectableList.alloc().initWithPy_(self.py.category_list)
-        return self._categoryList
     
-    def criteriaList(self):
+    def criteriaList(self) -> pyref:
-        if not hasattr(self, '_criteriaList'):
+        return self.model.criteria_list
-            self._criteriaList = PySelectableList.alloc().initWithPy_(self.py.criteria_list)
-        return self._criteriaList
     
-    def prioritizationList(self):
+    def prioritizationList(self) -> pyref:
-        if not hasattr(self, '_prioritizationList'):
+        return self.model.prioritization_list
-            self._prioritizationList = PyPrioritizeList.alloc().initWithPy_(self.py.prioritization_list)
-        return self._prioritizationList
     
     def addSelected(self):
-        self.py.add_selected()
+        self.model.add_selected()
     
     def removeSelected(self):
-        self.py.remove_selected()
+        self.model.remove_selected()
     
     def performReprioritization(self):
-        self.py.perform_reprioritization()
+        self.model.perform_reprioritization()

cocoa/inter/prioritize_list.py

@@ -1,7 +1,8 @@
-from hscommon.cocoa.inter import signature, PySelectableList
+from cocoa.inter import PySelectableList, SelectableListView
+
+class PrioritizeListView(SelectableListView):
+    pass
 
 class PyPrioritizeList(PySelectableList):
-    @signature('v@:@i')
+    def moveIndexes_toIndex_(self, indexes: list, dest_index: int):
-    def moveIndexes_toIndex_(self, indexes, dest_index):
+        self.model.move_indexes(indexes, dest_index)
-        self.py.move_indexes(indexes, dest_index)
-    

cocoa/inter/problem_dialog.py

@@ -1,10 +1,9 @@
-from hscommon.cocoa.inter import PyGUIObject
+from objp.util import pyref
-
+from cocoa.inter import PyGUIObject
-from core.gui.problem_dialog import ProblemDialog
 
 class PyProblemDialog(PyGUIObject):
-    py_class = ProblemDialog
+    def problemTable(self) -> pyref:
+        return self.model.problem_table
     
     def revealSelected(self):
-        self.py.reveal_selected_dupe()
+        self.model.reveal_selected_dupe()
-    

cocoa/inter/problem_table.py

@@ -1,6 +0,0 @@
-from hscommon.cocoa.inter import PyTable
-
-from core.gui.problem_table import ProblemTable
-
-class PyProblemTable(PyTable):
-    py_class = ProblemTable

cocoa/inter/result_table.py

@@ -1,54 +1,49 @@
-from hscommon.cocoa.inter import signature, PyTable
+from objp.util import dontwrap
+from cocoa.inter import PyTable, TableView
 
-from core.gui.result_table import ResultTable
+class ResultTableView(TableView):
+    def invalidateMarkings(self): pass
 
 class PyResultTable(PyTable):
-    py_class = ResultTable
+    def powerMarkerMode(self) -> bool:
+        return self.model.power_marker
     
-    @signature('c@:')
+    def setPowerMarkerMode_(self, value: bool):
-    def powerMarkerMode(self):
+        self.model.power_marker = value
-        return self.py.power_marker
     
-    @signature('v@:c')
+    def deltaValuesMode(self) -> bool:
-    def setPowerMarkerMode_(self, value):
+        return self.model.delta_values
-        self.py.power_marker = value
     
-    @signature('c@:')
+    def setDeltaValuesMode_(self, value: bool):
-    def deltaValuesMode(self):
+        self.model.delta_values = value
-        return self.py.delta_values
     
-    @signature('v@:c')
+    def deltaColumns(self) -> list:
-    def setDeltaValuesMode_(self, value):
+        return list(self.model.DELTA_COLUMNS)
-        self.py.delta_values = value
     
-    @signature('@@:ii')
+    def valueForRow_column_(self, row_index: int, column: str) -> object:
-    def valueForRow_column_(self, row_index, column):
+        return self.model.get_row_value(row_index, column)
-        return self.py.get_row_value(row_index, column)
     
-    @signature('c@:@')
+    def renameSelected_(self, newname: str) -> bool:
-    def renameSelected_(self, newname):
+        return self.model.rename_selected(newname)
-        return self.py.rename_selected(newname)
     
-    @signature('v@:ic')
+    def sortBy_ascending_(self, key: str, asc: bool):
-    def sortBy_ascending_(self, key, asc):
+        self.model.sort(key, asc)
-        self.py.sort(key, asc)
     
     def markSelected(self):
-        self.py.app.toggle_selected_mark_state()
+        self.model.app.toggle_selected_mark_state()
     
     def removeSelected(self):
-        self.py.app.remove_selected()
+        self.model.app.remove_selected()
     
-    @signature('i@:')
+    def selectedDupeCount(self) -> int:
-    def selectedDupeCount(self):
+        return self.model.selected_dupe_count
-        return self.py.selected_dupe_count
     
-    @signature('@@:i')
+    def pathAtIndex_(self, index: int) -> str:
-    def pathAtIndex_(self, index):
+        row = self.model[index]
-        row = self.py[index]
         return str(row._dupe.path)
     
     # python --> cocoa
+    @dontwrap
     def invalidate_markings(self):
-        self.cocoa.invalidateMarkings()
+        self.callback.invalidateMarkings()