From 67e6fde2c26b241f4b6f68cab0c771aa6868170b Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sat, 13 Oct 2012 15:23:18 +0000
Subject: Commit from Sugar Labs: Translation System by user cjl.: 164 of 164 messages translated (0 fuzzy).

---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d2e988..a128f2a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-27 00:33-0500\n"
-"PO-Revision-Date: 2012-03-24 05:04+0200\n"
+"POT-Creation-Date: 2012-10-08 00:33-0400\n"
+"PO-Revision-Date: 2012-10-07 05:27+0200\n"
 "Last-Translator: lite <litekok@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
@@ -25,10 +25,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "Calculate"
 msgstr "计算器"
 
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid ""
+"This is the place to get the answer to a quick problem, but that is not the "
+"limit! You can also explore Algebra, Trigonometry, Boolean and more!"
+msgstr "这是一个回答简单问题的地方，但不只是这样！您还可以学习代数，三角学，布尔以及更多！"
+
 #: astparser.py:40
 msgid ""
 "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
@@ -133,17 +140,17 @@ msgstr "内部错误"
 msgid "Equation.parse() string invalid (%s)"
 msgstr "Equation.parse() 无效字符串 (%s)"
 
-#: calculate.py:474
+#: calculate.py:483
 msgid "Can not assign label: will cause recursion"
 msgstr "不能分配标签：会导致递归"
 
-#: calculate.py:546
+#: calculate.py:571
 #, python-format
 msgid "Writing to journal (%s)"
 msgstr "写入日志 (%s)"
 
 # "cannot understand type of button pressed"
-#: calculate.py:829
+#: calculate.py:865
 msgid "button_pressed(): invalid type"
 msgstr "button_pressed(): 无效类型"
 
@@ -527,58 +534,46 @@ msgid ""
 "y is True (and x is False), else returns False"
 msgstr "xor(x, y), 逻辑异或。x为真y为假或者x为假y为真则返回真，否则为假。"
 
-#: layout.py:69
+#: layout.py:75
 msgid "Clear"
 msgstr "清除"
 
-#: layout.py:99 layout.py:139
+#: layout.py:105 layout.py:145
 msgid "Edit"
 msgstr "编辑"
 
-#: layout.py:104 layout.py:140
+#: layout.py:110 layout.py:146
 msgid "Algebra"
 msgstr "代数"
 
-#: layout.py:109 layout.py:141
+#: layout.py:115 layout.py:147
 msgid "Trigonometry"
 msgstr "三角函数"
 
-#: layout.py:114 layout.py:142
+#: layout.py:120 layout.py:148
 msgid "Boolean"
 msgstr "布尔代数"
 
-#: layout.py:119 layout.py:143
+#: layout.py:125 layout.py:149
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: layout.py:164
+#: layout.py:178
 msgid "Label:"
 msgstr "标记:"
 
-#: layout.py:197
+#: layout.py:223
 msgid "All equations"
 msgstr "所有的方程式"
 
-#: layout.py:197
+#: layout.py:224
 msgid "My equations"
 msgstr "我的方程式"
 
-#: layout.py:199
-msgid "Change view between own and all equations"
-msgstr "在个人视图和所有方程视图之间切换"
-
-#: layout.py:202
-msgid "Show history"
-msgstr "显示历史"
-
-#: layout.py:202
+#: layout.py:225
 msgid "Show variables"
 msgstr "显示变量"
 
-#: layout.py:204
-msgid "Change view between history and variables"
-msgstr "在历史视图和变量视图之间切换"
-
 #. TRANS: multiplication symbol (default: '×')
 #: mathlib.py:82
 msgid "mul_sym"
@@ -750,6 +745,15 @@ msgstr "显示位数的数量"
 msgid "Integer formatting base"
 msgstr "整型格式"
 
+#~ msgid "Change view between own and all equations"
+#~ msgstr "在个人视图和所有方程视图之间切换"
+
+#~ msgid "Show history"
+#~ msgstr "显示历史"
+
+#~ msgid "Change view between history and variables"
+#~ msgstr "在历史视图和变量视图之间切换"
+
 #~ msgid "Enter"
 #~ msgstr "输入"
 
--
cgit v0.9.1