diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41ea00ad..b5bdca4e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Gang Chen <chen.gang1983@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sparkleshare 简体中文\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-01 06:14+0000\n"
+"POT-Creation-Date: 2010-09-22 06:45+0000\n"
 "PO-Revision-Date: 2010-07-02 12:41+0700\n"
-"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
+"Last-Translator: 陈钢<chen.gang1983@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,197 +18,456 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: zh_CN\n"
 
-#: ../SparkleShare/SparkleDialog.cs:50
-msgid "Address of remote SparkleShare folder:"
-msgstr "远端 SparkleShare 文件夹的地址："
-
-#: ../SparkleShare/SparkleDialog.cs:81
-msgid "Add Folder"
-msgstr "添加文件夹"
-
-#: ../SparkleShare/SparkleDialog.cs:126
-#, csharp-format
-msgid "Syncing folder ‘{0}’"
-msgstr "正在同步文件夹 ‘{0}’"
-
-#: ../SparkleShare/SparkleDialog.cs:127
-msgid "SparkleShare will notify you when this is done."
-msgstr "完成时 SparkleShare 将通知您"
-
-#: ../SparkleShare/SparkleDialog.cs:129
-msgid "Dismiss"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:157
-#, csharp-format
-msgid "Something went wrong while syncing ‘{0}’"
-msgstr "同步 ‘{0}’ 时发生错误"
-
-#: ../SparkleShare/SparkleDialog.cs:167
-msgid "Try Again…"
-msgstr "重试..."
-
-#: ../SparkleShare/SparkleDialog.cs:197
-#, csharp-format
-msgid "Successfully synced folder ‘{0}’"
-msgstr "成功同步文件夹 ‘{0}’"
-
-#: ../SparkleShare/SparkleDialog.cs:198
-msgid "Now make great stuff happen!"
-msgstr "就让伟大一刻现在发生吧！"
-
-#. Add a button to open the folder where the changed file is
-#: ../SparkleShare/SparkleDialog.cs:200
-#: ../SparkleShare/SparkleRepo.cs:319
-#: ../SparkleShare/SparkleWindow.cs:62
-msgid "Open Folder"
-msgstr "打开文件夹"
-
-#: ../SparkleShare/SparkleHelpers.cs:159
-#, csharp-format
-msgid "a second ago"
-msgid_plural "{0} seconds ago"
-msgstr[0] "{0} 秒钟前"
-
-#: ../SparkleShare/SparkleHelpers.cs:165
-#, csharp-format
-msgid "a minute ago"
-msgid_plural "about {0} minutes ago"
-msgstr[0] "{0} 分钟前"
-
-#: ../SparkleShare/SparkleHelpers.cs:171
-#, csharp-format
-msgid "about an hour ago"
-msgid_plural "about {0} hours ago"
-msgstr[0] "约 {0} 小时前"
-
-#: ../SparkleShare/SparkleHelpers.cs:177
-#, csharp-format
-msgid "yesterday"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} 天前"
-
-#: ../SparkleShare/SparkleHelpers.cs:183
-#, csharp-format
-msgid "a month ago"
-msgid_plural "{0} months ago"
-msgstr[0] "{0} 个月前"
-
-#: ../SparkleShare/SparkleHelpers.cs:188
-#, csharp-format
-msgid "a year ago"
-msgid_plural "{0} years ago"
-msgstr[0] "{0} 年前"
-
-#: ../SparkleShare/SparkleHelpers.cs:197
-msgid "Hold your ponies!"
-msgstr ""
-
-#: ../SparkleShare/SparkleHelpers.cs:198
-msgid ""
-"SparkleShare is known to be insanely fast with \n"
-"pictures of unicorns. Please make sure your internets\n"
-"are upgraded to the latest version to avoid problems."
-msgstr ""
-
-#: ../SparkleShare/SparkleShare.cs:50
+#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:58
 msgid "Git wasn't found."
-msgstr "Git 没有找到"
+msgstr "没有找到 Git"
 
-#: ../SparkleShare/SparkleShare.cs:51
+#: ../SparkleDiff/SparkleDiff.cs:79 ../SparkleShare/SparkleShare.cs:59
 msgid "You can get Git from http://git-scm.com/."
 msgstr "您可以从 http://git-scm.com/ 处获得 Git。"
 
-#: ../SparkleShare/SparkleShare.cs:58
+#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:71
 msgid "Sorry, you can't run SparkleShare with these permissions."
 msgstr "对不起，您不能在这些许可下运行 SparkleShare。"
 
-#: ../SparkleShare/SparkleShare.cs:59
-msgid "Things will go utterly wrong."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:88 ../SparkleShare/SparkleShare.cs:72
+msgid "Things would go utterly wrong."
+msgstr "出现严重错误"
 
-#: ../SparkleShare/SparkleShare.cs:87
-msgid "SparkleShare Copyright (C) 2010 Hylke Bons"
+#: ../SparkleDiff/SparkleDiff.cs:162
+#, fuzzy
+msgid "SparkleDiff Copyright (C) 2010 Hylke Bons"
 msgstr "SparkleShare 版权所有 (C) 2010 Hylke Bons"
 
-#: ../SparkleShare/SparkleShare.cs:89
+#: ../SparkleDiff/SparkleDiff.cs:164 ../SparkleShare/SparkleShare.cs:116
 msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr ""
+msgstr "本程序不提供任何质量保证"
 
-#: ../SparkleShare/SparkleShare.cs:90
+#: ../SparkleDiff/SparkleDiff.cs:165 ../SparkleShare/SparkleShare.cs:118
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "这是自由软件，欢迎您再次分发。"
 
-#: ../SparkleShare/SparkleShare.cs:91
+#: ../SparkleDiff/SparkleDiff.cs:166 ../SparkleShare/SparkleShare.cs:119
 msgid "under certain conditions. Please read the GNU GPLv3 for details."
 msgstr "在某种条件下。详情请参见 GNU GPLv3。"
 
-#: ../SparkleShare/SparkleShare.cs:93
-msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:168
+msgid "SparkleDiff let's you compare revisions of an image file side by side."
+msgstr "SparkleDiff让用户比较并列表图像文件的不同版本"
 
-#: ../SparkleShare/SparkleShare.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..."
+#: ../SparkleDiff/SparkleDiff.cs:170
+msgid "Usage: sparklediff [FILE]"
+msgstr "使用方法：sparklediff [文件]"
 
-#: ../SparkleShare/SparkleShare.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:171
+msgid "Open an image file to show its revisions"
+msgstr "打开图像文件以显示其版本"
 
-#: ../SparkleShare/SparkleShare.cs:98
+#: ../SparkleDiff/SparkleDiff.cs:173 ../SparkleShare/SparkleShare.cs:127
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../SparkleShare/SparkleShare.cs:99
-msgid "\t -d, --disable-gui\tDon't show the notification icon."
-msgstr "\t -d, --disable-gui\t 不显示通知图标。"
-
-#: ../SparkleShare/SparkleShare.cs:100
+#: ../SparkleDiff/SparkleDiff.cs:174
 msgid "\t -h, --help\t\tDisplay this help text."
 msgstr "\t -h, --help\t\t 显示本帮助文本。"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:69
-msgid "Error syncing"
-msgstr "同步错误"
+#: ../SparkleDiff/SparkleDiffWindow.cs:92
+#, csharp-format
+msgid "{0} at {1}"
+msgstr "{0} at {1}"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:72
-msgid "Everything is up to date"
-msgstr "全部已经为最新"
+#: ../SparkleDiff/SparkleDiffWindow.cs:93
+msgid "ddd MMM d, yyyy"
+msgstr "ddd MMM d, yyyy"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:75
-msgid "Syncing…"
-msgstr "同步中..."
+#: ../SparkleDiff/SparkleDiffWindow.cs:94
+msgid "H:mm"
+msgstr "H:mm"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Add a Remote Folder…"
-msgstr "添加远端文件夹..."
+#: ../SparkleLib/SparkleOptions.cs:486
+msgid "OptionName"
+msgstr "选项名称"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:124
-msgid "Show Notifications"
-msgstr "显示通知"
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+msgid "Copy Web Link"
+msgstr "复制Web链接"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:142
-msgid "Visit Website"
-msgstr "访问网站"
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+msgid "Copy the web address of this file to the clipboard"
+msgstr "复制该文件的Web地址到剪贴板"
 
-#: ../SparkleShare/SparkleStatusIcon.cs:159
-msgid "Quit"
-msgstr "退出"
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+msgid "Get Earlier Version"
+msgstr "获取较早的版本"
 
-#: ../SparkleShare/SparkleUI.cs:134
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+msgid "Make a copy of an earlier version in this folder"
+msgstr "在本目录中制作一个较早的版本"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+msgid "Select to get a copy of this version"
+msgstr "获取该版本的复制"
+
+#: ../SparkleShare/SparkleIntro.cs:65 ../SparkleShare/SparkleStatusIcon.cs:411
 msgid "Welcome to SparkleShare!"
 msgstr "欢迎使用 SparkleShare！"
 
-#: ../SparkleShare/SparkleUI.cs:135
-msgid "You don't have any folders set up yet."
-msgstr "您还没有设置文件夹。"
-
-#: ../SparkleShare/SparkleUI.cs:138
-msgid "Add a Folder…"
-msgstr "添加文件夹..."
-
-#: ../SparkleShare/SparkleWindow.cs:50
-#, csharp-format
-msgid "‘{0}’ on {1}"
+#: ../SparkleShare/SparkleIntro.cs:71
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
 msgstr ""
 
+#: ../SparkleShare/SparkleIntro.cs:83
+msgid "Full Name:"
+msgstr "全名："
+
+#: ../SparkleShare/SparkleIntro.cs:99
+msgid "Email:"
+msgstr "电子邮件"
+
+#: ../SparkleShare/SparkleIntro.cs:110
+msgid "Next"
+msgstr "下一步"
+
+#: ../SparkleShare/SparkleIntro.cs:117
+msgid "Configuring…"
+msgstr "正在配置"
+
+#: ../SparkleShare/SparkleIntro.cs:162
+msgid "Where is your remote folder?"
+msgstr "远程文件夹在什么地方？"
+
+#: ../SparkleShare/SparkleIntro.cs:175
+msgid "address-to-server.com"
+msgstr "address-to-server.com"
+
+#: ../SparkleShare/SparkleIntro.cs:180
+msgid "On my own server:"
+msgstr "在我自己的服务器上："
+
+#: ../SparkleShare/SparkleIntro.cs:187
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:188
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:196
+msgid "The GNOME Project"
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:198
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:199
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:207
+msgid "Gitorious"
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:209
+msgid "Completely Free as in Freedom infrastructure."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:210
+msgid "Free accounts for Free and Open Source projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:273
+#: ../SparkleShare/SparkleInvitation.cs:134
+msgid "Folder Name:"
+msgstr "文件夹名称："
+
+#: ../SparkleShare/SparkleIntro.cs:283
+msgid "Sync"
+msgstr "同步"
+
+#: ../SparkleShare/SparkleIntro.cs:345
+msgid "Cancel"
+msgstr "取消"
+
+#: ../SparkleShare/SparkleIntro.cs:356
+msgid "Skip"
+msgstr "跳过"
+
+#: ../SparkleShare/SparkleIntro.cs:391
+#: ../SparkleShare/SparkleInvitation.cs:277
+#, fuzzy
+msgid "Something went wrong…"
+msgstr "同步 ‘{0}’ 时发生错误"
+
+#: ../SparkleShare/SparkleIntro.cs:397
+#, fuzzy
+msgid "Try Again"
+msgstr "重试..."
+
+#: ../SparkleShare/SparkleIntro.cs:425
+#: ../SparkleShare/SparkleInvitation.cs:310
+msgid "Folder synced successfully!"
+msgstr "文件夹同步成功"
+
+#: ../SparkleShare/SparkleIntro.cs:431
+#, csharp-format
+msgid ""
+"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleIntro.cs:439
+#: ../SparkleShare/SparkleInvitation.cs:323
+msgid "Open Folder"
+msgstr "打开文件夹"
+
+#: ../SparkleShare/SparkleIntro.cs:455 ../SparkleShare/SparkleIntro.cs:499
+#: ../SparkleShare/SparkleIntro.cs:566
+#: ../SparkleShare/SparkleInvitation.cs:338
+#: ../SparkleShare/SparkleInvitation.cs:381
+msgid "Finish"
+msgstr "完成"
+
+#: ../SparkleShare/SparkleIntro.cs:483
+#: ../SparkleShare/SparkleInvitation.cs:365
+#, fuzzy, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "正在同步文件夹 ‘{0}’"
+
+#: ../SparkleShare/SparkleIntro.cs:490
+#: ../SparkleShare/SparkleInvitation.cs:372
+msgid "This may take a while.\n"
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:491
+#: ../SparkleShare/SparkleInvitation.cs:373
+msgid "You sure it’s not coffee o-clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:541
+msgid "SparkleShare is ready to go!"
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:547
+msgid ""
+"Now you can start accepting invitations from others. \n"
+"Just click on invitations you get by email and we will take care of the rest."
+msgstr ""
+
+#: ../SparkleShare/SparkleIntro.cs:558
+msgid "Learn how to host your own SparkleServer"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:104
+msgid "Invitation received!"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:110
+msgid ""
+"You've received an invitation to join a shared folder.\n"
+"We're ready to hook you up immediately if you wish."
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:116
+msgid "Do you accept this invitation?"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:125
+msgid "Server Address:"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:148
+msgid "Reject"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:149
+msgid "Accept and Sync"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:283
+msgid "Close"
+msgstr ""
+
+#: ../SparkleShare/SparkleInvitation.cs:316
+msgid "Now you can access the synced files from ‘"
+msgstr ""
+
+#. TRANSLATORS: {0} is a folder name, and {1} is a server address
+#: ../SparkleShare/SparkleLog.cs:53
+#, csharp-format
+msgid "Recent Events in ‘{0}’"
+msgstr ""
+
+#: ../SparkleShare/SparkleLog.cs:69
+#, fuzzy
+msgid "_Open Folder"
+msgstr "打开文件夹"
+
+#: ../SparkleShare/SparkleLog.cs:319
+msgid "Edited"
+msgstr ""
+
+#: ../SparkleShare/SparkleLog.cs:333
+msgid "Added"
+msgstr ""
+
+#: ../SparkleShare/SparkleLog.cs:347
+msgid "Deleted"
+msgstr ""
+
+#: ../SparkleShare/SparkleLog.cs:361
+msgid "Moved"
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:83
+#, fuzzy
+msgid "Don't show the notification icon"
+msgstr "\t -d, --disable-gui\t 不显示通知图标。"
+
+#: ../SparkleShare/SparkleShare.cs:84
+msgid "Show this help text"
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:85
+msgid "Print version information"
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:113
+msgid "SparkleShare, an instant update workflow to Git."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:114
+#, fuzzy
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "SparkleShare 版权所有 (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/SparkleShare.cs:121
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:122
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:124
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..."
+
+#: ../SparkleShare/SparkleShare.cs:125
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:137
+#, fuzzy
+msgid "SparkleShare "
+msgstr "欢迎使用 SparkleShare！"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:277
+#, fuzzy
+msgid "No Remote Folders Yet"
+msgstr "添加远端文件夹..."
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:286
+#, fuzzy
+msgid "Sync Remote Folder…"
+msgstr "添加远端文件夹..."
+
+#. A checkbutton to toggle whether or not to show notifications
+#: ../SparkleShare/SparkleStatusIcon.cs:301
+msgid "Show Notifications"
+msgstr "显示通知"
+
+#. A menu item that takes the use to sparkleshare.org
+#: ../SparkleShare/SparkleStatusIcon.cs:323
+msgid "Visit Website"
+msgstr "访问网站"
+
+#. A menu item that quits the application
+#: ../SparkleShare/SparkleStatusIcon.cs:340
+msgid "Quit"
+msgstr "退出"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:409
+msgid "Up to date"
+msgstr ""
+
+#: ../SparkleShare/SparkleStatusIcon.cs:420
+msgid "Syncing…"
+msgstr "同步中..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:432
+msgid "Failed to sync changes"
+msgstr ""
+
+#: ../SparkleShare/SparkleUI.cs:338
+msgid "Ouch! Mid-air collision!"
+msgstr ""
+
+#: ../SparkleShare/SparkleUI.cs:339
+msgid "Don't worry, SparkleShare made a copy of each conflicting file."
+msgstr ""
+
+#: ../SparkleShare/SparkleUI.cs:472
+msgid "Hold your ponies!"
+msgstr ""
+
+#: ../SparkleShare/SparkleUI.cs:473
+msgid ""
+"SparkleShare is known to be insanely fast with pictures of unicorns. Please "
+"make sure your internets are upgraded to the latest version to avoid any "
+"problems."
+msgstr ""
+
+#~ msgid "Address of remote SparkleShare folder:"
+#~ msgstr "远端 SparkleShare 文件夹的地址："
+
+#~ msgid "Add Folder"
+#~ msgstr "添加文件夹"
+
+#~ msgid "SparkleShare will notify you when this is done."
+#~ msgstr "完成时 SparkleShare 将通知您"
+
+#~ msgid "Successfully synced folder ‘{0}’"
+#~ msgstr "成功同步文件夹 ‘{0}’"
+
+#~ msgid "Now make great stuff happen!"
+#~ msgstr "就让伟大一刻现在发生吧！"
+
+#~ msgid "a second ago"
+#~ msgid_plural "{0} seconds ago"
+#~ msgstr[0] "{0} 秒钟前"
+
+#~ msgid "a minute ago"
+#~ msgid_plural "about {0} minutes ago"
+#~ msgstr[0] "{0} 分钟前"
+
+#~ msgid "about an hour ago"
+#~ msgid_plural "about {0} hours ago"
+#~ msgstr[0] "约 {0} 小时前"
+
+#~ msgid "yesterday"
+#~ msgid_plural "{0} days ago"
+#~ msgstr[0] "{0} 天前"
+
+#~ msgid "a month ago"
+#~ msgid_plural "{0} months ago"
+#~ msgstr[0] "{0} 个月前"
+
+#~ msgid "a year ago"
+#~ msgid_plural "{0} years ago"
+#~ msgstr[0] "{0} 年前"
+
+#~ msgid "Error syncing"
+#~ msgstr "同步错误"
+
+#~ msgid "Everything is up to date"
+#~ msgstr "全部已经为最新"
+
+#~ msgid "You don't have any folders set up yet."
+#~ msgstr "您还没有设置文件夹。"
+
+#~ msgid "Add a Folder…"
+#~ msgstr "添加文件夹..."