Updated hscommon.

Removed some code duplication.
Added loc entry for "Chinese (Simplified)".
2026-01-25 08:01:39 +00:00 · 2011-09-03 13:49:06 -04:00 · 2011-09-03 13:28:36 -04:00 · 2011-09-03 10:30:31 -04:00 · 2011-09-03 10:25:17 -04:00 · 2011-09-03 10:19:17 -04:00
33 changed files with 6437 additions and 31 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -23,5 +23,7 @@ cocoa/*/de.lproj/*.xib
 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
--- a/.hgtags
+++ b/.hgtags
@@ -50,3 +50,7 @@ d274bcb98f2d02b86470a04cd62e718eff33b74f pe2.1.0
 97893f37d7d0767b5aedf1b4b40de57ee36d426b se3.1.0
 e44d5127ed605daa7a17a01eee65d0a157de20c0 pe2.2.0
 ecf9aaa568340e3d03e8854b7556edd5a3285107 pe2.2.1
+db1f325c907ffa9808a49cb7bc2886b9fca7aee2 se3.1.1
+e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
+28ba95706dc54ba32b1c0cf4e1e6350515d19ba3 me6.0.2
+925847384dcef62a5c3518fc9e5ce42feab2b093 pe2.2.2
--- a/cocoa/base/de.lproj/ResultWindow.xib
+++ b/cocoa/base/de.lproj/ResultWindow.xib
--- a/cocoa/base/fr.lproj/ResultWindow.xib
+++ b/cocoa/base/fr.lproj/ResultWindow.xib
--- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
@@ -39,6 +39,8 @@
 		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
 		CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */; };
 		CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */; };
+		CE0EA0F214083EC800762F74 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0EA0EE14083EC800762F74 /* about.xib */; };
+		CE0EA0F314083EC800762F74 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0EA0F014083EC800762F74 /* ErrorReportWindow.xib */; };
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */; };
@@ -47,9 +49,7 @@
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
 		CE45274F12E5F62D00005A15 /* core.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE45274D12E5F62D00005A15 /* core.strings */; };
 		CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */; };
-		CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */; };
 		CE4B59C91119919700C06C9E /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C61119919700C06C9E /* progress.xib */; };
-		CE4F934612CCA9470067A3AE /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4F934512CCA9470067A3AE /* about.xib */; };
 		CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4F934812CCA96C0067A3AE /* HSAboutBox.m */; };
 		CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE10FC6C12E00EC695D /* Dialogs.m */; };
 		CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */; };
@@ -137,6 +137,13 @@
 		CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
 		CE0A0C031175A1DE00DCA3C6 /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
 		CE0A0C131175A28100DCA3C6 /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE0EA0EF14083EC800762F74 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F114083EC800762F74 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F414083ED700762F74 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F514083ED700762F74 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F614083EED00762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F714083EED00762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA0F814083EED00762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
 		CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
@@ -149,9 +156,7 @@
 		CE45275012E5F63900005A15 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/core.strings; sourceTree = SOURCE_ROOT; };
 		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE4B59C61119919700C06C9E /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
-		CE4F934512CCA9470067A3AE /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
 		CE4F934712CCA96C0067A3AE /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
 		CE4F934812CCA96C0067A3AE /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
@@ -185,6 +190,8 @@
 		CE74A12312537F06008A8DF0 /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
 		CE74A12612537F2E008A8DF0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		CE8D43AE1406AD9B00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE8D43AF1406AD9B00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		CEB14D26124DFC2800FA7481 /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; };
 		CEB14D27124DFC2800FA7481 /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
 		CEB14D28124DFC2800FA7481 /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
@@ -373,9 +380,9 @@
 		CE4B59C41119919700C06C9E /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CE4F934512CCA9470067A3AE /* about.xib */,
+				CE0EA0EE14083EC800762F74 /* about.xib */,
+				CE0EA0F014083EC800762F74 /* ErrorReportWindow.xib */,
 				CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */,
-				CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */,
 				CE4B59C61119919700C06C9E /* progress.xib */,
 			);
 			name = xib;
@@ -485,7 +492,6 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -515,10 +521,8 @@
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */,
-				CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */,
 				CE4B59C91119919700C06C9E /* progress.xib in Resources */,
 				CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */,
-				CE4F934612CCA9470067A3AE /* about.xib in Resources */,
 				CE05331712E5D3ED0029EF25 /* DetailsPanel.xib in Resources */,
 				CE05331812E5D3ED0029EF25 /* DirectoryPanel.xib in Resources */,
 				CE05331912E5D3ED0029EF25 /* MainMenu.xib in Resources */,
@@ -528,6 +532,8 @@
 				CE05332F12E5D6100029EF25 /* Localizable.strings in Resources */,
 				CE45274F12E5F62D00005A15 /* core.strings in Resources */,
 				CEB5E07D13225CA2009F521D /* ExtraFairwareReminder.xib in Resources */,
+				CE0EA0F214083EC800762F74 /* about.xib in Resources */,
+				CE0EA0F314083EC800762F74 /* ErrorReportWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -640,15 +646,39 @@
 			children = (
 				CE05332E12E5D6100029EF25 /* en */,
 				CE05333312E5D6370029EF25 /* fr */,
+				CE8D43AF1406AD9B00AAF8CF /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		CE0EA0EE14083EC800762F74 /* about.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0EA0EF14083EC800762F74 /* en */,
+				CE0EA0F414083ED700762F74 /* fr */,
+				CE0EA0F614083EED00762F74 /* de */,
+			);
+			name = about.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE0EA0F014083EC800762F74 /* ErrorReportWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0EA0F114083EC800762F74 /* en */,
+				CE0EA0F514083ED700762F74 /* fr */,
+				CE0EA0F714083EED00762F74 /* de */,
+			);
+			name = ErrorReportWindow.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
 		CE45274D12E5F62D00005A15 /* core.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
 				CE45274E12E5F62D00005A15 /* en */,
 				CE45275012E5F63900005A15 /* fr */,
+				CE8D43AE1406AD9B00AAF8CF /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
@@ -658,6 +688,7 @@
 			children = (
 				CE74A12612537F2E008A8DF0 /* en */,
 				CE05347712E5DC420029EF25 /* fr */,
+				CE0EA0F814083EED00762F74 /* de */,
 			);
 			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
--- a/cocoa/me/dupeguru_xcode4.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru_xcode4.xcodeproj/project.pbxproj
@@ -42,6 +42,8 @@
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */; };
+		CE2B2B5B1406ABDA0038D15A /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
+		CE2B2B5C1406ABDA0038D15A /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
@@ -145,6 +147,8 @@
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
 		CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
+		CE2B2B591406ABDA0038D15A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = "<group>"; };
+		CE2B2B5A1406ABDA0038D15A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
@@ -546,6 +550,8 @@
 				CEF3186213D8661300B8CDCA /* about.xib in Resources */,
 				CEF3186313D8661300B8CDCA /* ErrorReportWindow.xib in Resources */,
 				CEF3186413D8661300B8CDCA /* FairwareReminder.xib in Resources */,
+				CE2B2B5B1406ABDA0038D15A /* help in Resources */,
+				CE2B2B5C1406ABDA0038D15A /* dg_cocoa.plugin in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -658,6 +664,7 @@
 			children = (
 				CE05332E12E5D6100029EF25 /* en */,
 				CE05333312E5D6370029EF25 /* fr */,
+				CE2B2B5A1406ABDA0038D15A /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -667,6 +674,7 @@
 			children = (
 				CE45274E12E5F62D00005A15 /* en */,
 				CE45275012E5F63900005A15 /* fr */,
+				CE2B2B591406ABDA0038D15A /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
--- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
@@ -19,6 +19,8 @@
 		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
 		CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; };
 		CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; };
+		CE0EA10A14083F3000762F74 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0EA10614083F3000762F74 /* about.xib */; };
+		CE0EA10B14083F3000762F74 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0EA10814083F3000762F74 /* ErrorReportWindow.xib */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */; };
@@ -33,7 +35,6 @@
 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
-		CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */; };
 		CE7AC9191119911200D02F6C /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9161119911200D02F6C /* progress.xib */; };
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; };
@@ -56,7 +57,6 @@
 		CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */; };
 		CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
-		CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEC9DB4612CCAA6B003102F0 /* about.xib */; };
 		CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
@@ -111,6 +111,13 @@
 		CE0C2ABA1177014200BC749F /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
 		CE0C2ABB1177014200BC749F /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
 		CE0C2ABC1177014200BC749F /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0EA10714083F3000762F74 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA10914083F3000762F74 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA10C14083F3C00762F74 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA10D14083F3C00762F74 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../../cocoalib/fr.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA10E14083F4800762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/about.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA10F14083F4800762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
+		CE0EA11014083F4900762F74 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
@@ -142,7 +149,6 @@
 		CE7875A113CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
 		CE7875A513CDFAB900F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/DetailsPanel.xib; sourceTree = "<group>"; };
 		CE7875A613CDFAB900F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = "<group>"; };
-		CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE7AC9161119911200D02F6C /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
 		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
 		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
@@ -168,6 +174,8 @@
 		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		CE8D43CB1406ADBA00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE8D43CC1406ADBA00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		CE958659112C516400F95FD2 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE95865C112C516400F95FD2 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE95865D112C516400F95FD2 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
@@ -192,7 +200,6 @@
 		CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CEC9DB4612CCAA6B003102F0 /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
 		CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
 		CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
@@ -321,9 +328,9 @@
 		CE7AC9141119911200D02F6C /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CEC9DB4612CCAA6B003102F0 /* about.xib */,
+				CE0EA10614083F3000762F74 /* about.xib */,
+				CE0EA10814083F3000762F74 /* ErrorReportWindow.xib */,
 				CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */,
-				CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */,
 				CE7AC9161119911200D02F6C /* progress.xib */,
 			);
 			name = xib;
@@ -489,7 +496,6 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -519,10 +525,8 @@
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */,
-				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
 				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
 				CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */,
-				CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */,
 				CE05339B12E5DA350029EF25 /* DirectoryPanel.xib in Resources */,
 				CE05339C12E5DA350029EF25 /* MainMenu.xib in Resources */,
 				CE05339D12E5DA350029EF25 /* ProblemDialog.xib in Resources */,
@@ -532,6 +536,8 @@
 				CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */,
 				CE4527AC12E5F6E700005A15 /* core.strings in Resources */,
 				CE2A29F713213BFB005899AC /* ExtraFairwareReminder.xib in Resources */,
+				CE0EA10A14083F3000762F74 /* about.xib in Resources */,
+				CE0EA10B14083F3000762F74 /* ErrorReportWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -647,15 +653,39 @@
 			children = (
 				CE0533AA12E5DA6A0029EF25 /* en */,
 				CE0533AC12E5DA790029EF25 /* fr */,
+				CE8D43CC1406ADBA00AAF8CF /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = SOURCE_ROOT;
 		};
+		CE0EA10614083F3000762F74 /* about.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0EA10714083F3000762F74 /* en */,
+				CE0EA10C14083F3C00762F74 /* fr */,
+				CE0EA10E14083F4800762F74 /* de */,
+			);
+			name = about.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE0EA10814083F3000762F74 /* ErrorReportWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE0EA10914083F3000762F74 /* en */,
+				CE0EA10D14083F3C00762F74 /* fr */,
+				CE0EA10F14083F4800762F74 /* de */,
+			);
+			name = ErrorReportWindow.xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
 		CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				CE1EB60012537FB90034AABB /* en */,
 				CE0533B712E5DC040029EF25 /* fr */,
+				CE0EA11014083F4900762F74 /* de */,
 			);
 			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
@@ -676,6 +706,7 @@
 			children = (
 				CE4527AB12E5F6E700005A15 /* en */,
 				CE4527B012E5F72600005A15 /* fr */,
+				CE8D43CB1406ADBA00AAF8CF /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
--- a/cocoa/pe/dupeguru_xcode4.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru_xcode4.xcodeproj/project.pbxproj
@@ -33,6 +33,8 @@
 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
+		CE7358081406ABF700F3F6DA /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
+		CE7358091406ABF700F3F6DA /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
 		CE7AC9191119911200D02F6C /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9161119911200D02F6C /* progress.xib */; };
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; };
@@ -140,6 +142,8 @@
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
 		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
+		CE7358061406ABF700F3F6DA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = "<group>"; };
+		CE7358071406ABF700F3F6DA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CE78759D13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; };
 		CE78759E13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE78759F13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
@@ -550,6 +554,8 @@
 				CECB2ACE13D867C00081E295 /* about.xib in Resources */,
 				CECB2ACF13D867C00081E295 /* ErrorReportWindow.xib in Resources */,
 				CECB2AD013D867C00081E295 /* FairwareReminder.xib in Resources */,
+				CE7358081406ABF700F3F6DA /* help in Resources */,
+				CE7358091406ABF700F3F6DA /* dg_cocoa.plugin in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -665,6 +671,7 @@
 			children = (
 				CE0533AA12E5DA6A0029EF25 /* en */,
 				CE0533AC12E5DA790029EF25 /* fr */,
+				CE7358071406ABF700F3F6DA /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = SOURCE_ROOT;
@@ -695,6 +702,7 @@
 			children = (
 				CE4527AB12E5F6E700005A15 /* en */,
 				CE4527B012E5F72600005A15 /* fr */,
+				CE7358061406ABF700F3F6DA /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
--- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj
@@ -100,6 +100,7 @@
 		CE4526F112E5F55F00005A15 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/core.strings; sourceTree = SOURCE_ROOT; };
 		CE4526F312E5F57000005A15 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/core.strings; sourceTree = SOURCE_ROOT; };
 		CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE50A2CB1409769700AD9080 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../../cocoalib/de.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE647E541173024A006D28BA /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
 		CE647E551173024A006D28BA /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
 		CE647E561173024A006D28BA /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
@@ -152,6 +153,8 @@
 		CE8113EC12E5CEA800A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		CE8C53B61173248F0011B41F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
 		CE8C53BB117324CE0011B41F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE8D43931406AD7D00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = SOURCE_ROOT; };
+		CE8D43941406AD7D00AAF8CF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		CE91F210113BC22D0010360B /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE91F213113BC22D0010360B /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE91F214113BC22D0010360B /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
@@ -583,6 +586,7 @@
 			children = (
 				CE4526F112E5F55F00005A15 /* en */,
 				CE4526F312E5F57000005A15 /* fr */,
+				CE8D43931406AD7D00AAF8CF /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
@@ -602,6 +606,7 @@
 			children = (
 				CE79638512536C94008D405B /* en */,
 				CE05341312E5DC260029EF25 /* fr */,
+				CE50A2CB1409769700AD9080 /* de */,
 			);
 			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
@@ -672,6 +677,7 @@
 			children = (
 				CE8113EA12E5CE9A00A36C80 /* en */,
 				CE8113EC12E5CEA800A36C80 /* fr */,
+				CE8D43941406AD7D00AAF8CF /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = SOURCE_ROOT;
--- a/cocoa/se/dupeguru_xcode4.xcodeproj/project.pbxproj
+++ b/cocoa/se/dupeguru_xcode4.xcodeproj/project.pbxproj
@@ -50,6 +50,8 @@
 		CE8C53BC117324CE0011B41F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C53BB117324CE0011B41F /* HSTable.m */; };
 		CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; };
 		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; };
+		CED939561406ABB70072C4E8 /* core.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE4526F012E5F55F00005A15 /* core.strings */; };
+		CED939571406ABB70072C4E8 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
@@ -170,6 +172,8 @@
 		CECFFF2013CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CECFFF2113CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; };
 		CECFFF2413CDF8E5003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = "<group>"; };
+		CED939541406ABB70072C4E8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/core.strings; sourceTree = "<group>"; };
+		CED939551406ABB70072C4E8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
 		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
@@ -523,6 +527,8 @@
 				CE3181A613D85DB700B6D649 /* about.xib in Resources */,
 				CE3181A713D85DB700B6D649 /* ErrorReportWindow.xib in Resources */,
 				CE3181A813D85DB700B6D649 /* FairwareReminder.xib in Resources */,
+				CED939561406ABB70072C4E8 /* core.strings in Resources */,
+				CED939571406ABB70072C4E8 /* dsa_pub.pem in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -594,6 +600,7 @@
 			children = (
 				CE4526F112E5F55F00005A15 /* en */,
 				CE4526F312E5F57000005A15 /* fr */,
+				CED939541406ABB70072C4E8 /* de */,
 			);
 			name = core.strings;
 			sourceTree = SOURCE_ROOT;
@@ -684,6 +691,7 @@
 			children = (
 				CE8113EA12E5CE9A00A36C80 /* en */,
 				CE8113EC12E5CEA800A36C80 /* fr */,
+				CED939551406ABB70072C4E8 /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = SOURCE_ROOT;
--- a/core_me/init.py
+++ b/core_me/init.py
@@ -1,2 +1,2 @@
-__version__ = '6.0.1'
+__version__ = '6.0.2'
 __appname__ = 'dupeGuru Music Edition'
--- a/core_pe/init.py
+++ b/core_pe/init.py
@@ -1,2 +1,2 @@
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 __appname__ = 'dupeGuru Picture Edition'
--- a/core_pe/app_cocoa.py
+++ b/core_pe/app_cocoa.py
@@ -89,7 +89,7 @@ class Directories(directories.Directories):
        except directories.InvalidPathError:
            self.iphoto_libpath = None
    
-    def _get_files(self, from_path):
+    def _get_files(self, from_path, j):
        if from_path == IPHOTO_PATH:
            if self.iphoto_libpath is None:
                return []
@@ -99,7 +99,7 @@ class Directories(directories.Directories):
                photo.is_ref = is_ref
            return photos
        else:
-            return directories.Directories._get_files(self, from_path)
+            return directories.Directories._get_files(self, from_path, j)
    
    @staticmethod
    def get_subfolders(path):
--- a/core_se/init.py
+++ b/core_se/init.py
@@ -1,2 +1,2 @@
-__version__ = '3.1.1'
+__version__ = '3.1.2'
 __appname__ = 'dupeGuru'
--- a/core_se/app_cocoa.py
+++ b/core_se/app_cocoa.py
@@ -45,7 +45,7 @@ class Directories(DirectoriesBase):
        if path[:2] == Path('/Users') and path[3:] in self.HOME_PATH_TO_EXCLUDE:
            return DirectoryState.Excluded
    
-    def _get_folders(self, from_folder):
+    def _get_folders(self, from_folder, j):
        # We don't want to scan bundle's subfolder even in Folders mode. Bundle's integrity has to
        # stay intact.
        if is_bundle(str(from_folder.path)):
@@ -56,7 +56,7 @@ class Directories(DirectoriesBase):
                yield from_folder
            return
        else:
-            for folder in DirectoriesBase._get_folders(self, from_folder):
+            for folder in DirectoriesBase._get_folders(self, from_folder, j):
                yield folder
    
    @staticmethod
--- a/debian_me/control
+++ b/debian_me/control
@@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net

 Package: dupeguru-me
 Architecture: any
-Depends: python3.1
+Depends: python3.1, libqtgui4
 Description: dupeGuru Music Edition
--- a/debian_pe/control
+++ b/debian_pe/control
@@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net

 Package: dupeguru-pe
 Architecture: any
-Depends: python3.1
+Depends: python3.1, libqtgui4
 Description: dupeGuru Picture Edition
--- a/debian_se/control
+++ b/debian_se/control
@@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net

 Package: dupeguru-se
 Architecture: any
-Depends: python3.1
+Depends: python3.1, libqtgui4
 Description: dupeGuru
--- a/help/changelog_me
+++ b/help/changelog_me
@@ -1,3 +1,13 @@
+=== 6.0.2 (2011-08-26)
+
+* Added German localization by Gregor Tätzner.
+* Improved OS X Lion compatibility. [Mac OS X]
+* Made the file collection phase cancellable. (#168)
+* Fixed glitch in folder window upon selecting a folder state. [Windows, Linux] (#165)
+* Fixed a text coloring glitch in the results. (#156)
+* Fixed glitch in the sorting feature of the Folder column. (#161)
+* Make sure that saved results have the ".dupeguru" extension. [Linux] (#157)
+
 === 6.0.1 (2011-03-18)

 * Fixed crash after removing marked dupes. (#140)
--- a/help/changelog_pe
+++ b/help/changelog_pe
@@ -1,3 +1,10 @@
+=== 2.2.2 (2011-08-27)
+
+* Added German localization by Gregor Tätzner.
+* Improved OS X Lion compatibility. [Mac OS X]
+* Made the file collection phase cancellable. (#168)
+* Fixed glitch in folder window upon selecting a folder state. [Windows, Linux] (#165)
+
 === 2.2.1 (2011-06-15)

 * Brought back the filter hardness label which disappeared in 2.2.0. [Mac OS X] (#164)
--- a/help/changelog_se
+++ b/help/changelog_se
@@ -1,3 +1,7 @@
+=== 3.1.2 (2011-08-25)
+
+* Fixed a bug preventing the Folders scan from working. (#172)
+
 === 3.1.1 (2011-08-24)

 * Added German localization by Gregor Tätzner.
--- a/help/de/credits.rst
+++ b/help/de/credits.rst
@@ -10,6 +10,8 @@ Unten befindet sich die Liste aller Menschen, die direkt oder indirekt zu dupeGu

 | **Gregor Tätzner, deutsche Übersetzung**

+| **Eric Dee, chinesische Übersetzung**
+
 | **Python, Programming language** (`Website <http://www.python.org>`__)
 | The bestest of the bests

--- a/help/en/credits.rst
+++ b/help/en/credits.rst
@@ -10,6 +10,8 @@ Below is the list of people who contributed, directly or indirectly to dupeGuru.

 | **Gregor Tätzner, German localization**

+| **Eric Dee, Chinese localization**
+
 | **Python, Programming language** (`Website <http://www.python.org>`__)
 | The bestest of the bests

--- a/help/fr/credits.rst
+++ b/help/fr/credits.rst
@@ -9,6 +9,8 @@ Voici la liste des contributeurs de dupeGuru. Merci!

 | **Gregor Tätzner, localisation allemande**

+| **Eric Dee, localisation choinoise**
+
 | **Python, Langage de programmation** (`Website <http://www.python.org>`__)
 | Le meilleur des meilleurs

--- a/qt/base/app.py
+++ b/qt/base/app.py
@@ -83,7 +83,7 @@ class DupeGuru(DupeGuruBase, QObject):
        
        self.reg = Registration(self)
        self.set_registration(self.prefs.registration_code, self.prefs.registration_email)
-        if not self.registered and self.unpaid_hours >= 1:
+        if self.should_show_fairware_reminder:
            # The timer scheme is because if the nag is not shown before the application is 
            # completely initialized, the nag will be shown before the app shows up in the task bar
            # In some circumstances, the nag is hidden by other window, which may make the user think
--- a/qt/base/dg.qrc
+++ b/qt/base/dg.qrc
@@ -5,6 +5,8 @@
    <file alias="qt_fr.qm">../lang/qt_fr.qm</file>
    <file alias="de.qm">../lang/de.qm</file>
    <file alias="qt_de.qm">../lang/qt_de.qm</file>
+    <file alias="zh.qm">../lang/zh.qm</file>
+    <file alias="qt_zh.qm">../lang/qt_zh.qm</file>
    <file alias="logo_pe">../../images/dgpe_logo_32.png</file>
    <file alias="logo_pe_big">../../images/dgpe_logo_128.png</file>
    <file alias="logo_me">../../images/dgme_logo_32.png</file>
--- a/qt/base/preferences_dialog.py
+++ b/qt/base/preferences_dialog.py
@@ -85,6 +85,7 @@ class PreferencesDialogBase(QDialog):
        self.languageComboBox.addItem(tr("English"))
        self.languageComboBox.addItem(tr("French"))
        self.languageComboBox.addItem(tr("German"))
+        self.languageComboBox.addItem(tr("Chinese (Simplified)"))
        self.widgetsVLayout.addWidget(self.languageComboBox)
        self.copyMoveLabel = QLabel(self)
        self.copyMoveLabel.setText(tr("Copy and Move:"))
@@ -151,6 +152,7 @@ class PreferencesDialogBase(QDialog):
        langindex = {
            'fr': 1,
            'de': 2,
+            'zh': 3
        }.get(self.app.prefs.language, 0)
        self.languageComboBox.setCurrentIndex(langindex)
        self._load(prefs, setchecked)
@@ -166,7 +168,7 @@ class PreferencesDialogBase(QDialog):
        prefs.debug_mode = ischecked(self.debugModeBox)
        prefs.destination_type = self.copyMoveDestinationComboBox.currentIndex()
        prefs.custom_command = str(self.customCommandEdit.text())
-        langs = ['en', 'fr', 'de']
+        langs = ['en', 'fr', 'de', 'zh']
        lang = langs[self.languageComboBox.currentIndex()]
        oldlang = self.app.prefs.language
        if oldlang not in langs:
--- a/qt/lang/de.qm
+++ b/qt/lang/de.qm
--- a/qt/lang/de.ts
+++ b/qt/lang/de.ts
@@ -557,6 +557,10 @@
    <source>German</source>
    <translation>Deutsch</translation>
 </message>
+<message>
+    <source>Chinese (Simplified)</source>
+    <translation type="unfinished"></translation>
+</message>
 <message>
    <source>Debug mode (restart required)</source>
    <translation>Debug Modus (Neustart nötig)</translation>
--- a/qt/lang/fr.ts
+++ b/qt/lang/fr.ts
@@ -557,6 +557,10 @@
    <source>German</source>
    <translation>Allemand</translation>
 </message>
+<message>
+    <source>Chinese (Simplified)</source>
+    <translation>Chinois (Simplifié)</translation>
+</message>
 <message>
    <source>Debug mode (restart required)</source>
    <translation>Mode de déboguage (redémarrage requis)</translation>
--- a/qt/lang/qt_zh.qm
+++ b/qt/lang/qt_zh.qm
--- a/qt/lang/zh.ts
+++ b/qt/lang/zh.ts
@@ -0,0 +1,785 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
+<!-- ******** Core ******** -->
+<context>
+<name>core</name>
+<!-- core.* -->
+<message>
+    <source>Collecting files to scan</source>
+    <translation>收集文件以备扫描</translation>
+</message>
+<message>
+    <source>%s (%d discarded)</source>
+    <translation>%s (%d 无效)</translation>
+</message>
+<message>
+    <source>Scanning for duplicates</source>
+    <translation>重复文件扫描中</translation>
+</message>
+<message>
+    <source>Loading</source>
+    <translation>载入中</translation>
+</message>
+<message>
+    <source>Moving</source>
+    <translation>移动中</translation>
+</message>
+<message>
+    <source>Copying</source>
+    <translation>复制中</translation>
+</message>
+<message>
+    <source>Sending to Trash</source>
+    <translation>移到垃圾桶</translation>
+</message>
+<message>
+    <source>0 matches found</source>
+    <translation>未找到匹配项</translation>
+</message>
+<message>
+    <source>%d matches found</source>
+    <translation>找到 %d 匹配项</translation>
+</message>
+<message>
+    <source>Read size of %d/%d files</source>
+    <translation>读取 %d/%d 文件大小</translation>
+</message>
+<message>
+    <source>Grouped %d/%d matches</source>
+    <translation>%d/%d 匹配项组合在一起</translation>
+</message>
+<message>
+    <source>%d / %d (%s / %s) duplicates marked.</source>
+    <translation>已标记 %d / %d (%s / %s) 重复项.</translation>
+</message>
+<message>
+    <source> filter: %s</source>
+    <translation> 筛选: %s</translation>
+</message>
+<message>
+    <source>Read metadata of %d/%d files</source>
+    <translation>读取 %d/%d 文件元数据</translation>
+</message>
+<message>
+    <source>Removing false matches</source>
+    <translation>移除错误匹配项</translation>
+</message>
+<message>
+    <source>Processed %d/%d matches against the ignore list</source>
+    <translation>在忽略列表之外已处理 %d/%d 匹配项</translation>
+</message>
+<message>
+    <source>Doing group prioritization</source>
+    <translation>优化分组</translation>
+</message>
+
+<message>
+    <source>Continue</source>
+    <translation>继续</translation>
+</message>
+<message>
+    <source>Continue ({})</source>
+    <translation>继续 ({})</translation>
+</message>
+
+<message>
+    <source>Analyzed %d/%d pictures</source>
+    <translation>分析 %d/%d 图像</translation>
+</message>
+<message>
+    <source>Preparing for matching</source>
+    <translation>准备进行匹配</translation>
+</message>
+<message>
+    <source>Matched %d/%d pictures</source>
+    <translation>%d/%d 图像已匹配</translation>
+</message>
+<message>
+    <source>Verified %d/%d matches</source>
+    <translation>验证 %d/%d 匹配项</translation>
+</message>
+
+<message>
+    <source>Removing dead tracks from your iTunes Library</source>
+    <translation>从你的iTunes库中移除无效的音轨</translation>
+</message>
+<message>
+    <source>Scanning the iTunes Library</source>
+    <translation>正在扫描iTunes库</translation>
+</message>
+
+<message>
+    <source>Probing iPhoto. Don't touch it during the operation!</source>
+    <translation>正在对iPhoto进行搜索.请在此过程中不要触碰任何按键!</translation>
+</message>
+<message>
+    <source>Sending dupes to the Trash</source>
+    <translation>将重复文件移到垃圾桶</translation>
+</message>
+
+<!-- qt.* -->
+<message>
+    <source>Sending files to the recycle bin</source>
+    <translation>将文件移到回收站</translation>
+</message>
+<message>
+    <source>Quit</source>
+    <translation>退出</translation>
+</message>
+<message>
+    <source>Preferences</source>
+    <translation>首选项</translation>
+</message>
+<message>
+    <source>dupeGuru Help</source>
+    <translation>dupeGuru帮助</translation>
+</message>
+<message>
+    <source>About dupeGuru</source>
+    <translation>关于dupeGuru</translation>
+</message>
+<message>
+    <source>Register dupeGuru</source>
+    <translation>注册dupeGuru</translation>
+</message>
+<message>
+    <source>Check for Update</source>
+    <translation>检查更新</translation>
+</message>
+<message>
+    <source>Open Debug Log</source>
+    <translation>打开调试记录</translation>
+</message>
+<message>
+    <source>Add to Ignore List</source>
+    <translation>添加到忽略列表中</translation>
+</message>
+<message>
+    <source>copy</source>
+    <translation>复制</translation>
+</message>
+<message>
+    <source>move</source>
+    <translation>移动</translation>
+</message>
+<message>
+    <source>Remove duplicates</source>
+    <translation>移除重复文件</translation>
+</message>
+<message>
+    <source>Custom Command</source>
+    <translation>自定义命令</translation>
+</message>
+<message>
+    <source>Operation Complete</source>
+    <translation>执行完成</translation>
+</message>
+<message>
+    <source>Scan complete</source>
+    <translation>扫描完成</translation>
+</message>
+<message>
+    <source>Attribute</source>
+    <translation>属性</translation>
+</message>
+<message>
+    <source>Selected</source>
+    <translation>已选择</translation>
+</message>
+<message>
+    <source>Reference</source>
+    <translation>引用</translation>
+</message>
+<message>
+    <source>Load Results...</source>
+    <translation>载入结果...</translation>
+</message>
+<message>
+    <source>Results Window</source>
+    <translation>结果窗口</translation>
+</message>
+<message>
+    <source>Add Folder...</source>
+    <translation>添加文件夹...</translation>
+</message>
+<message>
+    <source>File</source>
+    <translation>文件</translation>
+</message>
+<message>
+    <source>View</source>
+    <translation>视图</translation>
+</message>
+<message>
+    <source>Help</source>
+    <translation>帮助</translation>
+</message>
+<message>
+    <source>Load Recent Results</source>
+    <translation>载入最近的结果</translation>
+</message>
+<message>
+    <source>Load Results</source>
+    <translation>载入结果</translation>
+</message>
+<message>
+    <source>Scan</source>
+    <translation>扫描</translation>
+</message>
+<message>
+    <source>Unsaved results</source>
+    <translation>未保存的结果</translation>
+</message>
+<message>
+    <source>dupeGuru Results (*.dupeguru)</source>
+    <translation>dupeGuru结果 (*.dupeguru)</translation>
+</message>
+<message>
+    <source>All Files (*.*)</source>
+    <translation>所有文件 (*.*)</translation>
+</message>
+<message>
+    <source>Start a new scan</source>
+    <translation>开始新的扫描</translation>
+</message>
+<message>
+    <source>Name</source>
+    <translation>名称</translation>
+</message>
+<message>
+    <source>State</source>
+    <translation>说明</translation>
+</message>
+<message>
+    <source>Normal</source>
+    <translation>正常</translation>
+</message>
+<message>
+    <source>Excluded</source>
+    <translation>不包含</translation>
+</message>
+<message>
+    <source>Problems!</source>
+    <translation>有问题!</translation>
+</message>
+<message>
+    <source>Reveal Selected</source>
+    <translation>显示选择</translation>
+</message>
+<message>
+    <source>Close</source>
+    <translation>关闭</translation>
+</message>
+<message>
+    <source>File Path</source>
+    <translation>文件路径</translation>
+</message>
+<message>
+    <source>Error Message</source>
+    <translation>错误信息</translation>
+</message>
+<message>
+    <source>Details</source>
+    <translation>详细说明</translation>
+</message>
+<message>
+    <source>Actions</source>
+    <translation>行为</translation>
+</message>
+<message>
+    <source>Show Dupes Only</source>
+    <translation>仅显示重复文件</translation>
+</message>
+<message>
+    <source>Show Delta Values</source>
+    <translation>显示Delta值</translation>
+</message>
+<message>
+    <source>Send Marked to Recycle Bin</source>
+    <translation>将标记的文件移到回收站</translation>
+</message>
+<message>
+    <source>Delete Marked and Replace with Hardlinks</source>
+    <translation>删除标记文件并用硬连接进行替换</translation>
+</message>
+<message>
+    <source>Move Marked to...</source>
+    <translation>将标记的文件移动到...</translation>
+</message>
+<message>
+    <source>Copy Marked to...</source>
+    <translation>将标记的文件复制到...</translation>
+</message>
+<message>
+    <source>Remove Marked from Results</source>
+    <translation>从结果中移除标记的文件</translation>
+</message>
+<message>
+    <source>Remove Selected from Results</source>
+    <translation>从结果中移除所选的文件</translation>
+</message>
+<message>
+    <source>Add Selected to Ignore List</source>
+    <translation>将所选文件添加到忽略列表中</translation>
+</message>
+<message>
+    <source>Make Selected Reference</source>
+    <translation>将所选文件设定为参照文件</translation>
+</message>
+<message>
+    <source>Open Selected with Default Application</source>
+    <translation>使用默认程序打开所选文件</translation>
+</message>
+<message>
+    <source>Open Containing Folder of Selected</source>
+    <translation>打开已选文件所在的文件夹</translation>
+</message>
+<message>
+    <source>Rename Selected</source>
+    <translation>重命名所选文件</translation>
+</message>
+<message>
+    <source>Mark All</source>
+    <translation>标记全部</translation>
+</message>
+<message>
+    <source>Mark None</source>
+    <translation>全部取消标记</translation>
+</message>
+<message>
+    <source>Invert Marking</source>
+    <translation>反选标记文件</translation>
+</message>
+<message>
+    <source>Mark Selected</source>
+    <translation>标记所选文件</translation>
+</message>
+<message>
+    <source>Clear Ignore List</source>
+    <translation>清空忽略列表</translation>
+</message>
+<message>
+    <source>Apply Filter</source>
+    <translation>应用筛选</translation>
+</message>
+<message>
+    <source>Cancel Filter</source>
+    <translation>取消筛选</translation>
+</message>
+<message>
+    <source>Export To HTML</source>
+    <translation>导出为 HTML</translation>
+</message>
+<message>
+    <source>Save Results...</source>
+    <translation>保存结果...</translation>
+</message>
+<message>
+    <source>Invoke Custom Command</source>
+    <translation>调用自定义命令</translation>
+</message>
+<message>
+    <source>Mark</source>
+    <translation>标记</translation>
+</message>
+<message>
+    <source>Columns</source>
+    <translation>列</translation>
+</message>
+<message>
+    <source>Reset to Defaults</source>
+    <translation>重置为默认值</translation>
+</message>
+<message>
+    <source>{} Results</source>
+    <translation>{} (结果)</translation>
+</message>
+<message>
+    <source>Delete duplicates</source>
+    <translation>删除重复文件</translation>
+</message>
+<message>
+    <source>Delete and hardlink duplicates</source>
+    <translation>删除及硬连接重复文件</translation>
+</message>
+
+<!--- Preferences dialog -->
+<message>
+    <source>Scan Type:</source>
+    <translation>扫描类型:</translation>
+</message>
+<message>
+    <source>Filename</source>
+    <translation>文件名称</translation>
+</message>
+<message>
+    <source>Contents</source>
+    <translation>内容</translation>
+</message>
+<message>
+    <source>Folders</source>
+    <translation>文件夹</translation>
+</message>
+<message>
+    <source>Filter Hardness:</source>
+    <translation>筛选强度:</translation>
+</message>
+<message>
+    <source>More Results</source>
+    <translation>较多结果</translation>
+</message>
+<message>
+    <source>Fewer Results</source>
+    <translation>较少结果</translation>
+</message>
+<message>
+    <source>Word weighting</source>
+    <translation>词语匹配权重</translation>
+</message>
+<message>
+    <source>Match similar words</source>
+    <translation>匹配相近词语</translation>
+</message>
+<message>
+    <source>Can mix file kind</source>
+    <translation>混合文件类型</translation>
+</message>
+<message>
+    <source>Use regular expressions when filtering</source>
+    <translation>筛选时使用常规表达式</translation>
+</message>
+<message>
+    <source>Remove empty folders on delete or move</source>
+    <translation>删除或移动时同时移除空文件夹</translation>
+</message>
+<message>
+    <source>Ignore files smaller than</source>
+    <translation>忽略文件当其小于:</translation>
+</message>
+<message>
+    <source>KB</source>
+    <translation>KB</translation>
+</message>
+<message>
+    <source>Ignore duplicates hardlinking to the same file</source>
+    <translation>忽略重复文件当其硬连接到相同文件时</translation>
+</message>
+<message>
+    <source>Copy and Move:</source>
+    <translation>复制和移动:</translation>
+</message>
+<message>
+    <source>Right in destination</source>
+    <translation>目标位置</translation>
+</message>
+<message>
+    <source>Recreate relative path</source>
+    <translation>重建相对路径</translation>
+</message>
+<message>
+    <source>Recreate absolute path</source>
+    <translation>重建绝对路径</translation>
+</message>
+<message>
+    <source>Custom Command (arguments: %d for dupe, %r for ref):</source>
+    <translation>自定义命令 (参数: %d 指重复文件, %r 指引用):</translation>
+</message>
+<message>
+    <source>Filename - Fields</source>
+    <translation>文件名称 - 字段名</translation>
+</message>
+<message>
+    <source>Filename - Fields (No Order)</source>
+    <translation>文件名称 - 字段名 (无序)</translation>
+</message>
+<message>
+    <source>Tags</source>
+    <translation>标签</translation>
+</message>
+<message>
+    <source>Audio Contents</source>
+    <translation>音频内容</translation>
+</message>
+<message>
+    <source>Tags to scan:</source>
+    <translation>标签扫描:</translation>
+</message>
+<message>
+    <source>Track</source>
+    <translation>音轨</translation>
+</message>
+<message>
+    <source>Artist</source>
+    <translation>演唱者</translation>
+</message>
+<message>
+    <source>Album</source>
+    <translation>专辑</translation>
+</message>
+<message>
+    <source>Title</source>
+    <translation>歌曲名</translation>
+</message>
+<message>
+    <source>Genre</source>
+    <translation>音乐类型</translation>
+</message>
+<message>
+    <source>Year</source>
+    <translation>年</translation>
+</message>
+<message>
+    <source>Match pictures of different dimensions</source>
+    <translation>匹配不同规格的图像</translation>
+</message>
+<message>
+    <source>Clear Picture Cache</source>
+    <translation>清空图片缓存</translation>
+</message>
+<message>
+    <source>Clear List</source>
+    <translation>清空列表</translation>
+</message>
+<message>
+    <source>Language:</source>
+    <translation>语言:</translation>
+</message>
+<message>
+    <source>English</source>
+    <translation>英语</translation>
+</message>
+<message>
+    <source>French</source>
+    <translation>法语</translation>
+</message>
+<message>
+    <source>German</source>
+    <translation>德语</translation>
+</message>
+<message>
+    <source>Chinese (Simplified)</source>
+    <translation type="unfinished"></translation>
+</message>
+<message>
+    <source>Debug mode (restart required)</source>
+    <translation>调试模式 (需要重新启动)</translation>
+</message>
+</context>
+
+<!-- ******** Columns ******** -->
+<context>
+<name>columns</name>
+<message>
+    <source>Filename</source>
+    <translation>文件名称</translation>
+</message>
+<message>
+    <source>Folder</source>
+    <translation>文件夹</translation>
+</message>
+<message>
+    <source>Size (KB)</source>
+    <translation>大小 (KB)</translation>
+</message>
+<message>
+    <source>Size (MB)</source>
+    <translation>大小 (MB)</translation>
+</message>
+<message>
+    <source>Kind</source>
+    <translation>类型</translation>
+</message>
+<message>
+    <source>Modification</source>
+    <translation>编辑</translation>
+</message>
+<message>
+    <source>Match %</source>
+    <translation>匹配 %</translation>
+</message>
+<message>
+    <source>Words Used</source>
+    <translation>使用过的词语</translation>
+</message>
+<message>
+    <source>Dupe Count</source>
+    <translation>重复文件数</translation>
+</message>
+
+<message>
+    <source>Time</source>
+    <translation>时间</translation>
+</message>
+<message>
+    <source>Bitrate</source>
+    <translation>比特</translation>
+</message>
+<message>
+    <source>Sample Rate</source>
+    <translation>采样率</translation>
+</message>
+<message>
+    <source>Title</source>
+    <translation>歌曲名</translation>
+</message>
+<message>
+    <source>Artist</source>
+    <translation>演唱者</translation>
+</message>
+<message>
+    <source>Album</source>
+    <translation>专辑</translation>
+</message>
+<message>
+    <source>Genre</source>
+    <translation>音乐类型</translation>
+</message>
+<message>
+    <source>Year</source>
+    <translation>年</translation>
+</message>
+<message>
+    <source>Track Number</source>
+    <translation>音轨号</translation>
+</message>
+<message>
+    <source>Comment</source>
+    <translation>注释</translation>
+</message>
+
+<message>
+    <source>Dimensions</source>
+    <translation>规格</translation>
+</message>
+</context>
+
+<!-- ******** ExtraFairwareReminder ******** -->
+<context>
+<name>ExtraFairwareReminder</name>
+<message>
+    <source>Sorry, I must insist</source>
+    <translation>抱歉,现在仍要继续</translation>
+</message>
+<message>
+    <source>Contribute</source>
+    <translation>捐助</translation>
+</message>
+<message>
+    <source>ExtraFairwarePromptMsg</source>
+    <translation>看起来似乎您找到了很多重复文件。这也是我继续精进这个软件的动力之一。然而，我衷心的希望能够得到您的捐助，因为我会日夜奋战于这个软件并且没有任何报酬。
+    
+您可能会觉得 &quot;反正这个软件我只用一次，我不需要给开发者任何捐助&quot;. 问题是大多数人都只用一次dupeGuru。如果每一位都这样想，dupeGuru的开发也就没有资金支持了。也正是因为dupeGuru自身的性质决定了它有着仅用一次的内在倾向，所以我还必须坚持致力于这个软件的开发与精进。
+
+如果您无法承担捐助，您也可以忽略此提醒，或者发送电子邮件至 support@hardcoded.net ，我会发送给您一个注册密钥。</translation>
+</message>
+<message>
+    <source>ExtraFairwareReasonMsg</source>
+    <translation>此提醒框弹出的原因如下:
+
+1. 您正在处理超过100个重复文件
+2. 您没有捐助过dupeGuru
+3. 此软件中还有未支付时间</translation>
+</message>
+</context>
+<!-- ******** Message ******** -->
+<context>
+<name>message</name>
+<message>
+    <source>SelectFolderToScanMsg</source>
+    <translation>选择要扫描的文件夹，然后点击 &quot;扫描&quot;.</translation>
+</message>
+<message>
+    <source>TaskHangingMsg</source>
+    <translation>目前还有任务在执行，新任务无法开启。请等待几秒钟后再重新试一次。</translation>
+</message>
+<message>
+    <source>IgnoreConfirmMsg</source>
+    <translation>目前已选的 {} 匹配项将在后续的扫描中被忽略。继续吗?</translation>
+</message>
+<message>
+    <source>SelectCopyOrMoveDestinationMsg</source>
+    <translation>选择一个文件夹将标记的 {} 个文件进行...</translation>
+</message>
+<message>
+    <source>FileRemovalConfirmMsg</source>
+    <translation>你将从结果中移除 {} 个文件。继续吗?</translation>
+</message>
+<message>
+    <source>NoCustomCommandMsg</source>
+    <translation>你没有设定自定义命令。请在首选项中进行设定。</translation>
+</message>
+<message>
+    <source>OperationSuccessMsg</source>
+    <translation>所有文件已成功处理。</translation>
+</message>
+<message>
+    <source>NoDuplicateFoundMsg</source>
+    <translation>没有找到重复文件。</translation>
+</message>
+<message>
+    <source>ReallyWantToQuitMsg</source>
+    <translation>目前还有结果尚未保存，确定要退出吗?</translation>
+</message>
+<message>
+    <source>SelectFolderToAddMsg</source>
+    <translation>选择一个文件夹以加入到扫描列表中</translation>
+</message>
+<message>
+    <source>SelectResultToLoadMsg</source>
+    <translation>选择一个结果文件并载入</translation>
+</message>
+<message>
+    <source>ReallyWantToContinueMsg</source>
+    <translation>目前还有结果尚未保存，确定要继续吗?</translation>
+</message>
+<message>
+    <source>NoScannableFileMsg</source>
+    <translation>所选文件夹中不包含可供扫描的文件。</translation>
+</message>
+<message>
+    <source>ProblemsDuringProcessingMsg</source>
+    <translation>在处理部分或全部文件时发现问题。产生问题的原因在下表中进行描述。这些文件将不会从结果中移除。</translation>
+</message>
+<message>
+    <source>TypeFilterMsg</source>
+    <translation>请输入筛选条件以应用到结果。详见帮助文档。</translation>
+</message>
+<message>
+    <source>NothingToClearMsg</source>
+    <translation>无需清空。</translation>
+</message>
+<message>
+    <source>ClearIgnoreListConfirmMsg</source>
+    <translation>确定要从忽略列表中移除 {} 项吗?</translation>
+</message>
+<message>
+    <source>IgnoreListClearedMsg</source>
+    <translation>忽略列表已清空。</translation>
+</message>
+<message>
+    <source>SendToTrashConfirmMsg</source>
+    <translation>即将有 {} 个文件被移到回收站。继续吗?</translation>
+</message>
+<message>
+    <source>HardlinkConfirmMsg</source>
+    <translation>即将有 {} 个文件被移动垃圾桶并删除硬盘上的文件。继续吗?</translation>
+</message>
+<message>
+    <source>SelectResultToSaveMsg</source>
+    <translation>选择一个文件将结果保存到</translation>
+</message>
+<message>
+    <source>NeedsToRestartToApplyLangMsg</source>
+    <translation>dupeGuru将重新启动以使语言修改生效。</translation>
+</message>
+<message>
+    <source>ClearPictureCacheConfirmMsg</source>
+    <translation>确定要移除所有缓存图片?</translation>
+</message>
+<message>
+    <source>PictureCacheClearedMsg</source>
+    <translation>图片缓存已清空。</translation>
+</message>
+</context>
+</TS>
--- a/qt/se/preferences_dialog.py
+++ b/qt/se/preferences_dialog.py
@@ -68,7 +68,7 @@ class PreferencesDialog(PreferencesDialogBase):
        self.verticalLayout_4.addLayout(self.horizontalLayout_2)
        self._setupAddCheckbox('ignoreHardlinkMatches', tr("Ignore duplicates hardlinking to the same file"), self.widget)
        self.verticalLayout_4.addWidget(self.ignoreHardlinkMatches)
-        self._setupAddCheckbox('debugModeBox', tr(tr("Debug mode (restart required)")), self.widget)
+        self._setupAddCheckbox('debugModeBox', tr("Debug mode (restart required)"), self.widget)
        self.verticalLayout_4.addWidget(self.debugModeBox)
        self.widgetsVLayout.addWidget(self.widget)
        self._setupBottomPart()
Author	SHA1	Message	Date
Virgil Dupras	f2d77bb60b	Updated hscommon.	2011-09-03 13:49:06 -04:00
Virgil Dupras	4b9cba4d7f	Removed some code duplication.	2011-09-03 13:28:36 -04:00
Virgil Dupras	47c9d39150	Added loc entry for "Chinese (Simplified)".	2011-09-03 10:30:31 -04:00
Virgil Dupras	14aba2b507	Added Eric Dee to credits for the chinese localization.	2011-09-03 10:25:17 -04:00
Virgil Dupras	bb2faa27f9	Added Chinese (Simplified) localization for Qt.	2011-09-03 10:19:17 -04:00
Virgil Dupras	e10e9a6976	Fixed a double tr() call. It caused a crash when in Chinese mode.	2011-09-03 10:15:03 -04:00
Virgil Dupras	73ba4954c1	Today's not my day.	2011-08-27 16:54:44 -04:00
Virgil Dupras	2c8c077b82	Well, congrats to me: that was a really stupid bug. Scans in PE were impossible. That's a quick fix.	2011-08-27 15:33:27 -04:00
Virgil Dupras	f7a3e78870	Merged heads.	2011-08-27 12:12:11 -07:00
Virgil Dupras	38638a90f1	Fixed se's xcode3 project which didn't have a ref tothe german FairwareReminder.xib.	2011-08-27 12:11:42 -07:00
Virgil Dupras	11cff312f5	Added tag pe2.2.2 for changeset 925847384dce	2011-08-27 13:41:31 -04:00
Virgil Dupras	17656d8e7c	pe v2.2.2	2011-08-27 12:56:51 -04:00
Virgil Dupras	42cb788d35	Added tag me6.0.2 for changeset 28ba95706dc5	2011-08-26 18:39:20 -04:00
Virgil Dupras	327fe0b660	Fixed cocoalib xib refs in me/pe's xcode3 project.	2011-08-26 13:54:51 -07:00
Virgil Dupras	2cad94941b	se v6.0.2	2011-08-26 16:45:09 -04:00
Virgil Dupras	d93b5d65b9	Added missing german core and Localizable references in xcode3 project.	2011-08-25 12:21:03 -04:00
Virgil Dupras	9bf9dd330a	Added missing german "core" and "Localizable" references in xcode4 project.	2011-08-25 12:14:32 -04:00
Virgil Dupras	4449831ace	There's a bug in ResultWindow.xib and it makes it impossible to edit or localize it with XCode4. It fear that I'll have to entirely rebuild the file from scratch, but I'll only do it after I've dropped 10.5/XCode3 support. So, for now, to make it possible to compile dupeGuru with XCode4, I restore pre-localized ResultWindow.xib in fr.lproj and de.lproj.	2011-08-25 12:03:38 -04:00
Virgil Dupras	303cf52d6a	Added tag se3.1.2 for changeset e62183e907d6	2011-08-25 10:45:49 -04:00
Virgil Dupras	21b1a63687	[#166 state:fixed] Added libqtgui4 to deps in debian packaging.	2011-08-25 10:08:13 -04:00
Virgil Dupras	b1dce31542	se v3.1.2	2011-08-25 09:45:49 -04:00
Virgil Dupras	a64ddcb804	[#172 state:fixed] Fixed the Folders scan type which didn't work at all.	2011-08-25 09:37:30 -04:00
Virgil Dupras	905c194cdd	Updated qt/lang/de.qm	2011-08-25 09:36:06 -04:00
Virgil Dupras	e61c698b03	Added tag se3.1.1 for changeset db1f325c907f	2011-08-24 13:17:05 -04:00