[gcalctool] Updated zh_CN translation.



commit cda7b8d707f01781dd2485ed637c1a34d627bc2e
Author: Funda Wang <fundawang gmail com>
Date:   Sun Oct 17 17:44:14 2010 +0200

    Updated zh_CN translation.

 po/zh_CN.po |  637 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 454 insertions(+), 183 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f1a1a6a..96b69fc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: gcalctool master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gcalctool&component=general\n"
-"POT-Creation-Date: 2010-08-05 12:55+0000\n"
+"POT-Creation-Date: 2010-10-13 07:51+0000\n"
 "PO-Revision-Date: 2010-08-11 21:03+0800\n"
 "Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
 "Language-Team: Chinese Simplified <i18n-zh googlegroups com>\n"
@@ -24,109 +24,123 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. The label on the memory recall button
+#. This is between the unit selector dropdowns, for example: meters in kilometers
+#. This is between the currency selector dropdowns, for example: [USD] in [EUR]
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
-#: ../data/buttons-programming.ui.h:2
-msgid "&#x2190; R"
-msgstr "&#x2190; R"
-
-#. The label on the memory store button
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-financial.ui.h:4
-#: ../data/buttons-programming.ui.h:4
-msgid "&#x2192; R"
-msgstr "&#x2192; R"
+msgid " in "
+msgstr ""
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:6 ../data/buttons-programming.ui.h:6
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:8 ../data/buttons-programming.ui.h:6
 msgid "="
 msgstr "="
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:8 ../data/buttons-programming.ui.h:8
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:8
 msgid "Absolute Value"
 msgstr "�对�"
 
 #. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:10 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:32 ../data/buttons-programming.ui.h:12
+#: ../data/buttons-advanced.ui.h:8 ../data/buttons-basic.ui.h:4
+#: ../data/buttons-financial.ui.h:34 ../data/buttons-programming.ui.h:12
 msgid "Clear"
 msgstr "��"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:6
-#: ../data/buttons-financial.ui.h:42 ../data/buttons-programming.ui.h:14
+#: ../data/buttons-advanced.ui.h:10 ../data/buttons-basic.ui.h:6
+#: ../data/buttons-financial.ui.h:44 ../data/buttons-programming.ui.h:14
 msgid "Exponent"
 msgstr "X^Y"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:16
+#: ../data/buttons-advanced.ui.h:12 ../data/buttons-programming.ui.h:16
 msgid "Factorial"
 msgstr "��"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:16 ../data/buttons-programming.ui.h:18
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
 msgid "Factorize"
 msgstr "è´¨å? æ?°å??解"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:18 ../data/buttons-programming.ui.h:24
+#: ../data/buttons-advanced.ui.h:16 ../data/buttons-programming.ui.h:24
 msgid "Inverse"
 msgstr "å??ä¸?è§?å?½æ?°"
 
 #. Accessible name for the recall value button
-#: ../data/buttons-advanced.ui.h:20 ../data/buttons-financial.ui.h:72
+#: ../data/buttons-advanced.ui.h:18 ../data/buttons-financial.ui.h:74
 #: ../data/buttons-programming.ui.h:26
 msgid "Recall"
 msgstr "å?¬å??"
 
 #. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:22
+#: ../data/buttons-advanced.ui.h:20
 msgid "Scientific Exponent"
 msgstr "�学"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-financial.ui.h:76
+#: ../data/buttons-advanced.ui.h:22 ../data/buttons-financial.ui.h:78
 #: ../data/buttons-programming.ui.h:32
 msgid "Store"
 msgstr "è®°å¿?"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:26 ../data/buttons-programming.ui.h:34
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:34
 msgid "Subscript"
 msgstr "��"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:28 ../data/buttons-programming.ui.h:36
+#: ../data/buttons-advanced.ui.h:26 ../data/buttons-programming.ui.h:36
 msgid "Superscript"
 msgstr "��"
 
 #. Label on the undo button
 #. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:8
-#: ../data/buttons-financial.ui.h:86
+#: ../data/buttons-advanced.ui.h:28 ../data/buttons-basic.ui.h:8
+#: ../data/buttons-financial.ui.h:88
 msgid "Undo"
 msgstr "æ?¤é??"
 
+#. The label on the memory recall button
+#: ../data/buttons-advanced.ui.h:30
+msgid "â?? R"
+msgstr ""
+
+#. The label on the memory store button
+#: ../data/buttons-advanced.ui.h:32
+msgid "â?? R"
+msgstr ""
+
+#. The label on the memory recall button
+#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
+msgid "&#x2190; R"
+msgstr "&#x2190; R"
+
+#. The label on the memory store button
+#: ../data/buttons-financial.ui.h:6 ../data/buttons-programming.ui.h:4
+msgid "&#x2192; R"
+msgstr "&#x2192; R"
+
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:8
+#: ../data/buttons-financial.ui.h:10
 msgid "C_alculate"
 msgstr "计�(_A)"
 
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:10
+#: ../data/buttons-financial.ui.h:12
 msgid "C_ost:"
 msgstr "æ??æ?¬(_O)ï¼?"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:12
+#: ../data/buttons-financial.ui.h:14
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
 msgstr "计ç®?ä¸?ç¬?贷款ç??å®?æ??ä»?款æ?°é??ï¼?å?¨æ¯?ç¬?ä»?款æ??æ?«æ??ä»?款ã??"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:14
+#: ../data/buttons-financial.ui.h:16
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the Sum-of-the-Years'-Digits method. This method of depreciation "
@@ -138,14 +152,14 @@ msgstr ""
 "æ­¤å??æ??æ¯?å??æ??å??ç??æ?´å¤?æ??æ?§è´¹ç?¨ã??å?¯ç?¨å¹´é??æ??该èµ?产æ??æ?§ç??å?¨æ??(é??常为年)æ?°ã??"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:16
+#: ../data/buttons-financial.ui.h:18
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
 msgstr "计ç®?æ??ä¸?èµ?产å?¨æ??å®?æ??é?´ç??æ??æ?§æ??æ??ï¼?使ç?¨å? å??ä½?é¢?é??å??æ³?ã??"
 
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:18
+#: ../data/buttons-financial.ui.h:20
 msgid ""
 "Calculates the future value of an investment based on a series of equal "
 "payments at a periodic interest rate over the number of payment periods in "
@@ -153,7 +167,7 @@ msgid ""
 msgstr "计ç®?æ??æ??èµ?ç??æ?ªæ?¥å?¼ï¼?æ??约å®?ä»?款æ??æ?°ç??å?ºå®?å?©ç??ä¸?æ¯?æ??ç­?é¢?ä»?款ã??"
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:20
+#: ../data/buttons-financial.ui.h:22
 msgid ""
 "Calculates the number of compounding periods necessary to increase an "
 "investment of present value to a future value, at a fixed interest rate per "
@@ -161,7 +175,7 @@ msgid ""
 msgstr "计ç®?æ??æ??èµ?ç??ç?°å?¼é??è¦?å?°æ??ä¸?æ?ªæ?¥å?¼é??è¦?ç??å¤?å??æ??ï¼?æ??æ¯?å¤?å??æ??å?ºå®?å?©æ?¯ç??ã??"
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:22
+#: ../data/buttons-financial.ui.h:24
 msgid ""
 "Calculates the number of payment periods that are necessary during the term "
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
@@ -169,14 +183,14 @@ msgid ""
 msgstr "计ç®?æ??é??å??æ?®é??å¹´é??积累å?°æ??ä¸?æ?ªæ?¥å?¼é??è¦?ç??ä»?款æ??æ?°ï¼?æ??æ??ä¸?æ¯?æ??å?©ç??ã??"
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:24
+#: ../data/buttons-financial.ui.h:26
 msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
 msgstr "计ç®?æ??æ??èµ?å¢?å? å?°æ??ä¸?æ?ªæ?¥å?¼é??è¦?ç??æ¯?æ??å?©ç??ï¼?æ??å¤?å??æ??æ?°ã??"
 
 #. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:26
+#: ../data/buttons-financial.ui.h:28
 msgid ""
 "Calculates the present value of an investment based on a series of equal "
 "payments discounted at a periodic interest rate over the number of payment "
@@ -184,14 +198,14 @@ msgid ""
 msgstr "计ç®?å?ºäº?ä¸?ç³»å??å¹³ç­?ä»?款ç??æ??èµ?ç?°å?¼å?¨ä»?款å?¨æ??ç??å?¨æ??å?©ç??æ?°å­?ä¸?ç??æ??ç?°ã??    "
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:28
+#: ../data/buttons-financial.ui.h:30
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
 msgstr "计ç®?æ??产å??ç??转å?®ä»·æ ¼ï¼?æ??产å??æ??æ?¬å??æ??æ??ç??æ¯?å?©ç??ã??"
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:30
+#: ../data/buttons-financial.ui.h:32
 msgid ""
 "Calculates the straight-line depreciation of an asset for one period. The "
 "straight-line method of depreciation divides the depreciable cost evenly "
@@ -203,172 +217,172 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:34 ../src/math-buttons.c:261
+#: ../data/buttons-financial.ui.h:36 ../src/math-buttons.c:263
 msgid "Compounding Term"
 msgstr "å¤?å??æ??é??"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: ../data/buttons-financial.ui.h:36
+#: ../data/buttons-financial.ui.h:38
 msgid "Ctrm"
 msgstr "Ctrm"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:38
+#: ../data/buttons-financial.ui.h:40
 msgid "Ddb"
 msgstr "Ddb"
 
 #. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:40
+#: ../data/buttons-financial.ui.h:42
 msgid "Double-Declining Depreciation"
 msgstr "å??å??ä½?é¢?é??å??æ??æ?§"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:44 ../src/math-buttons.c:267
+#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.c:269
 msgid "Future Value"
 msgstr "���"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:46
+#: ../data/buttons-financial.ui.h:48
 msgid "Future _Value:"
 msgstr "���(_V)�"
 
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: ../data/buttons-financial.ui.h:48
+#: ../data/buttons-financial.ui.h:50
 msgid "Fv"
 msgstr "Fv"
 
 #. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: ../data/buttons-financial.ui.h:50
+#: ../data/buttons-financial.ui.h:52
 msgid "Gpm"
 msgstr "Gpm"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:52 ../src/math-buttons.c:288
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:290
 msgid "Gross Profit Margin"
 msgstr "æ¯?å?©ç??"
 
 #. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:54
+#: ../data/buttons-financial.ui.h:56
 msgid "Payment Period"
 msgstr "ä»?款æ??"
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:56 ../src/math-buttons.c:279
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:281
 msgid "Periodic Interest Rate"
 msgstr "æ¯?æ??å?©ç??"
 
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:58
+#: ../data/buttons-financial.ui.h:60
 msgid "Periodic Interest _Rate:"
 msgstr "æ¯?æ??å?©ç??(_R)ï¼?"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:60 ../src/math-buttons.c:285
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:287
 msgid "Periodic Payment"
 msgstr "å®?æ??ä»?款"
 
 #. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: ../data/buttons-financial.ui.h:62
+#: ../data/buttons-financial.ui.h:64
 msgid "Pmt"
 msgstr "Pmt"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:64 ../src/math-buttons.c:282
+#: ../data/buttons-financial.ui.h:66 ../src/math-buttons.c:284
 msgid "Present Value"
 msgstr "ç?°å?¼"
 
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:66
+#: ../data/buttons-financial.ui.h:68
 msgid "Present _Value:"
 msgstr "ç?°å?¼(_V)ï¼?"
 
 #. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: ../data/buttons-financial.ui.h:68
+#: ../data/buttons-financial.ui.h:70
 msgid "Pv"
 msgstr "Pv"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/buttons-financial.ui.h:70
+#: ../data/buttons-financial.ui.h:72
 msgid "Rate"
 msgstr "å?©ç??"
 
 #. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:74
+#: ../data/buttons-financial.ui.h:76
 msgid "Sln"
 msgstr "Sln"
 
 #. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:78
+#: ../data/buttons-financial.ui.h:80
 msgid "Straight-Line Depreciation"
 msgstr "ç?´çº¿æ??æ?§"
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:80
+#: ../data/buttons-financial.ui.h:82
 msgid "Sum-of-the-Years'-Digits Depreciation"
 msgstr "å¹´æ?°æ?»å??æ³?æ??æ?§"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:82
+#: ../data/buttons-financial.ui.h:84
 msgid "Syd"
 msgstr "Syd"
 
 #. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: ../data/buttons-financial.ui.h:84
+#: ../data/buttons-financial.ui.h:86
 msgid "Term"
 msgstr "Term"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:88
+#: ../data/buttons-financial.ui.h:90
 msgid "_Cost:"
 msgstr "æ??æ?¬(_C)ï¼?"
 
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:90
+#: ../data/buttons-financial.ui.h:92
 msgid "_Future Value:"
 msgstr "���(_F)�"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:92
+#: ../data/buttons-financial.ui.h:94
 msgid "_Life:"
 msgstr "å¹´é??(_L)ï¼?"
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:94
+#: ../data/buttons-financial.ui.h:96
 msgid "_Margin:"
 msgstr "�润(_M)�"
 
 #. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:96
+#: ../data/buttons-financial.ui.h:98
 msgid "_Number of Periods:"
 msgstr "æ??æ?°(_N)ï¼?"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:98
+#: ../data/buttons-financial.ui.h:100
 msgid "_Period:"
 msgstr "æ??(_P)ï¼?"
 
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:100
+#: ../data/buttons-financial.ui.h:102
 msgid "_Periodic Payment:"
 msgstr "å®?æ??ä»?款(_P)ï¼?"
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:102
+#: ../data/buttons-financial.ui.h:104
 msgid "_Principal:"
 msgstr "æ?¬é??(_P)ï¼?"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:104
+#: ../data/buttons-financial.ui.h:106
 msgid "_Salvage:"
 msgstr "æ®?å?¼(_S)ï¼?"
 
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:106
+#: ../data/buttons-financial.ui.h:108
 msgid "_Term:"
 msgstr "æ??é??(_T)ï¼?"
 
@@ -384,19 +398,19 @@ msgstr "æ??å?¥å­?符"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:240
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:242
 msgid "Insert Character Code"
 msgstr "æ??å?¥å­?符ç¼?ç ?"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:255
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:257
 msgid "Shift Left"
 msgstr "左移"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:30 ../src/math-buttons.c:258
+#: ../data/buttons-programming.ui.h:30 ../src/math-buttons.c:260
 msgid "Shift Right"
 msgstr "�移"
 
@@ -687,7 +701,7 @@ msgid "South African rand"
 msgstr "å??é??å?°ç?¹"
 
 #. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:76
+#: ../src/gcalctool.c:78
 #, c-format
 msgid ""
 "Usage:\n"
@@ -697,7 +711,7 @@ msgstr ""
 "  %s - ���学计�"
 
 #. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:84
+#: ../src/gcalctool.c:86
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -713,7 +727,7 @@ msgstr ""
 "  -help-gtk\t\tæ?¾ç¤º GTK+ é??项"
 
 #. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:95
+#: ../src/gcalctool.c:97
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -735,7 +749,7 @@ msgstr ""
 "  --g-fatal-warnings             ç»?å?ºæ??æ??é??è¦?è­¦å??"
 
 #. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:109
+#: ../src/gcalctool.c:111
 #, c-format
 msgid ""
 "Application Options:\n"
@@ -747,324 +761,577 @@ msgstr ""
 "  -sï¼?--solve <æ?¹ç¨?>              æ±?解ç»?å?ºç??æ?¹ç¨?"
 
 #. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:154
+#: ../src/gcalctool.c:156
 #, c-format
 msgid "Argument --solve requires an equation to solve"
 msgstr "å??æ?° --solve é??è¦?ä¸?个æ?¹ç¨?以便æ±?解"
 
 #. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:168
+#: ../src/gcalctool.c:170
 #, c-format
 msgid "Unknown argument '%s'"
 msgstr "æ?ªç?¥å??æ?°â??%sâ??"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:108
 msgid "Pi [Ctrl+P]"
 msgstr "å??å?¨ç?? [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:109
+#: ../src/math-buttons.c:111
 msgid "Eulerâ??s Number"
 msgstr "欧æ??æ?°"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.c:116
 msgid "Subscript mode [Alt]"
 msgstr "����模� [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.c:119
 msgid "Superscript mode [Ctrl]"
 msgstr "����模� [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.c:122
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "�学记�� [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.c:125
 msgid "Add [+]"
 msgstr "å? æ³? [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.c:128
 msgid "Subtract [-]"
 msgstr "å??æ³? [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.c:131
 msgid "Multiply [*]"
 msgstr "ä¹?æ³? [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.c:134
 msgid "Divide [/]"
 msgstr "�� [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.c:137
 msgid "Modulus divide"
 msgstr "æ±?ä½?æ?°"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.c:140
 msgid "Additional Functions"
 msgstr "é??å? å?½æ?°"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.c:143
 msgid "Exponent [^ or **]"
 msgstr "ä¹?æ?¹ [^ æ?? **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.c:146
 msgid "Square [Ctrl+2]"
 msgstr "平� [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.c:149
 msgid "Percentage [%]"
 msgstr "ç?¾å??æ?° [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.c:152
 msgid "Factorial [!]"
 msgstr "�� [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.c:155
 msgid "Absolute value [|]"
 msgstr "�对� [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.c:158
 msgid "Complex argument"
 msgstr "å¤?å??é??"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.c:161
 msgid "Complex conjugate"
 msgstr "��轭"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.c:164
 msgid "Root [Ctrl+R]"
 msgstr "æ ¹ [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.c:167
 msgid "Square root [Ctrl+R]"
 msgstr "平�根 [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.c:170
 msgid "Logarithm"
 msgstr "常�对�(以 10 为�)"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.c:173
 msgid "Natural Logarithm"
 msgstr "��对�(以 e 为�)"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.c:176
 msgid "Sine"
 msgstr "正弦"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.c:179
 msgid "Cosine"
 msgstr "�弦"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.c:182
 msgid "Tangent"
 msgstr "æ­£å??"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.c:185
 msgid "Hyperbolic Sine"
 msgstr "å??æ?²æ­£å¼¦"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.c:188
 msgid "Hyperbolic Cosine"
 msgstr "å??æ?²ä½?弦"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.c:191
 msgid "Hyperbolic Tangent"
 msgstr "å??æ?²æ­£å??"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.c:194
 msgid "Inverse [Ctrl+I]"
 msgstr "å??å?½æ?° [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:195
+#: ../src/math-buttons.c:197
 msgid "Boolean AND"
 msgstr "���"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:198
+#: ../src/math-buttons.c:200
 msgid "Boolean OR"
 msgstr "é?»è¾?æ??"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.c:203
 msgid "Boolean Exclusive OR"
 msgstr "é?»è¾?å¼?æ??"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:204
+#: ../src/math-buttons.c:206
 msgid "Boolean NOT"
 msgstr "é?»è¾?é??"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:207 ../src/math-buttons.c:1442
+#: ../src/math-buttons.c:209 ../src/math-buttons.c:1536
 msgid "Integer Component"
 msgstr "å??æ?´æ?°é?¨å??"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:210 ../src/math-buttons.c:1444
+#: ../src/math-buttons.c:212 ../src/math-buttons.c:1538
 msgid "Fractional Component"
 msgstr "å°?æ?°é?¨å??"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.c:215
 msgid "Real Component"
 msgstr "å®?æ?°é?¨å??"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.c:218
 msgid "Imaginary Component"
 msgstr "è??æ?°é?¨å??"
 
 #. Tooltip for the ones complement button
-#: ../src/math-buttons.c:219
+#: ../src/math-buttons.c:221
 msgid "Ones Complement"
 msgstr "1 ç??è¡¥æ?°"
 
 #. Tooltip for the twos complement button
-#: ../src/math-buttons.c:222
+#: ../src/math-buttons.c:224
 msgid "Twos Complement"
 msgstr "2 ç??è¡¥æ?°"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:225
+#: ../src/math-buttons.c:227
 msgid "Truncate"
 msgstr "��"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.c:230
 msgid "Start Group [(]"
 msgstr "起�� [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.c:233
 msgid "End Group [)]"
 msgstr "ç»?æ??ç»? [)]"
 
 #. Tooltip for the assign variable button
-#: ../src/math-buttons.c:234
+#: ../src/math-buttons.c:236
 msgid "Assign Variable"
 msgstr "æ??å®?å??é??"
 
 #. Tooltip for the insert variable button
-#: ../src/math-buttons.c:237
+#: ../src/math-buttons.c:239
 msgid "Insert Variable"
 msgstr "æ??å?¥å??é??"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:243
+#: ../src/math-buttons.c:245
 msgid "Calculate Result"
 msgstr "计ç®?ç»?æ??"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:246
+#: ../src/math-buttons.c:248
 msgid "Factorize [Ctrl+F]"
 msgstr "è´¨å? æ?°å??解 [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:249
+#: ../src/math-buttons.c:251
 msgid "Clear Display [Escape]"
 msgstr "���示 [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:252
+#: ../src/math-buttons.c:254
 msgid "Undo [Ctrl+Z]"
 msgstr "æ?¤é?? [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:264
+#: ../src/math-buttons.c:266
 msgid "Double Declining Depreciation"
 msgstr "å??å??ä½?é¢?é??å??æ??æ?§"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:270
+#: ../src/math-buttons.c:272
 msgid "Financial Term"
 msgstr "财�"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:273
+#: ../src/math-buttons.c:275
 msgid "Sum of the Years Digits Depreciation"
 msgstr "å¹´æ?°æ?»å??æ³?æ??æ?§"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:276
+#: ../src/math-buttons.c:278
 msgid "Straight Line Depreciation"
 msgstr "ç?´çº¿æ??æ?§"
 
-#. Advanced buttons: Angle unit combo box: Use degrees for trigonometric calculations
+#: ../src/math-buttons.c:326
+#, fuzzy
+#| msgid "Angle units"
+msgid "Angle Units"
+msgstr "è§?度å??ä½?"
+
+#. Angle unit
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../src/math-buttons.c:892 ../src/math-preferences.c:255
+#: ../src/math-buttons.c:328 ../src/math-preferences.c:254
 msgid "Degrees"
 msgstr "�度(_G)"
 
-#. Advanced buttons: Angle unit combo box: Use radians for trigonometric calculations
+#. Angle unit
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-buttons.c:896 ../src/math-preferences.c:259
+#: ../src/math-buttons.c:330 ../src/math-preferences.c:258
 msgid "Radians"
 msgstr "弧度"
 
-#. Advanced buttons: Angle unit combo box: Use gradians for trigonometric calculations
+#. Angle unit
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-buttons.c:900 ../src/math-preferences.c:263
+#: ../src/math-buttons.c:332 ../src/math-preferences.c:262
 msgid "Gradians"
 msgstr "ç?¾å??度"
 
+#: ../src/math-buttons.c:334
+#, fuzzy
+#| msgid "Angle units"
+msgid "Length Units"
+msgstr "è§?度å??ä½?"
+
+#. Length unit
+#: ../src/math-buttons.c:336
+msgid "Parsecs"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:338
+msgid "Light Years"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:340
+msgid "Astronomical Unit"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:342
+msgid "Nautical Miles"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:344
+msgid "Miles"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:346
+msgid "Kilometers"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:348
+msgid "Cables"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:350
+msgid "Fathoms"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:352
+msgid "Meters"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:354
+msgid "Yards"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:356
+msgid "Feet"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:358
+#, fuzzy
+#| msgid "Inverse"
+msgid "Inches"
+msgstr "å??ä¸?è§?å?½æ?°"
+
+#. Length unit
+#: ../src/math-buttons.c:360
+#, fuzzy
+#| msgid "_Contents"
+msgid "Centimeters"
+msgstr "å??容(_C)"
+
+#. Length unit
+#: ../src/math-buttons.c:362
+msgid "Millimeters"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:364
+msgid "Micrometers"
+msgstr ""
+
+#. Length unit
+#: ../src/math-buttons.c:366
+msgid "Nanometers"
+msgstr ""
+
+#: ../src/math-buttons.c:368
+#, fuzzy
+#| msgid "Angle units"
+msgid "Area Units"
+msgstr "è§?度å??ä½?"
+
+#. Area unit
+#: ../src/math-buttons.c:370
+msgid "Hectares"
+msgstr ""
+
+#. Area unit
+#: ../src/math-buttons.c:372
+msgid "Acres"
+msgstr ""
+
+#. Area unit
+#: ../src/math-buttons.c:374
+msgid "m²"
+msgstr ""
+
+#. Area unit
+#: ../src/math-buttons.c:376
+msgid "cm²"
+msgstr ""
+
+#. Area unit
+#: ../src/math-buttons.c:378
+msgid "mm²"
+msgstr ""
+
+#: ../src/math-buttons.c:380
+#, fuzzy
+#| msgid "Angle units"
+msgid "Volume Units"
+msgstr "è§?度å??ä½?"
+
+#. Volume unit
+#: ../src/math-buttons.c:382
+msgid "m³"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:384
+msgid "Gallons"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:386
+msgid "Liters"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:388
+msgid "Quarts"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:390
+msgid "Pints"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:392
+msgid "Milliliters"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:394
+msgid "cm³"
+msgstr ""
+
+#. Volume unit
+#: ../src/math-buttons.c:396
+msgid "mm³"
+msgstr ""
+
+#: ../src/math-buttons.c:398
+msgid "Weight Units"
+msgstr ""
+
+#. Weight unit
+#: ../src/math-buttons.c:400
+msgid "Tonnes"
+msgstr ""
+
+#. Weight unit
+#: ../src/math-buttons.c:402
+msgid "Kilograms"
+msgstr ""
+
+#. Weight unit
+#: ../src/math-buttons.c:404
+#, fuzzy
+#| msgid "Round"
+msgid "Pounds"
+msgstr "��"
+
+#. Weight unit
+#: ../src/math-buttons.c:406
+msgid "Ounces"
+msgstr ""
+
+#. Weight unit
+#: ../src/math-buttons.c:408
+#, fuzzy
+#| msgid "Gradians"
+msgid "Grams"
+msgstr "ç?¾å??度"
+
+#: ../src/math-buttons.c:410
+msgid "Time Units"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:412
+#, fuzzy
+#| msgid "Clear"
+msgid "Years"
+msgstr "��"
+
+#. Time unit
+#: ../src/math-buttons.c:414
+msgid "Days"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:416
+msgid "Hours"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:418
+msgid "Minutes"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:420
+msgid "Seconds"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:422
+msgid "Milliseconds"
+msgstr ""
+
+#. Time unit
+#: ../src/math-buttons.c:424
+msgid "Microseconds"
+msgstr ""
+
+#. Translators: first and third %s are currency symbols, second and fourth are amounts in these currencies, you may want to change the order of these, example: $100 = â?¬100
+#: ../src/math-buttons.c:605
+#, c-format
+msgid "%s%s = %s%s"
+msgstr ""
+
 #. Number display mode combo: Binary, e.g. 10011010010â??
-#: ../src/math-buttons.c:934
+#: ../src/math-buttons.c:1026
 msgid "Binary"
 msgstr "���"
 
 #. Number display mode combo: Octal, e.g. 2322â??
-#: ../src/math-buttons.c:938
+#: ../src/math-buttons.c:1030
 msgid "Octal"
 msgstr "å?«è¿?å?¶"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:942
+#: ../src/math-buttons.c:1034
 msgid "Decimal"
 msgstr "å??è¿?å?¶"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2â??â??
-#: ../src/math-buttons.c:946
+#: ../src/math-buttons.c:1038
 msgid "Hexadecimal"
 msgstr "å??å?­è¿?å?¶"
 
 #. Text shown in store menu when no variables defined
 #. Text shown in recall menu when no variables defined
-#: ../src/math-buttons.c:1263 ../src/math-buttons.c:1309
+#: ../src/math-buttons.c:1357 ../src/math-buttons.c:1403
 msgid "No variables defined"
 msgstr "æ?ªå®?ä¹?å??é??"
 
 #. Left Shift Popup: Menu item to shift left by n places (n < 10)
 #. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:1352 ../src/math-buttons.c:1396
+#: ../src/math-buttons.c:1446 ../src/math-buttons.c:1490
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1072,116 +1339,116 @@ msgstr[0] "_%d ä½?"
 
 #. Left Shift Popup: Menu item to shift left by n places (n >= 10)
 #. Right Shift Popup: Menu item to shift right by n places (n >= 10)
-#: ../src/math-buttons.c:1356 ../src/math-buttons.c:1400
+#: ../src/math-buttons.c:1450 ../src/math-buttons.c:1494
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
 msgstr[0] "%d ä½?"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1446
+#: ../src/math-buttons.c:1540
 msgid "Round"
 msgstr "��"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1448
+#: ../src/math-buttons.c:1542
 msgid "Floor"
 msgstr "ä¸?é??"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1450
+#: ../src/math-buttons.c:1544
 msgid "Ceiling"
 msgstr "ä¸?é??"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1452
+#: ../src/math-buttons.c:1546
 msgid "Sign"
 msgstr "符�"
 
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:496
+#: ../src/math-equation.c:349
 msgid "No undo history"
 msgstr "æ? æ?¤é??è®°å½?"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:521
+#: ../src/math-equation.c:374
 msgid "No redo history"
 msgstr "æ? é??å??è®°å½?"
 
-#: ../src/math-equation.c:845
+#: ../src/math-equation.c:700
 msgid "No sane value to store"
 msgstr "没æ??è¦?å­?å?¨ç??æ ?å??å?¼"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1105
+#: ../src/math-equation.c:955
 msgid "Overflow. Try a bigger word size"
 msgstr "溢å?ºã??请å°?è¯?ä¸?个æ?´å¤§ç??å­?é?¿"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1110
+#: ../src/math-equation.c:960
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "æ?ªç?¥å??é??â??%sâ??"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1115
+#: ../src/math-equation.c:965
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "å?½æ?°â??%sâ??æ?ªå®?ä¹?"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1120
+#: ../src/math-equation.c:970
 msgid "Unknown conversion"
 msgstr "��转�"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1129
+#: ../src/math-equation.c:979
 msgid "Malformed expression"
 msgstr "æ ¼å¼?é??误ç??表达å¼?"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1152
+#: ../src/math-equation.c:1108
 msgid "Need an integer to factorize"
 msgstr "å??解å? å¼?è¿?ç®?é??è¦?ä¸?个æ?´æ?°"
 
 #. This message is displayed in the status bar when a bit
 #. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1229
+#: ../src/math-equation.c:1175
 msgid "No sane value to bitwise shift"
 msgstr "没æ??正常æ?°å?¼å?¯ç?¨äº?移ä½?"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1258
+#: ../src/math-equation.c:1204
 msgid "Displayed value not an integer"
 msgstr "æ?¾ç¤ºç??å?¼ä¸?æ?¯æ?´æ?°"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1648
+#: ../src/math-equation.c:1602
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
-msgstr "é?¶,ä¸?,äº?,ä¸?,å??,äº?,å?­,ä¸?,å?«,ä¹?,å??,A,B,C,D,E,F"
+msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
 #. Label on close button in preferences dialog
-#: ../src/math-preferences.c:245
+#: ../src/math-preferences.c:244
 msgid "_Close"
 msgstr "��(_C)�"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:273
+#: ../src/math-preferences.c:272
 msgid "Fixed"
 msgstr "���"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã?10^3
-#: ../src/math-preferences.c:277
+#: ../src/math-preferences.c:276
 msgid "Scientific"
 msgstr "�学"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:281
+#: ../src/math-preferences.c:280
 msgid "Engineering"
 msgstr "工�"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:292
+#: ../src/math-preferences.c:291
 #, c-format
 msgid "Show %d decimal _places"
 msgstr "æ?¾ç¤º %d 个å??è¿?å?¶ä½?(_P)"
@@ -1291,27 +1558,27 @@ msgid "_Contents"
 msgstr "å??容(_C)"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:103
+#: ../src/mp-binary.c:108
 msgid "Boolean AND is only defined for positive integers"
 msgstr "������对正����"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:116
+#: ../src/mp-binary.c:121
 msgid "Boolean OR is only defined for positive integers"
 msgstr "é?»è¾?æ??è¿?ç®?å?ªå¯¹æ­£æ?´æ?°å®?ä¹?"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:129
+#: ../src/mp-binary.c:134
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "é?»è¾?å¼?æ??è¿?ç®?å?ªå¯¹æ­£æ?´æ?°å®?ä¹?"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:144
+#: ../src/mp-binary.c:149
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "é?»è¾?é??è¿?ç®?å?ªå¯¹æ­£æ?´æ?°å®?ä¹?"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:174
+#: ../src/mp-binary.c:180
 msgid "Shift is only possible on integer values"
 msgstr "��对�����移���"
 
@@ -1320,44 +1587,48 @@ msgstr "��对�����移���"
 msgid "Argument not defined for zero"
 msgstr "å??æ?°å?¼ä¸?è?½ä¸ºé?¶"
 
+#: ../src/mp.c:300
+msgid "Overflow: the result couldn't be calculated"
+msgstr ""
+
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:636 ../src/mp.c:668 ../src/mp.c:1602
+#: ../src/mp.c:645 ../src/mp.c:677 ../src/mp.c:1611
 msgid "Division by zero is undefined"
 msgstr "被�����"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1273 ../src/mp.c:1310
+#: ../src/mp.c:1282 ../src/mp.c:1319
 msgid "Logarithm of zero is undefined"
 msgstr "é?¶ç??对æ?°æ?ªå®?ä¹?"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1675 ../src/mp.c:1990
+#: ../src/mp.c:1684 ../src/mp.c:1999
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "对é?¶è¿?è¡?æ±?å¹?è¿?ç®?ï¼?å½?æ??æ?°ä¸ºè´?æ?¶æ? æ??ä¹?"
 
-#: ../src/mp.c:1700
+#: ../src/mp.c:1709
 msgid "Reciprocal of zero is undefined"
 msgstr "对é?¶æ±?å??æ?°æ? æ??ä¹?"
 
-#: ../src/mp.c:1785
+#: ../src/mp.c:1794
 msgid "Root must be non-zero"
 msgstr "根次æ?¹æ?°å¿?é??为é??é?¶å?¼"
 
-#: ../src/mp.c:1803
+#: ../src/mp.c:1812
 msgid "Negative root of zero is undefined"
 msgstr "é?¶ç??è´?æ?°æ¬¡æ?¹æ ¹æ? æ??ä¹?"
 
-#: ../src/mp.c:1809
+#: ../src/mp.c:1818
 msgid "nth root of negative number is undefined for even n"
 msgstr "对è´?æ?°æ±?å?¶æ¬¡æ?¹æ ¹æ? æ??ä¹?"
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1930
+#: ../src/mp.c:1939
 msgid "Factorial is only defined for natural numbers"
 msgstr "é?¶ä¹?è¿?ç®?ä»?对è?ªç?¶æ?°æ??å®?ä¹?"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1950
+#: ../src/mp.c:1959
 msgid "Modulus division is only defined for integers"
 msgstr "å??模è¿?ç®?ä»?对æ?´æ?°æ??æ??ä¹?"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]