Merge branch 'master' of git.sugarlabs.org:calculate/mainline

1 files changed, 29 insertions, 32 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7ecd4f9..77d2bb4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ 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-02-17 10:01+0200\n"
-"Last-Translator: SUri <360183622@qq.com>\n"
+"PO-Revision-Date: 2012-03-22 06:32+0200\n"
+"Last-Translator: lite <litekok@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "plot(eqn, var=-a..b), 画出等式'eqn' 的变量值在a到b范围内的
 #: astparser.py:59
 #, python-format
 msgid "Parse error at %d"
-msgstr ""
+msgstr "解析错误 %d"
 
 # "mistake at %d"
 #: astparser.py:71 astparser.py:83
@@ -61,7 +61,6 @@ msgid "index"
 msgstr "index"
 
 #: astparser.py:109
-#, fuzzy
 msgid "topics"
 msgstr "主题"
 
@@ -75,19 +74,17 @@ msgid "variables"
 msgstr "变量"
 
 #: astparser.py:119
-#, fuzzy
 msgid "Variables"
 msgstr "变量"
 
 #. TRANS: This command is descriptive, so can be translated
 #: astparser.py:125
 msgid "functions"
-msgstr "functions"
+msgstr "函数"
 
 #: astparser.py:126
-#, fuzzy
 msgid "Functions"
-msgstr "functions"
+msgstr "函数"
 
 #: astparser.py:135
 #, python-format
@@ -95,13 +92,12 @@ msgid "No help about '%s' available, use help(index) for the index"
 msgstr "没有关于 '%s' 的帮助信息，使用 help(index) 参阅索引"
 
 #: astparser.py:459
-#, fuzzy
 msgid "help"
 msgstr "帮助"
 
 #: astparser.py:466
 msgid "Recursion detected"
-msgstr ""
+msgstr "检测到递归"
 
 #: astparser.py:490
 #, python-format
@@ -117,7 +113,7 @@ msgstr "变量 '%s' 未定义"
 #: astparser.py:502
 #, python-format
 msgid "Attribute '%s' does not exist"
-msgstr ""
+msgstr "属性 '%s' 不存在"
 
 #: astparser.py:596
 msgid "Parse error"
@@ -125,11 +121,11 @@ msgstr "解析错误"
 
 #: astparser.py:601
 msgid "Multiple statements not supported"
-msgstr ""
+msgstr "不支持多条语句"
 
 #: astparser.py:625
 msgid "Internal error"
-msgstr ""
+msgstr "内部错误"
 
 # "problem with reading equation"
 #: calculate.py:109
@@ -139,7 +135,7 @@ msgstr "Equation.parse() 无效字符串 (%s)"
 
 #: calculate.py:474
 msgid "Can not assign label: will cause recursion"
-msgstr ""
+msgstr "不能分配标签：会导致递归"
 
 #: calculate.py:546
 #, python-format
@@ -153,50 +149,47 @@ msgstr "button_pressed(): 无效类型"
 
 #: functions.py:35
 msgid "add"
-msgstr "加"
+msgstr "加add"
 
 #: functions.py:36
 msgid "abs"
-msgstr ""
+msgstr "绝对值abs"
 
 #: functions.py:37
 msgid "acos"
-msgstr "反余弦"
+msgstr "反余弦acos"
 
 #: functions.py:38
-#, fuzzy
 msgid "acosh"
-msgstr "反余弦"
+msgstr "反双曲余弦acosh"
 
 #: functions.py:39
 msgid "asin"
 msgstr "反正弦asin"
 
 #: functions.py:40
-#, fuzzy
 msgid "asinh"
-msgstr "反正弦asin"
+msgstr "反双曲正弦asinh"
 
 #: functions.py:41
 msgid "atan"
 msgstr "反正切atan"
 
 #: functions.py:42
-#, fuzzy
 msgid "atanh"
-msgstr "反正切atan"
+msgstr "反双曲正切atanh"
 
 #: functions.py:43
 msgid "and"
-msgstr "与"
+msgstr "与and"
 
 #: functions.py:44
 msgid "b10bin"
-msgstr ""
+msgstr "十进制转二进制b10bin"
 
 #: functions.py:45
 msgid "ceil"
-msgstr ""
+msgstr "进一法取整ceil"
 
 #: functions.py:46
 msgid "cos"
@@ -204,15 +197,15 @@ msgstr "余弦cos"
 
 #: functions.py:47
 msgid "cosh"
-msgstr "cosh"
+msgstr "双曲余弦cosh"
 
 #: functions.py:48
 msgid "div"
-msgstr ""
+msgstr "整除div"
 
 #: functions.py:49
 msgid "gcd"
-msgstr ""
+msgstr "最大公约数gcd"
 
 #: functions.py:50
 msgid "exp"
@@ -273,17 +266,19 @@ msgid "round"
 msgstr ""
 
 #: functions.py:64
+#, fuzzy
 msgid "sin"
 msgstr "sin"
 
 #: functions.py:65
+#, fuzzy
 msgid "sinh"
 msgstr "sinh"
 
 #: functions.py:66
 #, fuzzy
 msgid "sinc"
-msgstr "sin"
+msgstr "sinc"
 
 #: functions.py:67
 msgid "sqrt"
@@ -298,10 +293,12 @@ msgid "square"
 msgstr "square"
 
 #: functions.py:70
+#, fuzzy
 msgid "tan"
 msgstr "tan"
 
 #: functions.py:71
+#, fuzzy
 msgid "tanh"
 msgstr "tanh"
 
@@ -433,7 +430,7 @@ msgstr ""
 msgid ""
 "ln(x), return the natural logarithm of x. This is the value for which the "
 "exponent exp() equals x. Defined for x >= 0."
-msgstr "ln(x), 返回x的自然对数值，也就是当exp()等于x的值。定义x >= 0"
+msgstr "ln(x), 返回x的自然对数值，也就是当exp()等于x的值。定义x >= 0。"
 
 #: functions.py:320
 msgid ""
@@ -514,7 +511,7 @@ msgstr ""
 msgid ""
 "sqrt(x), return the square root of x. This is the value for which the square "
 "equals x. Defined for x >= 0."
-msgstr "sqrt(x), 返回x的平方根，也就是平方等于x的数值，定义x >= 0."
+msgstr "sqrt(x), 返回x的平方根，也就是平方等于x的数值，定义x >= 0。"
 
 #: functions.py:420
 msgid "square(x), return x * x"