[conduit] Update Chinese simplified translation

[Wylmer Wang <wylmerwang src gnome org>]

commit 30f009d4928bb51d5f0de47449d4f2acc3bbfc14
Author: Wylmer Wang <wantinghard gmail com>
Date:   Sun Jan 5 15:05:09 2014 +0800

    Update Chinese simplified translation

 po/zh_CN.po |  178 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 94 insertions(+), 84 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36e0cdb..0dbe89f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,11 @@ msgstr ""
 "Project-Id-Version: conduit master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=conduit&keywords=I18N+L10N&component=documentation and translation\n"
-"POT-Creation-Date: 2011-04-09 08:13+0000\n"
-"PO-Revision-Date: 2011-04-17 13:46+0800\n"
+"POT-Creation-Date: 2013-12-18 14:42+0000\n"
+"PO-Revision-Date: 2014-01-05 15:03+0800\n"
 "Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,140 +26,140 @@ msgid "Synchronization for GNOME"
 msgstr "GNOME 的同步"
 
 #: ../data/conduit.ui.h:1
-msgid "Always Up-To-Date"
-msgstr "总是及时更新"
+msgid "Title"
+msgstr "标题"
 
 #: ../data/conduit.ui.h:2
-msgid "Ask Me What to Do"
-msgstr "询问要做什么"
+msgid "Editor"
+msgstr "编辑器"
 
 #: ../data/conduit.ui.h:3
-msgid "Ask me what to do"
-msgstr "询问要做什么"
+msgid "_File"
+msgstr "文件(_F)"
 
 #: ../data/conduit.ui.h:4
-msgid "Compare"
-msgstr "比较"
+msgid "_Edit"
+msgstr "编辑(_E)"
 
 #: ../data/conduit.ui.h:5
-msgid "Conduit Preferences"
-msgstr "Conduit 首选项"
+msgid "_Help"
+msgstr "帮助(_H)"
 
 #: ../data/conduit.ui.h:6
-msgid "Configuration"
-msgstr "配置"
+msgid "Data Providers"
+msgstr "数据提供者"
 
 #: ../data/conduit.ui.h:7
-msgid "Conflict Options"
-msgstr "冲突选项"
+msgid "Compare"
+msgstr "比较"
 
 #: ../data/conduit.ui.h:8
-msgid "Conflicts"
-msgstr "冲突"
+msgid "Resolve Conflicts"
+msgstr "解决冲突"
 
 #: ../data/conduit.ui.h:9
-msgid "Data Conversions"
-msgstr "数据转换"
+msgid "Conflicts"
+msgstr "冲突"
 
 #: ../data/conduit.ui.h:10
-msgid "Data Providers"
-msgstr "数据提供者"
+msgid "Synchronization Options"
+msgstr "同步选项"
 
 #: ../data/conduit.ui.h:11
-msgid "Default Synchronization Options"
-msgstr "默认同步选项"
+msgid "Slow Synchronization"
+msgstr "慢速同步"
 
 #: ../data/conduit.ui.h:12
-msgid "Delete Options"
-msgstr "删除选项"
+msgid "Two-Way Synchronization"
+msgstr "双向同步"
 
 #: ../data/conduit.ui.h:13
-msgid "Delete from the corresponding sink"
-msgstr "删除相应的接收器"
+msgid "Always Up-To-Date"
+msgstr "总是及时更新"
 
 #: ../data/conduit.ui.h:14
-msgid "Delete the Corresponding Item"
-msgstr "删除相应的条目"
+msgid "Conflict Options"
+msgstr "冲突选项"
 
 #: ../data/conduit.ui.h:15
-msgid "Editor"
-msgstr "编辑器"
+msgid "Ask Me What to Do"
+msgstr "询问要做什么"
 
 #: ../data/conduit.ui.h:16
-msgid "General"
-msgstr "常规"
+msgid "Replace the Older Item"
+msgstr "替代旧条目"
 
 #: ../data/conduit.ui.h:17
-msgid "Minimize to notification area"
-msgstr "最小化到通知区域"
+msgid "Skip"
+msgstr "跳过"
 
 #: ../data/conduit.ui.h:18
-msgid "Replace the Older Item"
-msgstr "替代旧条目"
+msgid "Delete Options"
+msgstr "删除选项"
 
 #: ../data/conduit.ui.h:19
-msgid "Replace the older item"
-msgstr "替代旧条目"
+msgid "Delete the Corresponding Item"
+msgstr "删除相应的条目"
 
 #: ../data/conduit.ui.h:20
-msgid "Resolve Conflicts"
-msgstr "解决冲突"
+msgid "Conduit Preferences"
+msgstr "Conduit 首选项"
 
 #: ../data/conduit.ui.h:21
-msgid "Save settings on exit"
-msgstr "退出时保存设置"
+msgid "Start Conduit at login"
+msgstr "登录时启动 Conduit"
 
 #: ../data/conduit.ui.h:22
-msgid "Show Hints"
-msgstr "显示提示"
+msgid "Save settings on exit"
+msgstr "退出时保存设置"
 
 #: ../data/conduit.ui.h:23
 msgid "Show status icon"
 msgstr "显示状态图标"
 
 #: ../data/conduit.ui.h:24
-msgid "Skip"
-msgstr "跳过"
+msgid "Minimize to notification area"
+msgstr "最小化到通知区域"
 
 #: ../data/conduit.ui.h:25
-msgid "Slow Synchronization"
-msgstr "慢速同步"
+msgid "Show Hints"
+msgstr "显示提示"
 
 #: ../data/conduit.ui.h:26
-msgid "Start Conduit at login"
-msgstr "登录时启动 Conduit"
+msgid "General"
+msgstr "常规"
 
 #: ../data/conduit.ui.h:27
-msgid "Synchronization Options"
-msgstr "同步选项"
+msgid "When an item has been deleted:"
+msgstr "当一个条目被删除时："
 
 #: ../data/conduit.ui.h:28
-msgid "Title"
-msgstr "标题"
+msgid "Ask me what to do"
+msgstr "询问要做什么"
 
 #: ../data/conduit.ui.h:29
-msgid "Two-Way Synchronization"
-msgstr "双向同步"
+msgid "Delete from the corresponding sink"
+msgstr "删除相应的接收器"
 
 #: ../data/conduit.ui.h:30
-msgid "When an item has been deleted:"
-msgstr "当一个条目被删除时："
-
-#: ../data/conduit.ui.h:31
 msgid "When there is a two-way conflict:"
 msgstr "当有双向冲突时："
 
+#: ../data/conduit.ui.h:31
+msgid "Replace the older item"
+msgstr "替代旧条目"
+
 #: ../data/conduit.ui.h:32
-msgid "_Edit"
-msgstr "编辑(_E)"
+msgid "Default Synchronization Options"
+msgstr "默认同步选项"
 
 #: ../data/conduit.ui.h:33
-msgid "_File"
-msgstr "文件(_F)"
+msgid "Configuration"
+msgstr "配置"
 
 #: ../data/conduit.ui.h:34
-msgid "_Help"
-msgstr "帮助(_H)"
+msgid "Data Conversions"
+msgstr "数据转换"
 
 #: ../conduit/Knowledge.py:8
 msgid "What Do You Want to Synchronize?"
@@ -249,8 +250,8 @@ msgstr "显式为会话设置内部 Conduit 设置 (keys) 为给定的值。[默
 #: ../conduit/Main.py:89
 #, python-format
 msgid ""
-"Enable loading of unfinished or unsupported dataproviders. [default: %"
-"default]"
+"Enable loading of unfinished or unsupported dataproviders. [default: "
+"%default]"
 msgstr "启用加载未完成或未支持的数据提供者。[默认：%default]"
 
 #: ../conduit/Main.py:93
@@ -384,6 +385,11 @@ msgstr "拖动一个数据提供者至此处以继续"
 msgid "Show me"
 msgstr "显示此项"
 
+#: ../conduit/gtkui/ConfigItems.py:733
+#, python-format
+msgid "Total: %d"
+msgstr "总计：%d"
+
 #. Visible column0 is
 #. [pixbuf + source display name] or
 #. [source_data.get_snippet()]
@@ -406,6 +412,15 @@ msgstr "接收器"
 msgid "Conflicts (%s)"
 msgstr "冲突(%s)"
 
+#: ../conduit/gtkui/Tree.py:355 ../conduit/gtkui/UI.py:200
+#: ../conduit/modules/FileModule/FileConfiguration.py:118
+msgid "Name"
+msgstr "名字"
+
+#: ../conduit/gtkui/Tree.py:364
+msgid "Description"
+msgstr "描述"
+
 #. name,                      #url
 #: ../conduit/gtkui/UI.py:33
 msgid "Introduction"
@@ -444,11 +459,6 @@ msgstr "关系数据库"
 msgid "Conversions Available"
 msgstr "转换可用"
 
-#: ../conduit/gtkui/UI.py:200 ../conduit/gtkui/Tree.py:355
-#: ../conduit/modules/FileModule/FileConfiguration.py:118
-msgid "Name"
-msgstr "名字"
-
 #: ../conduit/gtkui/UI.py:204
 msgid "Loaded"
 msgstr "已加载"
@@ -506,15 +516,6 @@ msgstr "同步完成"
 msgid "Synchronization Error"
 msgstr "同步出错"
 
-#: ../conduit/gtkui/Tree.py:364
-msgid "Description"
-msgstr "描述"
-
-#: ../conduit/gtkui/ConfigItems.py:733
-#, python-format
-msgid "Total: %d"
-msgstr "总计：%d"
-
 #: ../conduit/gtkui/WindowConfigurator.py:14
 msgid "Configure"
 msgstr "配置"
@@ -1126,6 +1127,15 @@ msgstr "SmugMug"
 msgid "Synchronize your SmugMug.com photos"
 msgstr "同步您的 SmugMug.com 照片"
 
+#: ../conduit/modules/TomboyModule.py:106
+msgid "Tomboy Notes"
+msgstr "Tomboy 便笺"
+
+#: ../conduit/modules/TomboyModule.py:107
+#| msgid "Synchronize your iPod notes"
+msgid "Synchronize your Tomboy notes"
+msgstr "同步您的 Tomboy 便笺"
+
 #: ../conduit/modules/ZotoModule/ZotoModule.py:154
 msgid "Zoto"
 msgstr "Zoto"