[gcalctool] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit c8a87d1a20eaccfbb7a8ae3bc008b5e2a8faa5ad
Author: plesry <pspeter9931 gmail com>
Date:   Fri Jun 24 19:50:19 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  556 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  559 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 577 insertions(+), 538 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index fc40d23..159b10e 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,73 +2,64 @@
 # Copyright (C) 2000, 01, 02, 03, 04, 05 Free Software Foundation, Inc.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Pin-hsien Li <pspeter9931 gmail com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gcaltool 5.91.92\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcalctool&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-04-04 00:15+0000\n"
-"PO-Revision-Date: 2011-04-04 22:03+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-24 19:50+0800\n"
+"PO-Revision-Date: 2011-06-24 19:50+0800\n"
+"Last-Translator: Pin-hsien Li <pspeter9931 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. The label on the memory button
-#: ../data/buttons-advanced.ui.h:2
-#: ../data/buttons-financial.ui.h:2
+#: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
 msgid "<i>x</i>"
 msgstr "<i>x</i>"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:4
-#: ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:4
-#: ../data/buttons-programming.ui.h:2
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
 msgid "="
 msgstr "ï"
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:6
-#: ../data/buttons-programming.ui.h:4
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
 msgid "Absolute Value"
 msgstr "çåå"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:8
-#: ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:38
-#: ../data/buttons-programming.ui.h:8
+#: ../data/buttons-advanced.ui.h:8 ../data/buttons-basic.ui.h:4
+#: ../data/buttons-financial.ui.h:38 ../data/buttons-programming.ui.h:8
 msgid "Exponent"
 msgstr "ææ"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:10
-#: ../data/buttons-programming.ui.h:10
+#: ../data/buttons-advanced.ui.h:10 ../data/buttons-programming.ui.h:10
 msgid "Factorial"
 msgstr "éä"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:12
-#: ../data/buttons-programming.ui.h:12
+#: ../data/buttons-advanced.ui.h:12 ../data/buttons-programming.ui.h:12
 msgid "Factorize"
 msgstr "åæåè"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:14
-#: ../data/buttons-programming.ui.h:18
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
 msgid "Inverse"
 msgstr "åè"
 
 #. Accessible name for the memory button
 #. 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
+#: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
+#: ../src/math-buttons.c:224
 msgid "Memory"
 msgstr "èæ"
 
@@ -78,20 +69,17 @@ msgid "Scientific Exponent"
 msgstr "çåèè"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:20
-#: ../data/buttons-programming.ui.h:24
+#: ../data/buttons-advanced.ui.h:20 ../data/buttons-programming.ui.h:24
 msgid "Store"
 msgstr "åå"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:22
-#: ../data/buttons-programming.ui.h:26
+#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:26
 msgid "Subscript"
 msgstr "äæ"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:24
-#: ../data/buttons-programming.ui.h:28
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:28
 msgid "Superscript"
 msgstr "äæ"
 
@@ -103,62 +91,90 @@ msgstr "èç(_A)"
 #. Gross Profit Margin Dialog: Label before cost input
 #: ../data/buttons-financial.ui.h:8
 msgid "C_ost:"
-msgstr "èè(_O):"
+msgstr "èè(_O)ï"
 
 #. Periodic Payment Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:10
-msgid "Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. "
+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:12
-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 accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The useful life is the number of periods, typically years, over which an asset is depreciated. "
-msgstr ""
+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 "
+"accelerates the rate of depreciation, so that more depreciation expense "
+"occurs in earlier periods than in later ones. The useful life is the number "
+"of periods, typically years, over which an asset is depreciated. "
+msgstr "èçåæåçæéäæèççæèåçéïäçåæçåæãéåæèæåæåéæèçïæäåæææåæææåæèèçãåçåéææèèçæèçéææ (éåçå)ã"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:14
-msgid "Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method."
+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:16
-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 the term."
-msgstr ""
+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 "
+"the term."
+msgstr "èçæèçæäåïææäçåçéäæïæççåäæææçåæåçã"
 
 #. Compounding Term Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:18
-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 compounding period."
+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 "
+"compounding period."
 msgstr "èçäéæèççåèåéææäåæéçèåææïæåèåæéçåççååçã"
 
 #. Payment Period Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:20
-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 rate."
-msgstr ""
+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 "
+"rate."
+msgstr "èçæéåéççèæäåæéçäæææïæçæäåæåçã"
 
 #. Periodic Interest Rate Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:22
-msgid "Calculates the periodic interest necessary to increase an investment to a future value, over the number of compounding periods. "
-msgstr ""
+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:24
-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 periods in the term. "
-msgstr ""
+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 "
+"periods in the term. "
+msgstr "èçæèççåïææäçåçéäæïæççåäæææçåæåçäéèæçã"
 
 #. Gross Profit Margin Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:26
-msgid "Calculates the resale price of a product, based on the product cost and the wanted gross profit margin."
+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:28
-msgid "Calculates the straight-line depreciation of an asset for one period. 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. "
-msgstr ""
+msgid ""
+"Calculates the straight-line depreciation of an asset for one period. 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. "
+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 "èåæé"
 
@@ -179,15 +195,14 @@ 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 "æäå"
 
 #. Payment Period Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:42
 msgid "Future _Value:"
-msgstr "æäå(_V):"
+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:44
@@ -201,8 +216,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 "æåç"
 
@@ -213,20 +227,18 @@ 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 "åæåç"
 
 #. Payment Period Dialog: Label before periodic interest rate input
 #: ../data/buttons-financial.ui.h:56
 msgid "Periodic Interest _Rate:"
-msgstr "åæåç(_R):"
+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 "åæäæ"
 
@@ -237,15 +249,14 @@ 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 "çå"
 
 #. Periodic Interest Rate Dialog: Label before present value input
 #: ../data/buttons-financial.ui.h:64
 msgid "Present _Value:"
-msgstr "çå(_V):"
+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:66
@@ -285,52 +296,52 @@ msgstr "Term"
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
 #: ../data/buttons-financial.ui.h:80
 msgid "_Cost:"
-msgstr "èè(_C):"
+msgstr "èè(_C)ï"
 
 #. Periodic Interest Rate Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:82
 msgid "_Future Value:"
-msgstr "æäå(_F):"
+msgstr "æäå(_F)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
 #: ../data/buttons-financial.ui.h:84
 msgid "_Life:"
-msgstr "åé(_L):"
+msgstr "åé(_L)ï"
 
 #. Gross Profit Margin Dialog: Label before margin input
 #: ../data/buttons-financial.ui.h:86
 msgid "_Margin:"
-msgstr "çé(_M):"
+msgstr "çé(_M)ï"
 
 #. Present Value Dialog: Label before number of periods input
 #: ../data/buttons-financial.ui.h:88
 msgid "_Number of Periods:"
-msgstr "éææ(_N):"
+msgstr "éææ(_N)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
 #: ../data/buttons-financial.ui.h:90
 msgid "_Period:"
-msgstr "éæ(_P):"
+msgstr "éæ(_P)ï"
 
 #. Payment Period Dialog: Label before periodic payment input
 #: ../data/buttons-financial.ui.h:92
 msgid "_Periodic Payment:"
-msgstr "åæäæ(_P):"
+msgstr "åæäæ(_P)ï"
 
 #. Periodic Payment Dialog: Label before principal input
 #: ../data/buttons-financial.ui.h:94
 msgid "_Principal:"
-msgstr "æé(_P):"
+msgstr "æé(_P)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
 #: ../data/buttons-financial.ui.h:96
 msgid "_Salvage:"
-msgstr "åéåå(_S):"
+msgstr "åéåå(_S)ï"
 
 #. Periodic Interest Rate Dialog: Label before term input
 #: ../data/buttons-financial.ui.h:98
 msgid "_Term:"
-msgstr "ææ(_T):"
+msgstr "ææ(_T)ï"
 
 #. Insert ASCII dialog: Label before character entry
 #: ../data/buttons-programming.ui.h:6
@@ -344,22 +355,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 "åç"
 
@@ -396,11 +404,10 @@ msgstr "8 äå"
 #. Preferences dialog: Label for display format combo box
 #: ../data/preferences.ui.h:10
 msgid "Number _Format:"
-msgstr "æåæå(_F):"
+msgstr "æåæå(_F)ï"
 
 #. Title of preferences dialog
-#: ../data/preferences.ui.h:11
-#: ../src/math-preferences.c:231
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -417,16 +424,15 @@ msgstr "éçæççé(_Z)"
 #. Preferences dialog: label for word size combo box
 #: ../data/preferences.ui.h:17
 msgid "Word _size:"
-msgstr "æååå(_S):"
+msgstr "æååå(_S)ï"
 
 #. Preferences dialog: Label for angle unit combo box
 #: ../data/preferences.ui.h:19
 msgid "_Angle units:"
-msgstr "èååä(_A):"
+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 "èææ"
 
@@ -455,7 +461,9 @@ msgid "Currency to convert the current calculation into"
 msgstr "èåçåèççææççèå"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
-msgid "Indicates whether any trailing zeroes after the numeric point should be shown in the display value."
+msgid ""
+"Indicates whether any trailing zeroes after the numeric point should be "
+"shown in the display value."
 msgstr "èçåéççæåäåæéåç 0 æåèéçã"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
@@ -766,6 +774,10 @@ msgstr "ååçææåçç"
 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
@@ -796,8 +808,10 @@ msgstr ""
 #, c-format
 msgid ""
 "GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window manager\n"
-"  --name=NAME                     Program name as used by the window manager\n"
+"  --class=CLASS                   Program class as used by the window "
+"manager\n"
+"  --name=NAME                     Program name as used by the window "
+"manager\n"
 "  --screen=SCREEN                 X screen to use\n"
 "  --sync                          Make X calls synchronous\n"
 "  --gtk-module=MODULES            Load additional GTK+ modules\n"
@@ -834,286 +848,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 "Pi [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
-#, fuzzy
+#: ../src/math-buttons.c:146
 msgid "Complex argument"
-msgstr "äæçåæã%sã"
+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 "åæ"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:160
+#: ../src/math-buttons.c:161
 msgid "Natural Logarithm"
 msgstr "èçåæ"
 
 #. 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 "éè AND"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:187
+#: ../src/math-buttons.c:188
 msgid "Boolean OR"
 msgstr "éè OR"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:190
+#: ../src/math-buttons.c:191
 msgid "Boolean Exclusive OR"
 msgstr "éèæé OR"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:193
+#: ../src/math-buttons.c:194
 msgid "Boolean NOT"
 msgstr "éè NOT"
 
 #. 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:1041
 msgid "Integer Component"
 msgstr "ææéå"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:199
-#: ../src/math-buttons.c:1030
-#, fuzzy
+#: ../src/math-buttons.c:200 ../src/math-buttons.c:1043
 msgid "Fractional Component"
-msgstr "ååçæåä"
+msgstr "åæéå"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:202
-#, fuzzy
+#: ../src/math-buttons.c:203
 msgid "Real Component"
-msgstr "ååçæåä"
+msgstr "åæéå"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:205
-#, fuzzy
+#: ../src/math-buttons.c:206
 msgid "Imaginary Component"
-msgstr "ååçæåä"
+msgstr "èæéå"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:208
+#: ../src/math-buttons.c:209
 msgid "Ones' Complement"
 msgstr "1 çèæ"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:211
+#: ../src/math-buttons.c:212
 msgid "Two's Complement"
 msgstr "2 çèæ"
 
 #. 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]"
+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
-#, fuzzy
+#: ../src/math-buttons.c:257
 msgid "Financial Term"
-msgstr "èåæé"
+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 "2 éä"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:656
+#: ../src/math-buttons.c:657
 msgid "Octal"
 msgstr "8 éä"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:660
+#: ../src/math-buttons.c:661
 msgid "Decimal"
 msgstr "10 éä"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:664
+#: ../src/math-buttons.c:665
 msgid "Hexadecimal"
 msgstr "16 éä"
 
 #. 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:951 ../src/math-buttons.c:995
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1121,99 +1127,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:955 ../src/math-buttons.c:999
 #, 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:1045
 msgid "Round"
 msgstr "åæäå"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1034
+#: ../src/math-buttons.c:1047
 msgid "Floor"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1036
+#: ../src/math-buttons.c:1049
 msgid "Ceiling"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1038
-#, fuzzy
+#: ../src/math-buttons.c:1051
 msgid "Sign"
-msgstr "çç"
+msgstr "çèåæ"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:364
+#: ../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 "ææãèåèæåçåèåå"
+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
-#, fuzzy
+#: ../src/math-equation.c:1469
 msgid "No sane value to bitwise shift"
-msgstr "æææåæååäéèäç"
+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"
 
@@ -1224,20 +1236,17 @@ msgstr "éé(_C)"
 
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
-#: ../src/math-preferences.c:246
-#: ../src/unit-manager.c:54
+#: ../src/math-preferences.c:246 ../src/unit-manager.c:54
 msgid "Degrees"
 msgstr "å"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:250
-#: ../src/unit-manager.c:55
+#: ../src/math-preferences.c:250 ../src/unit-manager.c:55
 msgid "Radians"
 msgstr "åå"
 
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:254
-#: ../src/unit-manager.c:56
+#: ../src/math-preferences.c:254 ../src/unit-manager.c:56
 msgid "Gradians"
 msgstr "æå"
 
@@ -1268,12 +1277,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 ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -1284,7 +1293,7 @@ msgstr ""
 "Ching-Hung Lin <2billlin yahoo com tw>, 2004"
 
 #. 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"
@@ -1315,57 +1324,57 @@ msgstr ""
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:215
+#: ../src/math-window.c:224
 msgid "Gcalctool"
 msgstr "èææ"
 
 #. 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)"
+msgstr "èäéçæå(_P)"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:395
 msgid "_Contents"
 msgstr "åå(_C)"
 
@@ -1397,64 +1406,58 @@ msgstr "äçåèçåææå"
 #. Translators: Error display when attempting to take argument of zero
 #: ../src/mp.c:148
 msgid "Argument not defined for zero"
-msgstr "éçåæåæåç"
+msgstr "åæäèçæ 0"
 
 #: ../src/mp.c:299
 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:1610
 msgid "Division by zero is undefined"
-msgstr "åæåçäééçå"
+msgstr "éä 0 äçæç"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1281
-#: ../src/mp.c:1318
+#: ../src/mp.c:1281 ../src/mp.c:1318
 msgid "Logarithm of zero is undefined"
-msgstr "åæåçéçåæ"
+msgstr "0 çåæäçæç"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1683
-#: ../src/mp.c:1998
-#, fuzzy
+#: ../src/mp.c:1685 ../src/mp.c:1999
 msgid "The power of zero is undefined for a negative exponent"
-msgstr "åæåçèæçåææ"
+msgstr "èæç 0 ææäçæç"
 
-#: ../src/mp.c:1708
-#, fuzzy
+#: ../src/mp.c:1709
 msgid "Reciprocal of zero is undefined"
-msgstr "åæåçéçåæ"
+msgstr "0 çåæäçæç"
 
-#: ../src/mp.c:1793
+#: ../src/mp.c:1794
 msgid "Root must be non-zero"
-msgstr "æèåéçééæå"
+msgstr "æèåéçé 0 çæå"
 
-#: ../src/mp.c:1811
+#: ../src/mp.c:1812
 msgid "Negative root of zero is undefined"
-msgstr "åæåçéçèæè"
+msgstr "0 çèæææäçæç"
 
-#: ../src/mp.c:1817
-#, fuzzy
+#: ../src/mp.c:1818
 msgid "nth root of negative number is undefined for even n"
-msgstr "åæåçèæçåæ"
+msgstr "èæç n æææ (n çåæ) äçæç"
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1938
+#: ../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:1958
+#: ../src/mp.c:1959
 msgid "Modulus division is only defined for integers"
 msgstr "éæéæåèçæææå"
 
 #. Translators: Error displayed when tangent value is undefined
 #: ../src/mp-trigonometric.c:310
-msgid "Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
-msgstr "æååæåçèåïæç Ïâ2 (90Â) å Ï (180Â) çåæ"
+msgid ""
+"Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
+msgstr "æååæèå (n+1/2)*Ï (90Â, 270Â...) äçæç"
 
 #. Translators: Error displayed when inverse sine value is undefined
 #: ../src/mp-trigonometric.c:355
@@ -1469,7 +1472,7 @@ msgstr "åéåäèçæèé [-1, 1] çæå"
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
 #: ../src/mp-trigonometric.c:591
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
-msgstr "åéæéåäèçæåæäçæå"
+msgstr "åéæéåäèçæåæ 1 çæå"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
 #: ../src/mp-trigonometric.c:615
@@ -1511,7 +1514,7 @@ msgstr "gradian,gradians,grad,æå"
 
 #: ../src/unit-manager.c:57
 msgid "Parsecs"
-msgstr "èä"
+msgstr "çåè"
 
 #: ../src/unit-manager.c:57
 #, c-format
@@ -1541,7 +1544,7 @@ msgstr "lightyear,lightyears,ly,åå"
 
 #: ../src/unit-manager.c:59
 msgid "Astronomical Units"
-msgstr "èéåä"
+msgstr "åæåä"
 
 #: ../src/unit-manager.c:59
 #, c-format
@@ -1552,23 +1555,22 @@ msgstr "%s au"
 #: ../src/unit-manager.c:59
 msgctxt "unit-symbols"
 msgid "au"
-msgstr "au"
+msgstr "au,åæåä"
 
 #: ../src/unit-manager.c:60
 msgid "Nautical Miles"
-msgstr "æé"
+msgstr "æå"
 
 #: ../src/unit-manager.c:60
-#: ../src/unit-manager.c:72
 #, 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"
@@ -1602,7 +1604,7 @@ msgstr "kilometer,kilometers,km,kms,åé"
 
 #: ../src/unit-manager.c:63
 msgid "Cables"
-msgstr "çç"
+msgstr "é"
 
 #: ../src/unit-manager.c:63
 #, c-format
@@ -1613,11 +1615,11 @@ msgstr "%s cb"
 #: ../src/unit-manager.c:63
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
-msgstr "cable,cables,cb"
+msgstr "cable,cables,cb,é"
 
 #: ../src/unit-manager.c:64
 msgid "Fathoms"
-msgstr "èå"
+msgstr "èå"
 
 #: ../src/unit-manager.c:64
 #, c-format
@@ -1628,7 +1630,7 @@ msgstr "%s ftm"
 #: ../src/unit-manager.c:64
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
-msgstr "fathom,fathoms,ftm,èå"
+msgstr "fathom,fathoms,ftm,èå"
 
 #: ../src/unit-manager.c:65
 msgid "Meters"
@@ -1740,9 +1742,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"
@@ -1775,7 +1783,7 @@ msgid "acre,acres"
 msgstr "acre,acres,èç"
 
 #: ../src/unit-manager.c:75
-msgid "Square Meter"
+msgid "Square Meters"
 msgstr "åæç"
 
 #: ../src/unit-manager.c:75
@@ -1787,10 +1795,10 @@ msgstr "%s mÂ"
 #: ../src/unit-manager.c:75
 msgctxt "unit-symbols"
 msgid "mÂ"
-msgstr "mÂ"
+msgstr "mÂ,åæç"
 
 #: ../src/unit-manager.c:76
-msgid "Square Centimeter"
+msgid "Square Centimeters"
 msgstr "åæåç"
 
 #: ../src/unit-manager.c:76
@@ -1802,10 +1810,10 @@ msgstr "%s cmÂ"
 #: ../src/unit-manager.c:76
 msgctxt "unit-symbols"
 msgid "cmÂ"
-msgstr "cmÂ"
+msgstr "cmÂ,åæåç"
 
 #: ../src/unit-manager.c:77
-msgid "Square Millimeter"
+msgid "Square Millimeters"
 msgstr "åææç"
 
 #: ../src/unit-manager.c:77
@@ -1817,7 +1825,7 @@ msgstr "%s mmÂ"
 #: ../src/unit-manager.c:77
 msgctxt "unit-symbols"
 msgid "mmÂ"
-msgstr "mmÂ"
+msgstr "mmÂ,åææç"
 
 #: ../src/unit-manager.c:78
 msgid "Cubic Meters"
@@ -1832,7 +1840,7 @@ msgstr "%s mÂ"
 #: ../src/unit-manager.c:78
 msgctxt "unit-symbols"
 msgid "mÂ"
-msgstr "mÂ"
+msgstr "mÂ,çæç"
 
 #: ../src/unit-manager.c:79
 msgid "Gallons"
@@ -1907,10 +1915,10 @@ msgstr "%s mL"
 #: ../src/unit-manager.c:83
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
-msgstr "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
@@ -1922,7 +1930,7 @@ msgstr "%s ÎL"
 #: ../src/unit-manager.c:84
 msgctxt "unit-symbols"
 msgid "mmÂ,ÎL,uL"
-msgstr "mmÂ,ÎL,uL"
+msgstr "mmÂ,ÎL,uL,åå"
 
 #: ../src/unit-manager.c:85
 msgid "Tonnes"
@@ -2101,8 +2109,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"
@@ -2111,13 +2119,13 @@ msgstr "ææ"
 #: ../src/unit-manager.c:97
 #, c-format
 msgctxt "unit-format"
-msgid "%sËC"
+msgid "%s ËC"
 msgstr "%sËC"
 
 #: ../src/unit-manager.c:97
 msgctxt "unit-symbols"
 msgid "degC,ËC"
-msgstr "degC,ËC"
+msgstr "degC,ËC,ææ"
 
 #: ../src/unit-manager.c:98
 msgid "Farenheit"
@@ -2126,13 +2134,13 @@ msgstr "èæ"
 #: ../src/unit-manager.c:98
 #, c-format
 msgctxt "unit-format"
-msgid "%sËF"
+msgid "%s ËF"
 msgstr "%sËF"
 
 #: ../src/unit-manager.c:98
 msgctxt "unit-symbols"
 msgid "degF,ËF"
-msgstr "degF,ËF"
+msgstr "degF,ËF,èæ"
 
 #: ../src/unit-manager.c:99
 msgid "Kelvin"
@@ -2141,13 +2149,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"
@@ -2156,13 +2164,13 @@ msgstr "èé"
 #: ../src/unit-manager.c:100
 #, c-format
 msgctxt "unit-format"
-msgid "%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"
@@ -2178,7 +2186,7 @@ msgstr "åå"
 
 #: ../src/unit-manager.c:112
 msgid "Volume"
-msgstr "é"
+msgstr "éç"
 
 #: ../src/unit-manager.c:113
 msgid "Weight"
@@ -2202,6 +2210,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 "åå"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f50b6cc..5a343b5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,73 +2,64 @@
 # Copyright (C) 2000, 01, 02, 03, 04, 05 Free Software Foundation, Inc.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Pin-hsien Li <pspeter9931 gmail com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gcaltool 5.91.92\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcalctool&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-04-04 00:15+0000\n"
-"PO-Revision-Date: 2011-04-04 19:11+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-24 19:50+0800\n"
+"PO-Revision-Date: 2011-06-09 16:27+0800\n"
+"Last-Translator: Pin-hsien Li <pspeter9931 gmail com>\n"
 "Language-Team: Chinese (Traditional) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. The label on the memory button
-#: ../data/buttons-advanced.ui.h:2
-#: ../data/buttons-financial.ui.h:2
+#: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
 msgid "<i>x</i>"
 msgstr "<i>x</i>"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:4
-#: ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:4
-#: ../data/buttons-programming.ui.h:2
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
 msgid "="
 msgstr "ï"
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:6
-#: ../data/buttons-programming.ui.h:4
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
 msgid "Absolute Value"
 msgstr "çåå"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:8
-#: ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:38
-#: ../data/buttons-programming.ui.h:8
+#: ../data/buttons-advanced.ui.h:8 ../data/buttons-basic.ui.h:4
+#: ../data/buttons-financial.ui.h:38 ../data/buttons-programming.ui.h:8
 msgid "Exponent"
 msgstr "ææ"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:10
-#: ../data/buttons-programming.ui.h:10
+#: ../data/buttons-advanced.ui.h:10 ../data/buttons-programming.ui.h:10
 msgid "Factorial"
 msgstr "éä"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:12
-#: ../data/buttons-programming.ui.h:12
+#: ../data/buttons-advanced.ui.h:12 ../data/buttons-programming.ui.h:12
 msgid "Factorize"
 msgstr "åæåè"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:14
-#: ../data/buttons-programming.ui.h:18
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
 msgid "Inverse"
 msgstr "åè"
 
 #. Accessible name for the memory button
 #. 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
+#: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
+#: ../src/math-buttons.c:224
 msgid "Memory"
 msgstr "èæ"
 
@@ -78,20 +69,17 @@ msgid "Scientific Exponent"
 msgstr "çåèè"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:20
-#: ../data/buttons-programming.ui.h:24
+#: ../data/buttons-advanced.ui.h:20 ../data/buttons-programming.ui.h:24
 msgid "Store"
 msgstr "åå"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:22
-#: ../data/buttons-programming.ui.h:26
+#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:26
 msgid "Subscript"
 msgstr "äæ"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:24
-#: ../data/buttons-programming.ui.h:28
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:28
 msgid "Superscript"
 msgstr "äæ"
 
@@ -103,62 +91,97 @@ msgstr "èç(_A)"
 #. Gross Profit Margin Dialog: Label before cost input
 #: ../data/buttons-financial.ui.h:8
 msgid "C_ost:"
-msgstr "èè(_O):"
+msgstr "èè(_O)ï"
 
 #. Periodic Payment Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:10
-msgid "Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. "
+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:12
-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 accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The useful life is the number of periods, typically years, over which an asset is depreciated. "
+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 "
+"accelerates the rate of depreciation, so that more depreciation expense "
+"occurs in earlier periods than in later ones. The useful life is the number "
+"of periods, typically years, over which an asset is depreciated. "
 msgstr ""
+"èçåæåçæéäæèççæèåçéïäçåæçåæãéåæèæåæåéæè"
+"çïæäåæææåæææåæèèçãåçåéææèèçæèçéææ (éåç"
+"å)ã"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:14
-msgid "Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method."
+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:16
-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 the term."
-msgstr ""
+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 "
+"the term."
+msgstr "èçæèçæäåïææäçåçéäæïæççåäæææçåæåçã"
 
 #. Compounding Term Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:18
-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 compounding period."
-msgstr "èçäéæèççåèåéææäåæéçèåææïæåèåæéçåççååçã"
+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 "
+"compounding period."
+msgstr ""
+"èçäéæèççåèåéææäåæéçèåææïæåèåæéçåççååçã"
 
 #. Payment Period Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:20
-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 rate."
-msgstr ""
+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 "
+"rate."
+msgstr "èçæéåéççèæäåæéçäæææïæçæäåæåçã"
 
 #. Periodic Interest Rate Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:22
-msgid "Calculates the periodic interest necessary to increase an investment to a future value, over the number of compounding periods. "
-msgstr ""
+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:24
-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 periods in the term. "
+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 "
+"periods in the term. "
 msgstr ""
+"èçæèççåïææäçåçéäæïæççåäæææçåæåçäéèæçã"
 
 #. Gross Profit Margin Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:26
-msgid "Calculates the resale price of a product, based on the product cost and the wanted gross profit margin."
+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:28
-msgid "Calculates the straight-line depreciation of an asset for one period. 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. "
+msgid ""
+"Calculates the straight-line depreciation of an asset for one period. 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. "
 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 "èåæé"
 
@@ -179,15 +202,14 @@ 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 "æäå"
 
 #. Payment Period Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:42
 msgid "Future _Value:"
-msgstr "æäå(_V):"
+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:44
@@ -201,8 +223,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 "æåç"
 
@@ -213,20 +234,18 @@ 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 "åæåç"
 
 #. Payment Period Dialog: Label before periodic interest rate input
 #: ../data/buttons-financial.ui.h:56
 msgid "Periodic Interest _Rate:"
-msgstr "åæåç(_R):"
+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 "åæäæ"
 
@@ -237,15 +256,14 @@ 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 "çå"
 
 #. Periodic Interest Rate Dialog: Label before present value input
 #: ../data/buttons-financial.ui.h:64
 msgid "Present _Value:"
-msgstr "çå(_V):"
+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:66
@@ -285,52 +303,52 @@ msgstr "Term"
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
 #: ../data/buttons-financial.ui.h:80
 msgid "_Cost:"
-msgstr "èè(_C):"
+msgstr "èè(_C)ï"
 
 #. Periodic Interest Rate Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:82
 msgid "_Future Value:"
-msgstr "æäå(_F):"
+msgstr "æäå(_F)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
 #: ../data/buttons-financial.ui.h:84
 msgid "_Life:"
-msgstr "åé(_L):"
+msgstr "åé(_L)ï"
 
 #. Gross Profit Margin Dialog: Label before margin input
 #: ../data/buttons-financial.ui.h:86
 msgid "_Margin:"
-msgstr "çé(_M):"
+msgstr "çé(_M)ï"
 
 #. Present Value Dialog: Label before number of periods input
 #: ../data/buttons-financial.ui.h:88
 msgid "_Number of Periods:"
-msgstr "éææ(_N):"
+msgstr "éææ(_N)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
 #: ../data/buttons-financial.ui.h:90
 msgid "_Period:"
-msgstr "éæ(_P):"
+msgstr "éæ(_P)ï"
 
 #. Payment Period Dialog: Label before periodic payment input
 #: ../data/buttons-financial.ui.h:92
 msgid "_Periodic Payment:"
-msgstr "åæäæ(_P):"
+msgstr "åæäæ(_P)ï"
 
 #. Periodic Payment Dialog: Label before principal input
 #: ../data/buttons-financial.ui.h:94
 msgid "_Principal:"
-msgstr "æé(_P):"
+msgstr "æé(_P)ï"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
 #: ../data/buttons-financial.ui.h:96
 msgid "_Salvage:"
-msgstr "åéåå(_S):"
+msgstr "åéåå(_S)ï"
 
 #. Periodic Interest Rate Dialog: Label before term input
 #: ../data/buttons-financial.ui.h:98
 msgid "_Term:"
-msgstr "ææ(_T):"
+msgstr "ææ(_T)ï"
 
 #. Insert ASCII dialog: Label before character entry
 #: ../data/buttons-programming.ui.h:6
@@ -344,22 +362,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 "åç"
 
@@ -396,11 +411,10 @@ msgstr "8 äå"
 #. Preferences dialog: Label for display format combo box
 #: ../data/preferences.ui.h:10
 msgid "Number _Format:"
-msgstr "æåæå(_F):"
+msgstr "æåæå(_F)ï"
 
 #. Title of preferences dialog
-#: ../data/preferences.ui.h:11
-#: ../src/math-preferences.c:231
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -417,16 +431,15 @@ msgstr "éçæççé(_Z)"
 #. Preferences dialog: label for word size combo box
 #: ../data/preferences.ui.h:17
 msgid "Word _size:"
-msgstr "æååå(_S):"
+msgstr "æååå(_S)ï"
 
 #. Preferences dialog: Label for angle unit combo box
 #: ../data/preferences.ui.h:19
 msgid "_Angle units:"
-msgstr "èååä(_A):"
+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 "èçæ"
 
@@ -455,7 +468,9 @@ msgid "Currency to convert the current calculation into"
 msgstr "èåçåèççææççèå"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
-msgid "Indicates whether any trailing zeroes after the numeric point should be shown in the display value."
+msgid ""
+"Indicates whether any trailing zeroes after the numeric point should be "
+"shown in the display value."
 msgstr "èçåéççæåäåæéåç 0 æåèéçã"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
@@ -766,6 +781,10 @@ msgstr "ååçææåçç"
 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
@@ -796,8 +815,10 @@ msgstr ""
 #, c-format
 msgid ""
 "GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window manager\n"
-"  --name=NAME                     Program name as used by the window manager\n"
+"  --class=CLASS                   Program class as used by the window "
+"manager\n"
+"  --name=NAME                     Program name as used by the window "
+"manager\n"
 "  --screen=SCREEN                 X screen to use\n"
 "  --sync                          Make X calls synchronous\n"
 "  --gtk-module=MODULES            Load additional GTK+ modules\n"
@@ -834,286 +855,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 "Pi [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
-#, fuzzy
+#: ../src/math-buttons.c:146
 msgid "Complex argument"
-msgstr "äæçåæã%sã"
+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 "åæ"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:160
+#: ../src/math-buttons.c:161
 msgid "Natural Logarithm"
 msgstr "èçåæ"
 
 #. 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 "åæ AND"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:187
+#: ../src/math-buttons.c:188
 msgid "Boolean OR"
 msgstr "åæ OR"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:190
+#: ../src/math-buttons.c:191
 msgid "Boolean Exclusive OR"
 msgstr "åææé OR"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:193
+#: ../src/math-buttons.c:194
 msgid "Boolean NOT"
 msgstr "åæ NOT"
 
 #. 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:1041
 msgid "Integer Component"
 msgstr "ææéå"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:199
-#: ../src/math-buttons.c:1030
-#, fuzzy
+#: ../src/math-buttons.c:200 ../src/math-buttons.c:1043
 msgid "Fractional Component"
-msgstr "ååçæåä"
+msgstr "åæéå"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:202
-#, fuzzy
+#: ../src/math-buttons.c:203
 msgid "Real Component"
-msgstr "ååçæåä"
+msgstr "åæéå"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:205
-#, fuzzy
+#: ../src/math-buttons.c:206
 msgid "Imaginary Component"
-msgstr "ååçæåä"
+msgstr "èæéå"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:208
+#: ../src/math-buttons.c:209
 msgid "Ones' Complement"
 msgstr "1 çèæ"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:211
+#: ../src/math-buttons.c:212
 msgid "Two's Complement"
 msgstr "2 çèæ"
 
 #. 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]"
+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
-#, fuzzy
+#: ../src/math-buttons.c:257
 msgid "Financial Term"
-msgstr "èåæé"
+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 "2 éä"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:656
+#: ../src/math-buttons.c:657
 msgid "Octal"
 msgstr "8 éä"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:660
+#: ../src/math-buttons.c:661
 msgid "Decimal"
 msgstr "10 éä"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:664
+#: ../src/math-buttons.c:665
 msgid "Hexadecimal"
 msgstr "16 éä"
 
 #. 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:951 ../src/math-buttons.c:995
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1121,99 +1134,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:955 ../src/math-buttons.c:999
 #, 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:1045
 msgid "Round"
 msgstr "åæäå"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1034
+#: ../src/math-buttons.c:1047
 msgid "Floor"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1036
+#: ../src/math-buttons.c:1049
 msgid "Ceiling"
 msgstr "äé"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1038
-#, fuzzy
+#: ../src/math-buttons.c:1051
 msgid "Sign"
-msgstr "çç"
+msgstr "çèåæ"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:364
+#: ../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 "ææãèåèæåçåèåå"
+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
-#, fuzzy
+#: ../src/math-equation.c:1469
 msgid "No sane value to bitwise shift"
-msgstr "æææåæååäéèäç"
+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"
 
@@ -1224,20 +1243,17 @@ msgstr "éé(_C)"
 
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
-#: ../src/math-preferences.c:246
-#: ../src/unit-manager.c:54
+#: ../src/math-preferences.c:246 ../src/unit-manager.c:54
 msgid "Degrees"
 msgstr "å"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:250
-#: ../src/unit-manager.c:55
+#: ../src/math-preferences.c:250 ../src/unit-manager.c:55
 msgid "Radians"
 msgstr "åå"
 
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:254
-#: ../src/unit-manager.c:56
+#: ../src/math-preferences.c:254 ../src/unit-manager.c:56
 msgid "Gradians"
 msgstr "æå"
 
@@ -1268,12 +1284,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 ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -1284,7 +1300,7 @@ msgstr ""
 "Ching-Hung Lin <2billlin yahoo com tw>, 2004"
 
 #. 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"
@@ -1315,57 +1331,57 @@ msgstr ""
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:215
+#: ../src/math-window.c:224
 msgid "Gcalctool"
 msgstr "èçæ"
 
 #. 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)"
+msgstr "èééçæå(_P)"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:395
 msgid "_Contents"
 msgstr "åå(_C)"
 
@@ -1397,64 +1413,58 @@ msgstr "äçåèçåææå"
 #. Translators: Error display when attempting to take argument of zero
 #: ../src/mp.c:148
 msgid "Argument not defined for zero"
-msgstr "éçåæåæåç"
+msgstr "åæäèçæ 0"
 
 #: ../src/mp.c:299
 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:1610
 msgid "Division by zero is undefined"
-msgstr "åæåçäééçå"
+msgstr "éä 0 äçæç"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1281
-#: ../src/mp.c:1318
+#: ../src/mp.c:1281 ../src/mp.c:1318
 msgid "Logarithm of zero is undefined"
-msgstr "åæåçéçåæ"
+msgstr "0 çåæäçæç"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1683
-#: ../src/mp.c:1998
-#, fuzzy
+#: ../src/mp.c:1685 ../src/mp.c:1999
 msgid "The power of zero is undefined for a negative exponent"
-msgstr "åæåçèæçåææ"
+msgstr "èæç 0 ææäçæç"
 
-#: ../src/mp.c:1708
-#, fuzzy
+#: ../src/mp.c:1709
 msgid "Reciprocal of zero is undefined"
-msgstr "åæåçéçåæ"
+msgstr "0 çåæäçæç"
 
-#: ../src/mp.c:1793
+#: ../src/mp.c:1794
 msgid "Root must be non-zero"
-msgstr "æèåéçééæå"
+msgstr "æèåéçé 0 çæå"
 
-#: ../src/mp.c:1811
+#: ../src/mp.c:1812
 msgid "Negative root of zero is undefined"
-msgstr "åæåçéçèæè"
+msgstr "0 çèæææäçæç"
 
-#: ../src/mp.c:1817
-#, fuzzy
+#: ../src/mp.c:1818
 msgid "nth root of negative number is undefined for even n"
-msgstr "åæåçèæçåæ"
+msgstr "èæç n æææ (n çåæ) äçæç"
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1938
+#: ../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:1958
+#: ../src/mp.c:1959
 msgid "Modulus division is only defined for integers"
 msgstr "éæéæåèçæææå"
 
 #. Translators: Error displayed when tangent value is undefined
 #: ../src/mp-trigonometric.c:310
-msgid "Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
-msgstr "æååæåçèåïæç Ïâ2 (90Â) å Ï (180Â) çåæ"
+msgid ""
+"Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
+msgstr "æååæèå (n+1/2)*Ï (90Â, 270Â...) äçæç"
 
 #. Translators: Error displayed when inverse sine value is undefined
 #: ../src/mp-trigonometric.c:355
@@ -1469,7 +1479,7 @@ msgstr "åéåäèçæèé [-1, 1] çæå"
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
 #: ../src/mp-trigonometric.c:591
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
-msgstr "åéæéåäèçæåæäçæå"
+msgstr "åéæéåäèçæåæ 1 çæå"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
 #: ../src/mp-trigonometric.c:615
@@ -1511,7 +1521,7 @@ msgstr "gradian,gradians,grad,æå"
 
 #: ../src/unit-manager.c:57
 msgid "Parsecs"
-msgstr "èä"
+msgstr "çåè"
 
 #: ../src/unit-manager.c:57
 #, c-format
@@ -1541,7 +1551,7 @@ msgstr "lightyear,lightyears,ly,åå"
 
 #: ../src/unit-manager.c:59
 msgid "Astronomical Units"
-msgstr "èèåä"
+msgstr "åæåä"
 
 #: ../src/unit-manager.c:59
 #, c-format
@@ -1552,23 +1562,22 @@ msgstr "%s au"
 #: ../src/unit-manager.c:59
 msgctxt "unit-symbols"
 msgid "au"
-msgstr "au"
+msgstr "au,åæåä"
 
 #: ../src/unit-manager.c:60
 msgid "Nautical Miles"
-msgstr "æé"
+msgstr "æå"
 
 #: ../src/unit-manager.c:60
-#: ../src/unit-manager.c:72
 #, 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"
@@ -1602,7 +1611,7 @@ msgstr "kilometer,kilometers,km,kms,åé"
 
 #: ../src/unit-manager.c:63
 msgid "Cables"
-msgstr "çç"
+msgstr "é"
 
 #: ../src/unit-manager.c:63
 #, c-format
@@ -1613,11 +1622,11 @@ msgstr "%s cb"
 #: ../src/unit-manager.c:63
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
-msgstr "cable,cables,cb"
+msgstr "cable,cables,cb,é"
 
 #: ../src/unit-manager.c:64
 msgid "Fathoms"
-msgstr "èå"
+msgstr "èå"
 
 #: ../src/unit-manager.c:64
 #, c-format
@@ -1628,7 +1637,7 @@ msgstr "%s ftm"
 #: ../src/unit-manager.c:64
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
-msgstr "fathom,fathoms,ftm,èå"
+msgstr "fathom,fathoms,ftm,èå"
 
 #: ../src/unit-manager.c:65
 msgid "Meters"
@@ -1740,9 +1749,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"
@@ -1775,7 +1790,7 @@ msgid "acre,acres"
 msgstr "acre,acres,èç"
 
 #: ../src/unit-manager.c:75
-msgid "Square Meter"
+msgid "Square Meters"
 msgstr "åæåå"
 
 #: ../src/unit-manager.c:75
@@ -1787,10 +1802,10 @@ msgstr "%s mÂ"
 #: ../src/unit-manager.c:75
 msgctxt "unit-symbols"
 msgid "mÂ"
-msgstr "mÂ"
+msgstr "mÂ,åæåå"
 
 #: ../src/unit-manager.c:76
-msgid "Square Centimeter"
+msgid "Square Centimeters"
 msgstr "åæåå"
 
 #: ../src/unit-manager.c:76
@@ -1802,10 +1817,10 @@ msgstr "%s cmÂ"
 #: ../src/unit-manager.c:76
 msgctxt "unit-symbols"
 msgid "cmÂ"
-msgstr "cmÂ"
+msgstr "cmÂ,åæåå"
 
 #: ../src/unit-manager.c:77
-msgid "Square Millimeter"
+msgid "Square Millimeters"
 msgstr "åææç"
 
 #: ../src/unit-manager.c:77
@@ -1817,7 +1832,7 @@ msgstr "%s mmÂ"
 #: ../src/unit-manager.c:77
 msgctxt "unit-symbols"
 msgid "mmÂ"
-msgstr "mmÂ"
+msgstr "mmÂ,åææç"
 
 #: ../src/unit-manager.c:78
 msgid "Cubic Meters"
@@ -1832,7 +1847,7 @@ msgstr "%s mÂ"
 #: ../src/unit-manager.c:78
 msgctxt "unit-symbols"
 msgid "mÂ"
-msgstr "mÂ"
+msgstr "mÂ,çæåå"
 
 #: ../src/unit-manager.c:79
 msgid "Gallons"
@@ -1907,10 +1922,10 @@ msgstr "%s mL"
 #: ../src/unit-manager.c:83
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
-msgstr "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
@@ -1922,7 +1937,7 @@ msgstr "%s ÎL"
 #: ../src/unit-manager.c:84
 msgctxt "unit-symbols"
 msgid "mmÂ,ÎL,uL"
-msgstr "mmÂ,ÎL,uL"
+msgstr "mmÂ,ÎL,uL,åå"
 
 #: ../src/unit-manager.c:85
 msgid "Tonnes"
@@ -2101,8 +2116,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"
@@ -2111,13 +2126,13 @@ msgstr "ææ"
 #: ../src/unit-manager.c:97
 #, c-format
 msgctxt "unit-format"
-msgid "%sËC"
+msgid "%s ËC"
 msgstr "%sËC"
 
 #: ../src/unit-manager.c:97
 msgctxt "unit-symbols"
 msgid "degC,ËC"
-msgstr "degC,ËC"
+msgstr "degC,ËC,ææ"
 
 #: ../src/unit-manager.c:98
 msgid "Farenheit"
@@ -2126,13 +2141,13 @@ msgstr "èæ"
 #: ../src/unit-manager.c:98
 #, c-format
 msgctxt "unit-format"
-msgid "%sËF"
+msgid "%s ËF"
 msgstr "%sËF"
 
 #: ../src/unit-manager.c:98
 msgctxt "unit-symbols"
 msgid "degF,ËF"
-msgstr "degF,ËF"
+msgstr "degF,ËF,èæ"
 
 #: ../src/unit-manager.c:99
 msgid "Kelvin"
@@ -2141,13 +2156,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"
@@ -2156,13 +2171,13 @@ msgstr "èé"
 #: ../src/unit-manager.c:100
 #, c-format
 msgctxt "unit-format"
-msgid "%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"
@@ -2178,7 +2193,7 @@ msgstr "åå"
 
 #: ../src/unit-manager.c:112
 msgid "Volume"
-msgstr "é"
+msgstr "éç"
 
 #: ../src/unit-manager.c:113
 msgid "Weight"
@@ -2202,6 +2217,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]