[gcalctool] update zh_CN translation



commit 3ef28fc692fb3594c4b8cbe0c2f8297b050c2d8c
Author: lainme <lainme993 gmail com>
Date:   Mon Aug 8 15:39:41 2011 +0800

    update zh_CN translation

 po/zh_CN.po |  401 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 216 insertions(+), 185 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2994ebd..05dbd10 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,9 +18,9 @@ msgstr ""
 "Project-Id-Version: gcalctool master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gcalctool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-18 04:42+0000\n"
-"PO-Revision-Date: 2011-04-10 14:20+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"POT-Creation-Date: 2011-08-06 19:58+0000\n"
+"PO-Revision-Date: 2011-08-08 13:43+0800\n"
+"Last-Translator: ææ <bill_zt sina com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgstr "åææååæ"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
-#: ../src/math-buttons.c:223
+#: ../src/math-buttons.c:224
 msgid "Memory"
 msgstr "èå"
 
@@ -188,7 +188,7 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:247
+#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:248
 msgid "Compounding Term"
 msgstr "ååææ"
 
@@ -209,7 +209,7 @@ msgstr "ååäééåææ"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:253
+#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:254
 msgid "Future Value"
 msgstr "ææå"
 
@@ -230,7 +230,7 @@ msgstr "Gpm"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:274
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:275
 msgid "Gross Profit Margin"
 msgstr "æåç"
 
@@ -241,7 +241,7 @@ msgstr "äææ"
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:265
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:266
 msgid "Periodic Interest Rate"
 msgstr "ææåç"
 
@@ -252,7 +252,7 @@ msgstr "ææåç(_R)ï"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:271
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:272
 msgid "Periodic Payment"
 msgstr "ææäæé"
 
@@ -263,7 +263,7 @@ msgstr "Pmt"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:268
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:269
 msgid "Present Value"
 msgstr "çå"
 
@@ -369,19 +369,19 @@ msgstr "æååç"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:226
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:227
 msgid "Insert Character Code"
 msgstr "æååççç"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:241
+#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:242
 msgid "Shift Left"
 msgstr "åç"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:244
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:245
 msgid "Shift Right"
 msgstr "åç"
 
@@ -446,7 +446,7 @@ msgid "_Angle units:"
 msgstr "èååä(_A)ï"
 
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:514
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:546
 msgid "Calculator"
 msgstr "èçå"
 
@@ -585,212 +585,220 @@ msgid "Canadian Dollar"
 msgstr "åæåå"
 
 #: ../src/currency-manager.c:38
+msgid "CFA Franc"
+msgstr "äéæé"
+
+#: ../src/currency-manager.c:39
 msgid "Swiss Franc"
 msgstr "çåæé"
 
-#: ../src/currency-manager.c:39
+#: ../src/currency-manager.c:40
 msgid "Chilean Peso"
 msgstr "æåæç"
 
-#: ../src/currency-manager.c:40
+#: ../src/currency-manager.c:41
 msgid "Chinese Yuan"
 msgstr "äæå"
 
-#: ../src/currency-manager.c:41
+#: ../src/currency-manager.c:42
 msgid "Colombian Peso"
 msgstr "åäæäæç"
 
-#: ../src/currency-manager.c:42
+#: ../src/currency-manager.c:43
 msgid "Czech Koruna"
 msgstr "æååæ"
 
-#: ../src/currency-manager.c:43
+#: ../src/currency-manager.c:44
 msgid "Danish Krone"
 msgstr "äéåæ"
 
-#: ../src/currency-manager.c:44
+#: ../src/currency-manager.c:45
 msgid "Algerian Dinar"
 msgstr "éåååäççå"
 
-#: ../src/currency-manager.c:45
+#: ../src/currency-manager.c:46
 msgid "Estonian Kroon"
 msgstr "çæåäåæ"
 
-#: ../src/currency-manager.c:46
+#: ../src/currency-manager.c:47
 msgid "Euro"
 msgstr "æå"
 
-#: ../src/currency-manager.c:47
+#: ../src/currency-manager.c:48
 msgid "Pound Sterling"
 msgstr "èé"
 
-#: ../src/currency-manager.c:48
+#: ../src/currency-manager.c:49
 msgid "Hong Kong Dollar"
 msgstr "æå"
 
-#: ../src/currency-manager.c:49
+#: ../src/currency-manager.c:50
 msgid "Croatian Kuna"
 msgstr "åçåäåç"
 
-#: ../src/currency-manager.c:50
+#: ../src/currency-manager.c:51
 msgid "Hungarian Forint"
 msgstr "åçåçæ"
 
-#: ../src/currency-manager.c:51
+#: ../src/currency-manager.c:52
 msgid "Indonesian Rupiah"
 msgstr "åååèäåæ"
 
-#: ../src/currency-manager.c:52
+#: ../src/currency-manager.c:53
 msgid "Israeli New Shekel"
 msgstr "äèåæèåå"
 
-#: ../src/currency-manager.c:53
+#: ../src/currency-manager.c:54
 msgid "Indian Rupee"
 msgstr "åååæ"
 
-#: ../src/currency-manager.c:54
+#: ../src/currency-manager.c:55
 msgid "Iranian Rial"
 msgstr "äæéäå"
 
-#: ../src/currency-manager.c:55
+#: ../src/currency-manager.c:56
 msgid "Icelandic Krona"
 msgstr "åååæ"
 
-#: ../src/currency-manager.c:56
+#: ../src/currency-manager.c:57
 msgid "Japanese Yen"
 msgstr "æå"
 
-#: ../src/currency-manager.c:57
+#: ../src/currency-manager.c:58
 msgid "South Korean Won"
 msgstr "éå"
 
-#: ../src/currency-manager.c:58
+#: ../src/currency-manager.c:59
 msgid "Kuwaiti Dinar"
 msgstr "çåçççå"
 
-#: ../src/currency-manager.c:59
+#: ../src/currency-manager.c:60
 msgid "Kazakhstani Tenge"
 msgstr "åèåæåèæ"
 
-#: ../src/currency-manager.c:60
+#: ../src/currency-manager.c:61
 msgid "Sri Lankan Rupee"
 msgstr "æéåååæ"
 
-#: ../src/currency-manager.c:61
+#: ../src/currency-manager.c:62
 msgid "Lithuanian Litas"
 msgstr "çéåçç"
 
-#: ../src/currency-manager.c:62
+#: ../src/currency-manager.c:63
 msgid "Latvian Lats"
 msgstr "æèçäæç"
 
-#: ../src/currency-manager.c:63
+#: ../src/currency-manager.c:64
 msgid "Libyan Dinar"
 msgstr "åæäççå"
 
-#: ../src/currency-manager.c:64
+#: ../src/currency-manager.c:65
 msgid "Mauritian Rupee"
 msgstr "æéææåæ"
 
-#: ../src/currency-manager.c:65
+#: ../src/currency-manager.c:66
 msgid "Mexican Peso"
 msgstr "åèåæç"
 
-#: ../src/currency-manager.c:66
+#: ../src/currency-manager.c:67
 msgid "Malaysian Ringgit"
 msgstr "éæèäæåç"
 
-#: ../src/currency-manager.c:67
+#: ../src/currency-manager.c:68
 msgid "Norwegian Krone"
 msgstr "æååæ"
 
-#: ../src/currency-manager.c:68
+#: ../src/currency-manager.c:69
 msgid "Nepalese Rupee"
 msgstr "åæååæ"
 
-#: ../src/currency-manager.c:69
+#: ../src/currency-manager.c:70
 msgid "New Zealand Dollar"
 msgstr "æèåå"
 
-#: ../src/currency-manager.c:70
+#: ../src/currency-manager.c:71
 msgid "Omani Rial"
 msgstr "éæéäå"
 
-#: ../src/currency-manager.c:71
+#: ../src/currency-manager.c:72
 msgid "Peruvian Nuevo Sol"
 msgstr "çéæçå"
 
-#: ../src/currency-manager.c:72
+#: ../src/currency-manager.c:73
 msgid "Philippine Peso"
 msgstr "èååæç"
 
-#: ../src/currency-manager.c:73
+#: ../src/currency-manager.c:74
 msgid "Pakistani Rupee"
 msgstr "ååæååæ"
 
-#: ../src/currency-manager.c:74
+#: ../src/currency-manager.c:75
 msgid "Polish Zloty"
 msgstr "æååçæ"
 
-#: ../src/currency-manager.c:75
+#: ../src/currency-manager.c:76
 msgid "Qatari Riyal"
 msgstr "åååéäå"
 
-#: ../src/currency-manager.c:76
+#: ../src/currency-manager.c:77
 msgid "New Romanian Leu"
 msgstr "æçéåäåä"
 
-#: ../src/currency-manager.c:77
+#: ../src/currency-manager.c:78
 msgid "Russian Rouble"
 msgstr "äçæåå"
 
-#: ../src/currency-manager.c:78
+#: ../src/currency-manager.c:79
 msgid "Saudi Riyal"
 msgstr "æçéäå"
 
 # çååé
-#: ../src/currency-manager.c:79
+#: ../src/currency-manager.c:80
 msgid "Swedish Krona"
 msgstr "çååæ"
 
-#: ../src/currency-manager.c:80
+#: ../src/currency-manager.c:81
 msgid "Singapore Dollar"
 msgstr "æååå"
 
-#: ../src/currency-manager.c:81
+#: ../src/currency-manager.c:82
 msgid "Thai Baht"
 msgstr "æé"
 
-#: ../src/currency-manager.c:82
+#: ../src/currency-manager.c:83
 msgid "Tunisian Dinar"
 msgstr "çåæççå"
 
 # åèåæéæ
-#: ../src/currency-manager.c:83
+#: ../src/currency-manager.c:84
 msgid "New Turkish Lira"
 msgstr "æåååéæ"
 
 # Trinidad and Tobago Dollar
-#: ../src/currency-manager.c:84
+#: ../src/currency-manager.c:85
 msgid "T&T Dollar (TTD)"
 msgstr "ççåèååååå"
 
-#: ../src/currency-manager.c:85
+#: ../src/currency-manager.c:86
 msgid "US Dollar"
 msgstr "çå"
 
-#: ../src/currency-manager.c:86
+#: ../src/currency-manager.c:87
 msgid "Uruguayan Peso"
 msgstr "äæåæç"
 
-#: ../src/currency-manager.c:87
+#: ../src/currency-manager.c:88
 msgid "Venezuelan BolÃvar"
 msgstr "ååçæçåçå"
 
-#: ../src/currency-manager.c:88
+#: ../src/currency-manager.c:89
 msgid "South African Rand"
 msgstr "åéåç"
 
+#: ../src/financial.c:70
+msgid "Error: the number of periods must be positive"
+msgstr "éèïåæåéäææ"
+
 #. Description on how to use gcalctool displayed on command-line
 #: ../src/gcalctool.c:77
 #, c-format
@@ -862,278 +870,278 @@ msgid "Unknown argument '%s'"
 msgstr "æçåæâ%sâ"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:95
+#: ../src/math-buttons.c:96
 msgid "Pi [Ctrl+P]"
 msgstr "ååç [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:98
+#: ../src/math-buttons.c:99
 msgid "Eulerâs Number"
 msgstr "æææ"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:103
+#: ../src/math-buttons.c:104
 msgid "Subscript mode [Alt]"
 msgstr "äææå [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:107
 msgid "Superscript mode [Ctrl]"
 msgstr "äææå [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:109
+#: ../src/math-buttons.c:110
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "çåèææ [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:112
+#: ../src/math-buttons.c:113
 msgid "Add [+]"
 msgstr "åæ [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:115
+#: ../src/math-buttons.c:116
 msgid "Subtract [-]"
 msgstr "åæ [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:118
+#: ../src/math-buttons.c:119
 msgid "Multiply [*]"
 msgstr "äæ [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:121
+#: ../src/math-buttons.c:122
 msgid "Divide [/]"
 msgstr "éæ [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:124
+#: ../src/math-buttons.c:125
 msgid "Modulus divide"
 msgstr "æäæ"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:127
+#: ../src/math-buttons.c:128
 msgid "Additional Functions"
 msgstr "éååæ"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:130
+#: ../src/math-buttons.c:131
 msgid "Exponent [^ or **]"
 msgstr "äæ [^ æ **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:133
+#: ../src/math-buttons.c:134
 msgid "Square [Ctrl+2]"
 msgstr "åæ [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:136
+#: ../src/math-buttons.c:137
 msgid "Percentage [%]"
 msgstr "çåæ [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:139
+#: ../src/math-buttons.c:140
 msgid "Factorial [!]"
 msgstr "éä [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:142
+#: ../src/math-buttons.c:143
 msgid "Absolute value [|]"
 msgstr "çåå [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:145
+#: ../src/math-buttons.c:146
 msgid "Complex argument"
 msgstr "ååé"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:148
+#: ../src/math-buttons.c:149
 msgid "Complex conjugate"
 msgstr "ååè"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:151
+#: ../src/math-buttons.c:152
 msgid "Root [Ctrl+R]"
 msgstr "æ [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:154
+#: ../src/math-buttons.c:155
 msgid "Square root [Ctrl+R]"
 msgstr "åææ [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:157
+#: ../src/math-buttons.c:158
 msgid "Logarithm"
 msgstr "åçåæ(ä 10 äå)"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:160
+#: ../src/math-buttons.c:161
 msgid "Natural Logarithm"
 msgstr "èçåæ(ä e äå)"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:163
+#: ../src/math-buttons.c:164
 msgid "Sine"
 msgstr "æå"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:166
+#: ../src/math-buttons.c:167
 msgid "Cosine"
 msgstr "äå"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:169
+#: ../src/math-buttons.c:170
 msgid "Tangent"
 msgstr "æå"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:172
+#: ../src/math-buttons.c:173
 msgid "Hyperbolic Sine"
 msgstr "åææå"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:175
+#: ../src/math-buttons.c:176
 msgid "Hyperbolic Cosine"
 msgstr "åæäå"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:178
+#: ../src/math-buttons.c:179
 msgid "Hyperbolic Tangent"
 msgstr "åææå"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:181
+#: ../src/math-buttons.c:182
 msgid "Inverse [Ctrl+I]"
 msgstr "ååææåæ [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:184
+#: ../src/math-buttons.c:185
 msgid "Boolean AND"
 msgstr "éèä"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:187
+#: ../src/math-buttons.c:188
 msgid "Boolean OR"
 msgstr "éèæ"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:190
+#: ../src/math-buttons.c:191
 msgid "Boolean Exclusive OR"
 msgstr "éèåæ"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:193
+#: ../src/math-buttons.c:194
 msgid "Boolean NOT"
 msgstr "éèé"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:196 ../src/math-buttons.c:1028
+#: ../src/math-buttons.c:197 ../src/math-buttons.c:1038
 msgid "Integer Component"
 msgstr "ææéå"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:199 ../src/math-buttons.c:1030
+#: ../src/math-buttons.c:200 ../src/math-buttons.c:1040
 msgid "Fractional Component"
 msgstr "åæéå"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:202
+#: ../src/math-buttons.c:203
 msgid "Real Component"
 msgstr "åæéå"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:205
+#: ../src/math-buttons.c:206
 msgid "Imaginary Component"
 msgstr "èæéå"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:208
+#: ../src/math-buttons.c:209
 msgid "Ones' Complement"
 msgstr "åç"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:211
+#: ../src/math-buttons.c:212
 msgid "Two's Complement"
 msgstr "èç"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:214
+#: ../src/math-buttons.c:215
 msgid "Truncate"
 msgstr "ææ"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:217
+#: ../src/math-buttons.c:218
 msgid "Start Group [(]"
 msgstr "ååç [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:220
+#: ../src/math-buttons.c:221
 msgid "End Group [)]"
 msgstr "çæç [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:229
+#: ../src/math-buttons.c:230
 msgid "Calculate Result"
 msgstr "èççæ"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:232
+#: ../src/math-buttons.c:233
 msgid "Factorize [Ctrl+F]"
 msgstr "èåæåè [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:235
+#: ../src/math-buttons.c:236
 msgid "Clear Display [Escape]"
 msgstr "æéæç [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:238
+#: ../src/math-buttons.c:239
 msgid "Undo [Ctrl+Z]"
 msgstr "æé [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:250
+#: ../src/math-buttons.c:251
 msgid "Double Declining Depreciation"
 msgstr "ååäééåææ"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:256
+#: ../src/math-buttons.c:257
 msgid "Financial Term"
 msgstr "èå"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:259
+#: ../src/math-buttons.c:260
 msgid "Sum of the Years Digits Depreciation"
 msgstr "åææåæææ"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:262
+#: ../src/math-buttons.c:263
 msgid "Straight Line Depreciation"
 msgstr "ççææ"
 
 #. Number display mode combo: Binary, e.g. 10011010010â
-#: ../src/math-buttons.c:652
+#: ../src/math-buttons.c:653
 msgid "Binary"
 msgstr "äèå"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:656
+#: ../src/math-buttons.c:657
 msgid "Octal"
 msgstr "åèå"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:660
+#: ../src/math-buttons.c:661
 msgid "Decimal"
 msgstr "åèå"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:664
+#: ../src/math-buttons.c:665
 msgid "Hexadecimal"
 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:938 ../src/math-buttons.c:982
+#: ../src/math-buttons.c:948 ../src/math-buttons.c:992
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1141,96 +1149,105 @@ 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:942 ../src/math-buttons.c:986
+#: ../src/math-buttons.c:952 ../src/math-buttons.c:996
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
 msgstr[0] "%d ä"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1032
+#: ../src/math-buttons.c:1042
 msgid "Round"
 msgstr "èå"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1034
+#: ../src/math-buttons.c:1044
 msgid "Floor"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1036
+#: ../src/math-buttons.c:1046
 msgid "Ceiling"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1038
+#: ../src/math-buttons.c:1048
 msgid "Sign"
 msgstr "çå"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:354
+#: ../src/math-converter.c:412
 msgid " in "
 msgstr " æçä "
 
+#. Tooltip for swap conversion button
+#: ../src/math-converter.c:427
+msgid "Switch conversion units"
+msgstr "èæåä"
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:453
+#: ../src/math-equation.c:458
 msgid "No undo history"
 msgstr "ææéèå"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:478
+#: ../src/math-equation.c:485
 msgid "No redo history"
 msgstr "æéåèå"
 
-#: ../src/math-equation.c:867
+#: ../src/math-equation.c:943
 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:1132
+#: ../src/math-equation.c:1225
 msgid "Overflow. Try a bigger word size"
 msgstr "æåãèåèääæåçåé"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1137
+#: ../src/math-equation.c:1230
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "æçåéâ%sâ"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1142
+#: ../src/math-equation.c:1235
 #, 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:1147
+#: ../src/math-equation.c:1240
 msgid "Unknown conversion"
 msgstr "æçèæ"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1156
+#: ../src/math-equation.c:1249
 msgid "Malformed expression"
 msgstr "èèåæåéè"
 
+#: ../src/math-equation.c:1263
+msgid "Calculating"
+msgstr "èç"
+
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1288
+#: ../src/math-equation.c:1394
 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:1355
+#: ../src/math-equation.c:1469
 msgid "No sane value to bitwise shift"
 msgstr "æææåæååçäçä"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1384
+#: ../src/math-equation.c:1500
 msgid "Displayed value not an integer"
 msgstr "æççåäæææ"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1807
+#: ../src/math-equation.c:1925
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
@@ -1282,12 +1299,12 @@ msgid "Show %d decimal _places"
 msgstr "æç %d äåèåä(_P)"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:163
+#: ../src/math-window.c:172
 msgid "Unable to open help file"
 msgstr "æææåååæä"
 
 #. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:195
+#: ../src/math-window.c:204
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang linux net cn>, 2003, 2004\n"
@@ -1302,7 +1319,7 @@ msgstr ""
 "ææ <bill_zt sina com>, 2010"
 
 #. The license this software is under (GPL2+)
-#: ../src/math-window.c:198
+#: ../src/math-window.c:207
 msgid ""
 "Gcalctool is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1332,57 +1349,57 @@ msgstr ""
 "330, Boston, MA 02111-1307, USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:215
+#: ../src/math-window.c:224
 msgid "Gcalctool"
 msgstr "Gcalctool"
 
 #. Copyright notice in the about dialog
-#: ../src/math-window.c:219
+#: ../src/math-window.c:228
 msgid "Â 1986â2010 The Gcalctool authors"
 msgstr "Â 1986-2010 Gcalctool äè"
 
 #. Short description in the about dialog
-#: ../src/math-window.c:223
+#: ../src/math-window.c:232
 msgid "Calculator with financial and scientific modes."
 msgstr "åæèååçåæåçèçåã"
 
 #. Calculator menu
-#: ../src/math-window.c:349
+#: ../src/math-window.c:381
 msgid "_Calculator"
 msgstr "èçå(_C)"
 
 #. Mode menu
-#: ../src/math-window.c:351
+#: ../src/math-window.c:383
 msgid "_Mode"
 msgstr "æå(_M)"
 
 #. Help menu label
-#: ../src/math-window.c:353
+#: ../src/math-window.c:385
 msgid "_Help"
 msgstr "åå(_H)"
 
 #. Basic menu label
-#: ../src/math-window.c:355
+#: ../src/math-window.c:387
 msgid "_Basic"
 msgstr "åæ(_B)"
 
 #. Advanced menu label
-#: ../src/math-window.c:357
+#: ../src/math-window.c:389
 msgid "_Advanced"
 msgstr "éç(_A)"
 
 #. Financial menu label
-#: ../src/math-window.c:359
+#: ../src/math-window.c:391
 msgid "_Financial"
 msgstr "èå(_F)"
 
 #. Programming menu label
-#: ../src/math-window.c:361
+#: ../src/math-window.c:393
 msgid "_Programming"
 msgstr "çç(_P)"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:395
 msgid "_Contents"
 msgstr "åå(_C)"
 
@@ -1421,43 +1438,43 @@ msgid "Overflow: the result couldn't be calculated"
 msgstr "æåïèçæææèç"
 
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:644 ../src/mp.c:676 ../src/mp.c:1610
+#: ../src/mp.c:644 ../src/mp.c:676 ../src/mp.c:1605
 msgid "Division by zero is undefined"
 msgstr "èééæåä"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1281 ../src/mp.c:1318
+#: ../src/mp.c:1276 ../src/mp.c:1313
 msgid "Logarithm of zero is undefined"
 msgstr "éçåææåä"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1683 ../src/mp.c:1998
+#: ../src/mp.c:1680 ../src/mp.c:1994
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "èæçéæåæåä"
 
-#: ../src/mp.c:1708
+#: ../src/mp.c:1704
 msgid "Reciprocal of zero is undefined"
 msgstr "åéæåæææä"
 
-#: ../src/mp.c:1793
+#: ../src/mp.c:1789
 msgid "Root must be non-zero"
 msgstr "ææææåéäééå"
 
-#: ../src/mp.c:1811
+#: ../src/mp.c:1807
 msgid "Negative root of zero is undefined"
 msgstr "éçèææææææä"
 
-#: ../src/mp.c:1817
+#: ../src/mp.c:1813
 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:1938
+#: ../src/mp.c:1934
 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:1958
+#: ../src/mp.c:1954
 msgid "Modulus division is only defined for integers"
 msgstr "åæèçäåææææä"
 
@@ -1570,16 +1587,16 @@ msgstr "au"
 msgid "Nautical Miles"
 msgstr "æé"
 
-#: ../src/unit-manager.c:60 ../src/unit-manager.c:72
+#: ../src/unit-manager.c:60
 #, c-format
 msgctxt "unit-format"
-msgid "%s nm"
-msgstr "%s nm"
+msgid "%s nmi"
+msgstr "%s nmi"
 
 #: ../src/unit-manager.c:60
 msgctxt "unit-symbols"
-msgid "nm"
-msgstr "nm"
+msgid "nmi"
+msgstr "nmi"
 
 #: ../src/unit-manager.c:61
 msgid "Miles"
@@ -1751,9 +1768,15 @@ msgid "Nanometers"
 msgstr "çç"
 
 #: ../src/unit-manager.c:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
+
+#: ../src/unit-manager.c:72
 msgctxt "unit-symbols"
-msgid "nanometer,nanometers"
-msgstr "nanometer,nanometers"
+msgid "nanometer,nanometers,nm"
+msgstr "nanometer,nanometers,nm"
 
 #: ../src/unit-manager.c:73
 msgid "Hectares"
@@ -1786,7 +1809,7 @@ msgid "acre,acres"
 msgstr "acre,acres"
 
 #: ../src/unit-manager.c:75
-msgid "Square Meter"
+msgid "Square Meters"
 msgstr "åæç"
 
 #: ../src/unit-manager.c:75
@@ -1801,7 +1824,7 @@ msgid "mÂ"
 msgstr "mÂ"
 
 #: ../src/unit-manager.c:76
-msgid "Square Centimeter"
+msgid "Square Centimeters"
 msgstr "åæåç"
 
 #: ../src/unit-manager.c:76
@@ -1816,7 +1839,7 @@ msgid "cmÂ"
 msgstr "cmÂ"
 
 #: ../src/unit-manager.c:77
-msgid "Square Millimeter"
+msgid "Square Millimeters"
 msgstr "åææç"
 
 #: ../src/unit-manager.c:77
@@ -1921,7 +1944,7 @@ msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
 msgstr "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
 
 #: ../src/unit-manager.c:84
-msgid "Microlitre"
+msgid "Microlitres"
 msgstr "åå"
 
 #: ../src/unit-manager.c:84
@@ -2112,8 +2135,8 @@ msgstr "%s Îs"
 
 #: ../src/unit-manager.c:96
 msgctxt "unit-symbols"
-msgid "microsecond,microseconds,us"
-msgstr "microsecond,microseconds,us"
+msgid "microsecond,microseconds,us,Îs"
+msgstr "microsecond,microseconds,us,Îs"
 
 #: ../src/unit-manager.c:97
 msgid "Celcius"
@@ -2122,8 +2145,8 @@ msgstr "ææå"
 #: ../src/unit-manager.c:97
 #, c-format
 msgctxt "unit-format"
-msgid "%sËC"
-msgstr "%sËC"
+msgid "%s ËC"
+msgstr "%s ËC"
 
 #: ../src/unit-manager.c:97
 msgctxt "unit-symbols"
@@ -2138,8 +2161,8 @@ msgstr "åæå"
 #: ../src/unit-manager.c:98
 #, c-format
 msgctxt "unit-format"
-msgid "%sËF"
-msgstr "%sËF"
+msgid "%s ËF"
+msgstr "%s ËF"
 
 #: ../src/unit-manager.c:98
 msgctxt "unit-symbols"
@@ -2153,13 +2176,13 @@ msgstr "ååæ"
 #: ../src/unit-manager.c:99
 #, c-format
 msgctxt "unit-format"
-msgid "%sËK"
-msgstr "%sËK"
+msgid "%s K"
+msgstr "%s K"
 
 #: ../src/unit-manager.c:99
 msgctxt "unit-symbols"
-msgid "degK,ËK"
-msgstr "degK,ËK"
+msgid "K"
+msgstr "K"
 
 #: ../src/unit-manager.c:100
 msgid "Rankine"
@@ -2168,13 +2191,13 @@ msgstr "åé"
 #: ../src/unit-manager.c:100
 #, c-format
 msgctxt "unit-format"
-msgid "%sËR"
-msgstr "%sËR"
+msgid "%s ËR"
+msgstr "%s ËR"
 
 #: ../src/unit-manager.c:100
 msgctxt "unit-symbols"
-msgid "degR,ËR"
-msgstr "degR,ËR"
+msgid "degR,ËR,ËRa"
+msgstr "degR,ËR,ËRa"
 
 #: ../src/unit-manager.c:109
 msgid "Angle"
@@ -2214,6 +2237,14 @@ msgstr "èå"
 msgid "%s%%s"
 msgstr "%s%%s"
 
+#~ msgctxt "unit-format"
+#~ msgid "%sËK"
+#~ msgstr "%sËK"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degK,ËK"
+#~ msgstr "degK,ËK"
+
 #~ msgid "Recall"
 #~ msgstr "åå"
 



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