Updated hscommon.

.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

.hgtags

@@ -52,3 +52,5 @@ e44d5127ed605daa7a17a01eee65d0a157de20c0 pe2.2.0
 ecf9aaa568340e3d03e8854b7556edd5a3285107 pe2.2.1
 db1f325c907ffa9808a49cb7bc2886b9fca7aee2 se3.1.1
 e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
+28ba95706dc54ba32b1c0cf4e1e6350515d19ba3 me6.0.2
+925847384dcef62a5c3518fc9e5ce42feab2b093 pe2.2.2

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; };
@@ -605,6 +606,7 @@
 			children = (
 				CE79638512536C94008D405B /* en */,
 				CE05341312E5DC260029EF25 /* fr */,
+				CE50A2CB1409769700AD9080 /* de */,
 			);
 			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 __appname__ = 'dupeGuru Picture Edition'

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):

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)

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
 

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
 

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
 

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

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>

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:

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>

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>

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>

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()