[gcalctool/gnome-3-0] Updated Serbian translation



commit 2d819542cff6be0098a3a86d8675f1d0aa336379
Author: Branko KokanoviÄ? <branko kokanovic gmail com>
Date:   Thu Mar 31 01:53:19 2011 +0200

    Updated Serbian translation

 po/sr.po       | 1545 ++++++++++++++++++++++++++++++++++++++++++--------------
 po/sr latin po | 1545 ++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 2336 insertions(+), 754 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 96b41d9..abd999a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,13 +5,16 @@
 # Reviewed on 2005-07-18 by: Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <igor prevod org>
 # Translated on 2006-01-30 by: Слободан Ð?. СÑ?едоÑ?евиÑ? <slobo akrep be>
 # Translated on 2010-08-25 by: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>
+# Translated on 2011-03-19 by: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>
+# Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gcalctool&component=general\n"
-"POT-Creation-Date: 2010-08-25 15:33+0000\n"
-"PO-Revision-Date: 2010-08-25 22:36+0200\n"
+"product=gcalctool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-26 01:21+0000\n"
+"PO-Revision-Date: 2011-03-19 14:08+0100\n"
 "Last-Translator: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
@@ -20,102 +23,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. The label on the memory recall button
+#. The label on the memory button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
-#: ../data/buttons-programming.ui.h:2
-msgid "&#x2190; R"
-msgstr "&#x2190; R"
-
-#. The label on the memory store button
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-financial.ui.h:4
-#: ../data/buttons-programming.ui.h:4
-msgid "&#x2192; R"
-msgstr "&#x2192; R"
+msgid "<i>x</i>"
+msgstr "<i>x</i>"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:6 ../data/buttons-programming.ui.h:6
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
 msgid "="
 msgstr "="
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:8 ../data/buttons-programming.ui.h:8
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
 msgid "Absolute Value"
 msgstr "Ð?пÑ?олÑ?Ñ?на вÑ?едноÑ?Ñ?"
 
-#. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:10 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:32 ../data/buttons-programming.ui.h:12
-msgid "Clear"
-msgstr "Ð?Ñ?иÑ?Ñ?и"
-
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:6
-#: ../data/buttons-financial.ui.h:42 ../data/buttons-programming.ui.h:14
+#: ../data/buttons-advanced.ui.h: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:14 ../data/buttons-programming.ui.h:16
+#: ../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:16 ../data/buttons-programming.ui.h:18
+#: ../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:18 ../data/buttons-programming.ui.h:24
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
 msgid "Inverse"
 msgstr "Ð?нвеÑ?зно"
 
-#. Accessible name for the recall value button
-#: ../data/buttons-advanced.ui.h:20 ../data/buttons-financial.ui.h:72
-#: ../data/buttons-programming.ui.h:26
-msgid "Recall"
-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
+msgid "Memory"
+msgstr "Ð?емоÑ?иÑ?а"
 
 #. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:22
+#: ../data/buttons-advanced.ui.h:18
 msgid "Scientific Exponent"
 msgstr "Ð?аÑ?Ñ?ни екÑ?поненÑ?"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-financial.ui.h:76
-#: ../data/buttons-programming.ui.h:32
+#: ../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:26 ../data/buttons-programming.ui.h:34
+#: ../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:28 ../data/buttons-programming.ui.h:36
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:28
 msgid "Superscript"
 msgstr "Ð?кÑ?поненÑ?"
 
-#. Label on the undo button
-#. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:8
-#: ../data/buttons-financial.ui.h:86
-msgid "Undo"
-msgstr "Ð?позови"
-
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:8
+#: ../data/buttons-financial.ui.h:6
 msgid "C_alculate"
 msgstr "_Ð?зÑ?аÑ?Ñ?наÑ?"
 
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:10
+#: ../data/buttons-financial.ui.h:8
 msgid "C_ost:"
 msgstr "_Цена:"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:12
+#: ../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. "
@@ -124,7 +108,7 @@ msgstr ""
 "кÑ?аÑ?Ñ? пеÑ?иода плаÑ?аÑ?а."
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:14
+#: ../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 "
@@ -138,7 +122,7 @@ msgstr ""
 "пÑ?оизвода Ñ?е бÑ?оÑ? пеÑ?иода, обиÑ?но година, за коÑ?е Ñ?е пÑ?оизвод амоÑ?Ñ?изован. "
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:16
+#: ../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."
@@ -147,7 +131,7 @@ msgstr ""
 "меÑ?од двоÑ?Ñ?Ñ?Ñ?ко-опадаÑ?Ñ?Ñ?ег Ñ?маÑ?еÑ?а."
 
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:18
+#: ../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 "
@@ -157,7 +141,7 @@ msgstr ""
 "пеÑ?иодиÑ?нÑ? камаÑ?нÑ? Ñ?Ñ?опÑ? над одÑ?еÑ?еним бÑ?оÑ?ем пеÑ?иода плаÑ?аÑ?а."
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:20
+#: ../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 "
@@ -168,7 +152,7 @@ msgstr ""
 "пеÑ?иодÑ? Ñ?иниоÑ?ног Ñ?аÑ?Ñ?ава."
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:22
+#: ../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 "
@@ -178,7 +162,7 @@ msgstr ""
 "бÑ?дÑ?Ñ?а вÑ?едноÑ?Ñ? по пеÑ?иодиÑ?ноÑ? камаÑ?ноÑ? Ñ?Ñ?опи."
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:24
+#: ../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. "
@@ -187,7 +171,7 @@ msgstr ""
 "инвеÑ?Ñ?иÑ?иÑ?е на бÑ?дÑ?Ñ?Ñ? вÑ?едноÑ?Ñ? над бÑ?оÑ?ем пеÑ?иода Ñ?иниоÑ?ног Ñ?аÑ?Ñ?ава."
 
 #. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:26
+#: ../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 "
@@ -197,7 +181,7 @@ msgstr ""
 "пеÑ?иодиÑ?ноÑ? камаÑ?ноÑ? Ñ?Ñ?опи над даÑ?им бÑ?оÑ?ем пеÑ?иода плаÑ?аÑ?а."
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:28
+#: ../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."
@@ -206,7 +190,7 @@ msgstr ""
 "бÑ?Ñ?Ñ?о маÑ?же."
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:30
+#: ../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 "
@@ -220,208 +204,213 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:34 ../src/math-buttons.c:261
+#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:247
 msgid "Compounding Term"
 msgstr "ЧинилаÑ? Ñ?аÑ?Ñ?ава"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: ../data/buttons-financial.ui.h:36
+#: ../data/buttons-financial.ui.h:32
 msgid "Ctrm"
 msgstr "Ctrm"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:38
+#: ../data/buttons-financial.ui.h:34
 msgid "Ddb"
 msgstr "Ddb"
 
 #. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:40
+#: ../data/buttons-financial.ui.h:36
 msgid "Double-Declining Depreciation"
 msgstr "Ð?воÑ?Ñ?Ñ?Ñ?ко-опадаÑ?Ñ?Ñ?е Ñ?маÑ?еÑ?е"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:44 ../src/math-buttons.c:267
+#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:253
 msgid "Future Value"
 msgstr "Ð?Ñ?дÑ?Ñ?а вÑ?едноÑ?Ñ?"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:46
+#: ../data/buttons-financial.ui.h:42
 msgid "Future _Value:"
 msgstr "Ð?Ñ?дÑ?Ñ?а _вÑ?едноÑ?Ñ?"
 
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: ../data/buttons-financial.ui.h:48
+#: ../data/buttons-financial.ui.h:44
 msgid "Fv"
 msgstr "Ð?в"
 
 #. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: ../data/buttons-financial.ui.h:50
+#: ../data/buttons-financial.ui.h:46
 msgid "Gpm"
 msgstr "Ð?Ð?"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:52 ../src/math-buttons.c:288
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:274
 msgid "Gross Profit Margin"
 msgstr "Ð?Ñ?Ñ?Ñ?о маÑ?жа"
 
 #. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:54
+#: ../data/buttons-financial.ui.h:52
 msgid "Payment Period"
 msgstr "Ð?еÑ?иод за плаÑ?аÑ?е"
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:56 ../src/math-buttons.c:279
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:265
 msgid "Periodic Interest Rate"
 msgstr "Ð?еÑ?иодиÑ?на Ñ?Ñ?опа камаÑ?е"
 
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:58
+#: ../data/buttons-financial.ui.h:56
 msgid "Periodic Interest _Rate:"
 msgstr "Ð?еÑ?иодиÑ?на Ñ?Ñ?опа _камаÑ?е"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:60 ../src/math-buttons.c:285
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:271
 msgid "Periodic Payment"
 msgstr "Ð?еÑ?иодиÑ?но плаÑ?аÑ?е"
 
 #. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: ../data/buttons-financial.ui.h:62
+#: ../data/buttons-financial.ui.h:60
 msgid "Pmt"
 msgstr "Ð?пл"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:64 ../src/math-buttons.c:282
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:268
 msgid "Present Value"
 msgstr "ТÑ?енÑ?Ñ?на вÑ?едноÑ?Ñ?"
 
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:66
+#: ../data/buttons-financial.ui.h:64
 msgid "Present _Value:"
 msgstr "ТÑ?енÑ?Ñ?на _вÑ?едноÑ?Ñ?:"
 
 #. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: ../data/buttons-financial.ui.h:68
+#: ../data/buttons-financial.ui.h:66
 msgid "Pv"
 msgstr "Тв"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/buttons-financial.ui.h:70
+#: ../data/buttons-financial.ui.h:68
 msgid "Rate"
 msgstr "СÑ?опа"
 
 #. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:74
+#: ../data/buttons-financial.ui.h:70
 msgid "Sln"
 msgstr "Sln"
 
 #. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:78
+#: ../data/buttons-financial.ui.h:72
 msgid "Straight-Line Depreciation"
 msgstr "Ð?Ñ?аволиниÑ?Ñ?ко Ñ?маÑ?еÑ?е"
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:80
+#: ../data/buttons-financial.ui.h:74
 msgid "Sum-of-the-Years'-Digits Depreciation"
 msgstr "Ð?биÑ?-Ñ?иÑ?аÑ?а-године Ñ?маÑ?еÑ?е"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:82
+#: ../data/buttons-financial.ui.h:76
 msgid "Syd"
 msgstr "Ð?Ñ?г"
 
 #. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: ../data/buttons-financial.ui.h:84
+#: ../data/buttons-financial.ui.h:78
 msgid "Term"
 msgstr "Рок"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:88
+#: ../data/buttons-financial.ui.h:80
 msgid "_Cost:"
 msgstr "_Цена:"
 
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:90
+#: ../data/buttons-financial.ui.h:82
 msgid "_Future Value:"
 msgstr "_Ð?Ñ?дÑ?Ñ?а вÑ?едноÑ?Ñ?:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:92
+#: ../data/buttons-financial.ui.h:84
 msgid "_Life:"
 msgstr "_Ð?ивоÑ?ни век:"
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:94
+#: ../data/buttons-financial.ui.h:86
 msgid "_Margin:"
 msgstr "_Ð?аÑ?жа:"
 
 #. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:96
+#: ../data/buttons-financial.ui.h:88
 msgid "_Number of Periods:"
 msgstr "_Ð?Ñ?оÑ? пеÑ?иода:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:98
+#: ../data/buttons-financial.ui.h:90
 msgid "_Period:"
 msgstr "_Ð?еÑ?иод:"
 
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:100
+#: ../data/buttons-financial.ui.h:92
 msgid "_Periodic Payment:"
 msgstr "_Ð?еÑ?иодиÑ?но плаÑ?аÑ?е:"
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:102
+#: ../data/buttons-financial.ui.h:94
 msgid "_Principal:"
 msgstr "_Ð?Ñ?нова:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:104
+#: ../data/buttons-financial.ui.h:96
 msgid "_Salvage:"
 msgstr "_Ð?Ñ?аÑ?Ñ?а Ñ?ена:"
 
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:106
+#: ../data/buttons-financial.ui.h:98
 msgid "_Term:"
 msgstr "_Рок:"
 
 #. Insert ASCII dialog: Label before character entry
-#: ../data/buttons-programming.ui.h:10
+#: ../data/buttons-programming.ui.h:6
 msgid "Ch_aracter:"
 msgstr "_Ð?нак:"
 
 #. Accessible name for the insert character button
-#: ../data/buttons-programming.ui.h:20
+#: ../data/buttons-programming.ui.h:14
 msgid "Insert Character"
 msgstr "УбаÑ?и Ð?нак"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:240
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:226
 msgid "Insert Character Code"
 msgstr "УбаÑ?и Ð?од Ð?нак"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:255
+#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:241
 msgid "Shift Left"
 msgstr "Ð?омеÑ?и Ñ?лево"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:30 ../src/math-buttons.c:258
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:244
 msgid "Shift Right"
 msgstr "Ð?омеÑ?и Ñ?деÑ?но"
 
 #. Insert ASCII dialog: Button to insert selected character
-#: ../data/buttons-programming.ui.h:38
+#: ../data/buttons-programming.ui.h:30
 msgid "_Insert"
 msgstr "У_меÑ?ни"
 
+#. The label on the memory button
+#: ../data/buttons-programming.ui.h:32
+msgid "x"
+msgstr "x"
+
 #. Word size combo: 16 bits
 #: ../data/preferences.ui.h:2
 msgid "16-bit"
@@ -448,7 +437,7 @@ msgid "Number _Format:"
 msgstr "_ФоÑ?маÑ? бÑ?оÑ?а:"
 
 #. Title of preferences dialog
-#: ../data/preferences.ui.h:11 ../src/math-preferences.c:239
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
 msgid "Preferences"
 msgstr "Ð?одеÑ?аваÑ?а"
 
@@ -473,7 +462,7 @@ msgid "_Angle units:"
 msgstr "Ð?единиÑ?е Ñ?глов_а"
 
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:521
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:514
 msgid "Calculator"
 msgstr "Ð?алкÑ?лаÑ?оÑ?"
 
@@ -534,179 +523,291 @@ msgid "Source currency"
 msgstr "Ð?звоÑ?на валÑ?Ñ?а"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
+msgid "Source units"
+msgstr "Ð?звоÑ?на Ñ?единиÑ?а"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
 msgid "Target currency"
 msgstr "Ð?дÑ?едиÑ?на валÑ?Ñ?а"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+msgid "Target units"
+msgstr "Ð?дÑ?едиÑ?на Ñ?единиÑ?а"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
 msgid "The angle units to use"
 msgstr "Ð?единиÑ?е Ñ?глова коÑ?е Ñ?Ñ?еба коÑ?иÑ?Ñ?иÑ?и"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
 msgid "The button mode"
 msgstr "Режим дÑ?гмеÑ?а"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
 msgid "The format to display numbers in"
 msgstr "ФоÑ?маÑ? Ñ? коме Ñ?Ñ?еба пÑ?иказиваÑ?и бÑ?оÑ?еве"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
 msgid "The number of digits displayed after the numeric point"
 msgstr "Ð?Ñ?оÑ? Ñ?иÑ?аÑ?а пÑ?иказан поÑ?ле деÑ?ималног заÑ?еза"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
 msgid "The numeric base"
 msgstr "Ð?Ñ?оÑ?на оÑ?нова"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:21
 msgid "The size of the words used in bitwise operations"
 msgstr "Ð?Ñ?жина Ñ?еÑ?и коÑ?а Ñ?е коÑ?иÑ?Ñ?и за биÑ?Ñ?ке опеÑ?аÑ?иÑ?е"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+msgid "Units of the current calculation"
+msgstr "Ð?единиÑ?а Ñ?Ñ?енÑ?Ñ?не Ñ?аÑ?Ñ?ниÑ?е"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+msgid "Units to convert the current calculation into"
+msgstr "Ð?единиÑ?а Ñ? коÑ?Ñ? Ñ?Ñ?еба пÑ?еÑ?воÑ?иÑ?и Ñ?аÑ?Ñ?ниÑ?Ñ?"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
 msgid "Word size"
 msgstr "Ð?Ñ?жина Ñ?еÑ?и"
 
-#: ../src/currency.h:19
-msgid "Australian dollar"
+#: ../src/currency-manager.c:30
+msgid "UAE Dirham"
+msgstr "Ð?миÑ?аÑ?Ñ?ки диÑ?Ñ?ам"
+
+#: ../src/currency-manager.c:31
+msgid "Australian Dollar"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?алиÑ?Ñ?ки долаÑ?"
 
-#: ../src/currency.h:20
-msgid "Bulgarian lev"
+#: ../src/currency-manager.c:32
+msgid "Bulgarian Lev"
 msgstr "Ð?Ñ?гаÑ?Ñ?ки лев"
 
-#: ../src/currency.h:21
-msgid "Brazilian real"
+#: ../src/currency-manager.c:33
+msgid "Bahraini Dinar"
+msgstr "Ð?аÑ?Ñ?еинÑ?ки динаÑ?"
+
+#: ../src/currency-manager.c:34
+msgid "Brunei Dollar"
+msgstr "Ð?Ñ?Ñ?неÑ?Ñ?ки долаÑ?"
+
+#: ../src/currency-manager.c:35
+msgid "Brazilian Real"
 msgstr "Ð?Ñ?азилÑ?ки Ñ?еал"
 
-#: ../src/currency.h:22
-msgid "Canadian dollar"
+#: ../src/currency-manager.c:36
+msgid "Botswana Pula"
+msgstr "Ð?оÑ?ванÑ?ка пÑ?ла"
+
+#: ../src/currency-manager.c:37
+msgid "Canadian Dollar"
 msgstr "Ð?анадÑ?ки долаÑ?"
 
-#: ../src/currency.h:23
-msgid "Swiss franc"
+#: ../src/currency-manager.c:38
+msgid "Swiss Franc"
 msgstr "ШваÑ?Ñ?аÑ?Ñ?ки Ñ?Ñ?анак"
 
-#: ../src/currency.h:24
-msgid "Chinese yuan renminbi"
+#: ../src/currency-manager.c:39
+msgid "Chilean Peso"
+msgstr "ЧилеанÑ?ки пезоÑ?"
+
+#: ../src/currency-manager.c:40
+msgid "Chinese Yuan"
 msgstr "Ð?инеÑ?ки Ñ?Ñ?ан"
 
-#: ../src/currency.h:25
-msgid "Czech koruna"
+#: ../src/currency-manager.c:41
+msgid "Colombian Peso"
+msgstr "Ð?олÑ?мбиÑ?Ñ?ки пезоÑ?"
+
+#: ../src/currency-manager.c:42
+msgid "Czech Koruna"
 msgstr "ЧеÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:26
-msgid "Danish krone"
+#: ../src/currency-manager.c:43
+msgid "Danish Krone"
 msgstr "Ð?анÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:27
-msgid "Estonian kroon"
+#: ../src/currency-manager.c:44
+msgid "Algerian Dinar"
+msgstr "Ð?лжиÑ?Ñ?ки динаÑ?"
+
+#: ../src/currency-manager.c:45
+msgid "Estonian Kroon"
 msgstr "Ð?Ñ?Ñ?онÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:28
+#: ../src/currency-manager.c:46
 msgid "Euro"
 msgstr "Ð?вÑ?о"
 
-#: ../src/currency.h:29
-msgid "Pound sterling"
+#: ../src/currency-manager.c:47
+msgid "Pound Sterling"
 msgstr "ФÑ?нÑ?а Ñ?Ñ?еÑ?линг"
 
-#: ../src/currency.h:30
-msgid "Hong Kong dollar"
+#: ../src/currency-manager.c:48
+msgid "Hong Kong Dollar"
 msgstr "Хонгконг долаÑ?"
 
-#: ../src/currency.h:31
-msgid "Croatian kuna"
+#: ../src/currency-manager.c:49
+msgid "Croatian Kuna"
 msgstr "Ð¥Ñ?ваÑ?Ñ?ка кÑ?на"
 
-#: ../src/currency.h:32
-msgid "Hungarian forint"
+#: ../src/currency-manager.c:50
+msgid "Hungarian Forint"
 msgstr "Ð?аÑ?аÑ?Ñ?ка Ñ?оÑ?инÑ?а"
 
-#: ../src/currency.h:33
-msgid "Indonesian rupiah"
+#: ../src/currency-manager.c:51
+msgid "Indonesian Rupiah"
 msgstr "Ð?ндонежанÑ?ка Ñ?Ñ?пиÑ?а"
 
-#: ../src/currency.h:34
-msgid "Indian rupee"
+#: ../src/currency-manager.c:52
+msgid "Israeli New Shekel"
+msgstr "Ð?зÑ?аелÑ?ки нови Ñ?екел"
+
+#: ../src/currency-manager.c:53
+msgid "Indian Rupee"
 msgstr "Ð?ндиÑ?Ñ?ка Ñ?Ñ?пиÑ?а"
 
-#: ../src/currency.h:35
-msgid "Icelandic krona"
+#: ../src/currency-manager.c:54
+msgid "Iranian Rial"
+msgstr "Ð?Ñ?анÑ?ки Ñ?иÑ?ал"
+
+#: ../src/currency-manager.c:55
+msgid "Icelandic Krona"
 msgstr "Ð?Ñ?ландÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:36
-msgid "Japanese yen"
+#: ../src/currency-manager.c:56
+msgid "Japanese Yen"
 msgstr "Ð?апанÑ?ки Ñ?ен"
 
-#: ../src/currency.h:37
-msgid "South Korean won"
+#: ../src/currency-manager.c:57
+msgid "South Korean Won"
 msgstr "Ð?Ñ?жнокоÑ?еÑ?Ñ?ки вон"
 
-#: ../src/currency.h:38
-msgid "Lithuanian litas"
+#: ../src/currency-manager.c:58
+msgid "Kuwaiti Dinar"
+msgstr "Ð?Ñ?ваÑ?Ñ?Ñ?ки динаÑ?"
+
+#: ../src/currency-manager.c:59
+msgid "Kazakhstani Tenge"
+msgstr "Ð?азаÑ?Ñ?Ñ?анÑ?ки Ñ?енге"
+
+#: ../src/currency-manager.c:60
+msgid "Sri Lankan Rupee"
+msgstr "ШÑ?иланканÑ?ка Ñ?Ñ?пиÑ?а"
+
+#: ../src/currency-manager.c:61
+msgid "Lithuanian Litas"
 msgstr "Ð?иÑ?ванÑ?ки лиÑ?аÑ?"
 
-#: ../src/currency.h:39
-msgid "Latvian lats"
+#: ../src/currency-manager.c:62
+msgid "Latvian Lats"
 msgstr "Ð?еÑ?онÑ?ки лаÑ?Ñ?"
 
-#: ../src/currency.h:40
-msgid "Mexican peso"
+#: ../src/currency-manager.c:63
+msgid "Libyan Dinar"
+msgstr "Ð?ибиÑ?Ñ?ки динаÑ?"
+
+#: ../src/currency-manager.c:64
+msgid "Mauritian Rupee"
+msgstr "Ð?аÑ?Ñ?иÑ?иÑ?Ñ?ка Ñ?Ñ?пиÑ?а"
+
+#: ../src/currency-manager.c:65
+msgid "Mexican Peso"
 msgstr "Ð?екÑ?иÑ?ки пезоÑ?"
 
-#: ../src/currency.h:41
-msgid "Malaysian ringgit"
+#: ../src/currency-manager.c:66
+msgid "Malaysian Ringgit"
 msgstr "Ð?алезиÑ?Ñ?ки Ñ?ингиÑ?"
 
-#: ../src/currency.h:42
-msgid "Norwegian krone"
+#: ../src/currency-manager.c:67
+msgid "Norwegian Krone"
 msgstr "Ð?оÑ?веÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:43
-msgid "New Zealand dollar"
+#: ../src/currency-manager.c:68
+msgid "Nepalese Rupee"
+msgstr "Ð?епалÑ?ка Ñ?Ñ?пиÑ?а"
+
+#: ../src/currency-manager.c:69
+msgid "New Zealand Dollar"
 msgstr "Ð?овозеландÑ?ки долаÑ?"
 
-#: ../src/currency.h:44
-msgid "Philippine peso"
+#: ../src/currency-manager.c:70
+msgid "Omani Rial"
+msgstr "Ð?манÑ?ки Ñ?иÑ?ал"
+
+#: ../src/currency-manager.c:71
+msgid "Peruvian Nuevo Sol"
+msgstr "Ð?еÑ?Ñ?анÑ?ки нови Ñ?ол"
+
+#: ../src/currency-manager.c:72
+msgid "Philippine Peso"
 msgstr "ФилипинÑ?ки пезоÑ?"
 
-#: ../src/currency.h:45
-msgid "Polish zloty"
+#: ../src/currency-manager.c:73
+msgid "Pakistani Rupee"
+msgstr "Ð?акиÑ?Ñ?анÑ?ка Ñ?Ñ?пиÑ?а"
+
+#: ../src/currency-manager.c:74
+msgid "Polish Zloty"
 msgstr "Ð?оÑ?Ñ?ки злоÑ?"
 
-#: ../src/currency.h:46
-msgid "New Romanian leu"
+#: ../src/currency-manager.c:75
+msgid "Qatari Riyal"
+msgstr "Ð?аÑ?аÑ?Ñ?ки Ñ?иÑ?ал"
+
+#: ../src/currency-manager.c:76
+msgid "New Romanian Leu"
 msgstr "Ð?ови Ñ?Ñ?мÑ?нÑ?ки леÑ?"
 
-#: ../src/currency.h:47
-msgid "Russian rouble"
+#: ../src/currency-manager.c:77
+msgid "Russian Rouble"
 msgstr "РÑ?Ñ?ка Ñ?Ñ?бÑ?а"
 
-#: ../src/currency.h:48
-msgid "Swedish krona"
+#: ../src/currency-manager.c:78
+msgid "Saudi Riyal"
+msgstr "СаÑ?диÑ?Ñ?ки Ñ?иÑ?ал"
+
+#: ../src/currency-manager.c:79
+msgid "Swedish Krona"
 msgstr "ШведÑ?ка кÑ?Ñ?на"
 
-#: ../src/currency.h:49
-msgid "Singapore dollar"
+#: ../src/currency-manager.c:80
+msgid "Singapore Dollar"
 msgstr "СингапÑ?Ñ?Ñ?ки долаÑ?"
 
-#: ../src/currency.h:50
-msgid "Thai baht"
+#: ../src/currency-manager.c:81
+msgid "Thai Baht"
 msgstr "ТаÑ?ландÑ?ки баÑ?"
 
-#: ../src/currency.h:51
-msgid "New Turkish lira"
+#: ../src/currency-manager.c:82
+msgid "Tunisian Dinar"
+msgstr "ТÑ?нижанÑ?ки дÑ?наÑ?"
+
+#: ../src/currency-manager.c:83
+msgid "New Turkish Lira"
 msgstr "Ð?ова Ñ?Ñ?Ñ?Ñ?ка лиÑ?а"
 
-#: ../src/currency.h:52
-msgid "US dollar"
+#: ../src/currency-manager.c:84
+msgid "T&T Dollar (TTD)"
+msgstr "T&T долаÑ? (TTD)"
+
+#: ../src/currency-manager.c:85
+msgid "US Dollar"
 msgstr "Ð?меÑ?иÑ?ки долаÑ?"
 
-#: ../src/currency.h:53
-msgid "South African rand"
+#: ../src/currency-manager.c:86
+msgid "Uruguayan Peso"
+msgstr "УÑ?Ñ?гваÑ?Ñ?ки пезоÑ?"
+
+#: ../src/currency-manager.c:87
+msgid "Venezuelan Bolívar"
+msgstr "Ð?енеÑ?Ñ?еланÑ?ки боливаÑ?"
+
+#: ../src/currency-manager.c:88
+msgid "South African Rand"
 msgstr "Ð?Ñ?жноаÑ?Ñ?иÑ?ки Ñ?анд"
 
 #. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:76
+#: ../src/gcalctool.c:77
 #, c-format
 msgid ""
 "Usage:\n"
@@ -716,7 +817,7 @@ msgstr ""
 "  %s â?? Ð?бавÑ?а маÑ?емаÑ?иÑ?ка изÑ?аÑ?Ñ?наваÑ?а"
 
 #. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:84
+#: ../src/gcalctool.c:85
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -732,7 +833,7 @@ msgstr ""
 "  --help-gtk                      Ð?Ñ?иказÑ?Ñ?е Ð?Ñ?к+ опÑ?иÑ?е"
 
 #. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:95
+#: ../src/gcalctool.c:96
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -756,15 +857,13 @@ msgstr ""
 "  --g-fatal-warnings              Ð?оÑ?Ñ?авÑ?а Ñ?ва Ñ?позоÑ?еÑ?а као кобна"
 
 #. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:109
+#: ../src/gcalctool.c:110
 #, c-format
 msgid ""
 "Application Options:\n"
-"  -u, --unittest                  Perform unit tests\n"
 "  -s, --solve <equation>          Solve the given equation"
 msgstr ""
 "Ð?пÑ?иÑ?е пÑ?огÑ?ама:\n"
-"  -u, --unittest                  Ð?Ñ?Ñ?и Ñ?единиÑ?но Ñ?еÑ?Ñ?иÑ?аÑ?е\n"
 "  -s, --solve <equation>          РеÑ?ава задаÑ?Ñ? Ñ?еднаÑ?инÑ?"
 
 #. Error printed to stderr when user uses --solve argument without an equation
@@ -774,318 +873,284 @@ msgid "Argument --solve requires an equation to solve"
 msgstr "Ð?Ñ?гÑ?менÑ? --solve заÑ?Ñ?ева Ñ?еднаÑ?инÑ? за Ñ?еÑ?аваÑ?е"
 
 #. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:168
+#: ../src/gcalctool.c:164
 #, c-format
 msgid "Unknown argument '%s'"
 msgstr "Ð?епознаÑ? аÑ?гÑ?менÑ? â??%sâ??"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:95
 msgid "Pi [Ctrl+P]"
 msgstr "Ð?и [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:109
+#: ../src/math-buttons.c:98
 msgid "Eulerâ??s Number"
 msgstr "Ð?Ñ?леÑ?ов бÑ?оÑ?"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.c:103
 msgid "Subscript mode [Alt]"
 msgstr "Режим индекÑ?а [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.c:106
 msgid "Superscript mode [Ctrl]"
 msgstr "Режим екÑ?поненÑ?а [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.c:109
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "Ð?аÑ?Ñ?ни екÑ?поненÑ? [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.c:112
 msgid "Add [+]"
 msgstr "СабеÑ?и [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.c:115
 msgid "Subtract [-]"
 msgstr "Ð?дÑ?зми [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.c:118
 msgid "Multiply [*]"
 msgstr "Ð?ножеÑ?е [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.c:121
 msgid "Divide [/]"
 msgstr "Ð?еÑ?еÑ?е [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.c:124
 msgid "Modulus divide"
 msgstr "Ð?еÑ?еÑ?е по модÑ?лÑ?"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.c:127
 msgid "Additional Functions"
 msgstr "Ð?одаÑ?не Ñ?Ñ?нкÑ?иÑ?е"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.c:130
 msgid "Exponent [^ or **]"
 msgstr "Ð?кÑ?поненÑ? [^ или **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.c:133
 msgid "Square [Ctrl+2]"
 msgstr "Ð?вадÑ?аÑ? [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.c:136
 msgid "Percentage [%]"
 msgstr "Ð?Ñ?оÑ?енаÑ? [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.c:139
 msgid "Factorial [!]"
 msgstr "ФакÑ?оÑ?иÑ?ел [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.c:142
 msgid "Absolute value [|]"
 msgstr "Ð?пÑ?олÑ?Ñ?на вÑ?едноÑ?Ñ? [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.c:145
 msgid "Complex argument"
 msgstr "Ð?омплекÑ?ни аÑ?гÑ?менÑ?"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.c:148
 msgid "Complex conjugate"
 msgstr "Ð?онÑ?Ñ?говано комплекÑ?на вÑ?едноÑ?Ñ?"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.c:151
 msgid "Root [Ctrl+R]"
 msgstr "Ð?оÑ?ен [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.c:154
 msgid "Square root [Ctrl+R]"
 msgstr "Ð?вадÑ?аÑ?ни коÑ?ен [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.c:157
 msgid "Logarithm"
 msgstr "Ð?огаÑ?иÑ?ам"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.c:160
 msgid "Natural Logarithm"
 msgstr "Ð?Ñ?иÑ?одни логаÑ?иÑ?ам"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.c:163
 msgid "Sine"
 msgstr "СинÑ?Ñ?"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.c:166
 msgid "Cosine"
 msgstr "Ð?оÑ?инÑ?Ñ?"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.c:169
 msgid "Tangent"
 msgstr "ТангенÑ?"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.c:172
 msgid "Hyperbolic Sine"
 msgstr "СинÑ?Ñ? ХипеÑ?болиÑ?ни"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.c:175
 msgid "Hyperbolic Cosine"
 msgstr "Ð?оÑ?инÑ?Ñ? ХипеÑ?болиÑ?ни"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.c:178
 msgid "Hyperbolic Tangent"
 msgstr "ТангенÑ? ХипеÑ?болиÑ?ни"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.c:181
 msgid "Inverse [Ctrl+I]"
 msgstr "Ð?нвеÑ?зно [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:195
+#: ../src/math-buttons.c:184
 msgid "Boolean AND"
 msgstr "Ð?огиÑ?ко Ð?"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:198
+#: ../src/math-buttons.c:187
 msgid "Boolean OR"
 msgstr "Ð?огиÑ?ко Ð?Ð?Ð?"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.c:190
 msgid "Boolean Exclusive OR"
 msgstr "Ð?огиÑ?ко Ð?Ð?Ð?Ð?"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:204
+#: ../src/math-buttons.c:193
 msgid "Boolean NOT"
 msgstr "Ð?огиÑ?ко Ð?Ð?"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:207 ../src/math-buttons.c:1442
+#: ../src/math-buttons.c:196 ../src/math-buttons.c:1028
 msgid "Integer Component"
 msgstr "ЦелобÑ?оÑ?ни Ð?ео"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:210 ../src/math-buttons.c:1444
+#: ../src/math-buttons.c:199 ../src/math-buttons.c:1030
 msgid "Fractional Component"
 msgstr "РазломÑ?ени Ð?ео"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.c:202
 msgid "Real Component"
 msgstr "Реални Ð?ео"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.c:205
 msgid "Imaginary Component"
 msgstr "Ð?магинаÑ?ни Ð?ео"
 
-#. Tooltip for the ones complement button
-#: ../src/math-buttons.c:219
+#. Tooltip for the ones' complement button
+#: ../src/math-buttons.c:208
 msgid "Ones' Complement"
 msgstr "Ð?омплеменÑ? Ð?единиÑ?е"
 
-#. Tooltip for the twos complement button
-#: ../src/math-buttons.c:222
+#. Tooltip for the two's complement button
+#: ../src/math-buttons.c:211
 msgid "Two's Complement"
 msgstr "Ð?омплеменÑ? Ð?воÑ?ке"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:225
+#: ../src/math-buttons.c:214
 msgid "Truncate"
 msgstr "Ð?дÑ?еÑ?и"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.c:217
 msgid "Start Group [(]"
 msgstr "Ð?оÑ?еÑ?ак Ð?Ñ?Ñ?пе [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.c:220
 msgid "End Group [)]"
 msgstr "Ð?Ñ?аÑ? Ð?Ñ?Ñ?пе [)]"
 
-#. Tooltip for the assign variable button
-#: ../src/math-buttons.c:234
-msgid "Assign Variable"
-msgstr "Ð?одели пÑ?оменÑ?ивÑ?"
-
-#. Tooltip for the insert variable button
-#: ../src/math-buttons.c:237
-msgid "Insert Variable"
-msgstr "УбаÑ?и пÑ?оменÑ?ивÑ?"
-
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:243
+#: ../src/math-buttons.c:229
 msgid "Calculate Result"
 msgstr "Ð?зÑ?аÑ?Ñ?наÑ? РезÑ?лÑ?аÑ?"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:246
+#: ../src/math-buttons.c:232
 msgid "Factorize [Ctrl+F]"
 msgstr "ФакÑ?оÑ?иÑ?и [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:249
+#: ../src/math-buttons.c:235
 msgid "Clear Display [Escape]"
 msgstr "Ð?Ñ?иÑ?Ñ?и Ð?кÑ?ан [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:252
+#: ../src/math-buttons.c:238
 msgid "Undo [Ctrl+Z]"
 msgstr "Ð?позови [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:264
+#: ../src/math-buttons.c:250
 msgid "Double Declining Depreciation"
 msgstr "Ð?воÑ?Ñ?Ñ?Ñ?ко-Ð?падаÑ?Ñ?Ñ?е УмаÑ?еÑ?е"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:270
+#: ../src/math-buttons.c:256
 msgid "Financial Term"
 msgstr "ФинанÑ?иÑ?Ñ?ки Ð?зÑ?аз"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:273
+#: ../src/math-buttons.c:259
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Ð?биÑ?-Ñ?иÑ?аÑ?а-године Ñ?маÑ?еÑ?е"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:276
+#: ../src/math-buttons.c:262
 msgid "Straight Line Depreciation"
 msgstr "Ð?Ñ?аволиниÑ?Ñ?ко Ñ?маÑ?еÑ?е"
 
-#. Advanced buttons: Angle unit combo box: Use degrees for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../src/math-buttons.c:892 ../src/math-preferences.c:255
-msgid "Degrees"
-msgstr "СÑ?епени"
-
-#. Advanced buttons: Angle unit combo box: Use radians for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-buttons.c:896 ../src/math-preferences.c:259
-msgid "Radians"
-msgstr "РадиÑ?ани"
-
-#. Advanced buttons: Angle unit combo box: Use gradians for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-buttons.c:900 ../src/math-preferences.c:263
-msgid "Gradians"
-msgstr "Ð?Ñ?адиÑ?ани"
-
 #. Number display mode combo: Binary, e.g. 10011010010â??
-#: ../src/math-buttons.c:934
+#: ../src/math-buttons.c:652
 msgid "Binary"
 msgstr "Ð?инаÑ?но"
 
 #. Number display mode combo: Octal, e.g. 2322â??
-#: ../src/math-buttons.c:938
+#: ../src/math-buttons.c:656
 msgid "Octal"
 msgstr "Ð?кÑ?ално"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:942
+#: ../src/math-buttons.c:660
 msgid "Decimal"
 msgstr "Ð?еÑ?имално"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2â??â??
-#: ../src/math-buttons.c:946
+#: ../src/math-buttons.c:664
 msgid "Hexadecimal"
 msgstr "ХекÑ?адеÑ?имално"
 
-#. Text shown in store menu when no variables defined
-#. Text shown in recall menu when no variables defined
-#: ../src/math-buttons.c:1263 ../src/math-buttons.c:1309
-msgid "No variables defined"
-msgstr "Ð?ема деÑ?иниÑ?аниÑ? пÑ?оменÑ?ивиÑ?"
-
 #. Left Shift Popup: Menu item to shift left by n places (n < 10)
 #. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:1352 ../src/math-buttons.c:1396
+#: ../src/math-buttons.c:938 ../src/math-buttons.c:982
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1095,7 +1160,7 @@ msgstr[2] "_%d меÑ?Ñ?а"
 
 #. Left Shift Popup: Menu item to shift left by n places (n >= 10)
 #. Right Shift Popup: Menu item to shift right by n places (n >= 10)
-#: ../src/math-buttons.c:1356 ../src/math-buttons.c:1400
+#: ../src/math-buttons.c:942 ../src/math-buttons.c:986
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1104,120 +1169,146 @@ msgstr[1] "%d меÑ?Ñ?а"
 msgstr[2] "%d меÑ?Ñ?а"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1446
+#: ../src/math-buttons.c:1032
 msgid "Round"
 msgstr "Ð?аокÑ?Ñ?жи"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1448
+#: ../src/math-buttons.c:1034
 msgid "Floor"
 msgstr "Ð?аокÑ?Ñ?жи на доле"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1450
+#: ../src/math-buttons.c:1036
 msgid "Ceiling"
 msgstr "Ð?аокÑ?Ñ?жи на гоÑ?е"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1452
+#: ../src/math-buttons.c:1038
 msgid "Sign"
 msgstr "Ð?нак"
 
+#. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
+#: ../src/math-converter.c:364
+msgid " in "
+msgstr " Ñ? "
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:496
+#: ../src/math-equation.c:453
 msgid "No undo history"
 msgstr "Ð?ема иÑ?Ñ?оÑ?иÑ?аÑ?а опозиваÑ?а"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:521
+#: ../src/math-equation.c:478
 msgid "No redo history"
 msgstr "Ð?ема иÑ?Ñ?оÑ?иÑ?аÑ?а понавÑ?аÑ?а"
 
-#: ../src/math-equation.c:845
+#: ../src/math-equation.c:867
 msgid "No sane value to store"
 msgstr "Ð?ема Ñ?азÑ?мне вÑ?едноÑ?Ñ?и за Ñ?меÑ?Ñ?аÑ?е"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1105
+#: ../src/math-equation.c:1132
 msgid "Overflow. Try a bigger word size"
 msgstr "Ð?Ñ?екоÑ?аÑ?еÑ?е. Ð?окÑ?Ñ?аÑ?Ñ?е Ñ?а веÑ?ом дÑ?жином Ñ?еÑ?и"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1110
+#: ../src/math-equation.c:1137
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "Ð?епознаÑ?а пÑ?оменÑ?ива â??%sâ??"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1115
+#: ../src/math-equation.c:1142
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "ФÑ?нкÑ?иÑ?а â??%sâ?? ниÑ?е деÑ?иниÑ?ана"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1120
+#: ../src/math-equation.c:1147
 msgid "Unknown conversion"
 msgstr "Ð?епознаÑ?о пÑ?еÑ?ваÑ?аÑ?е"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1129
+#: ../src/math-equation.c:1156
 msgid "Malformed expression"
 msgstr "Ð?еиÑ?пÑ?аван изÑ?аз"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1152
+#: ../src/math-equation.c:1288
 msgid "Need an integer to factorize"
 msgstr "Ð?а Ñ?акÑ?оÑ?иÑ?аÑ?е Ñ?е поÑ?Ñ?ебан Ñ?ео бÑ?оÑ?"
 
 #. This message is displayed in the status bar when a bit
 #. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1229
+#: ../src/math-equation.c:1355
 msgid "No sane value to bitwise shift"
 msgstr "Ð?ема Ñ?азÑ?мне вÑ?едноÑ?Ñ?и за биÑ?Ñ?ко помеÑ?аÑ?е"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1258
+#: ../src/math-equation.c:1384
 msgid "Displayed value not an integer"
 msgstr "Ð?Ñ?иказана вÑ?едноÑ?Ñ? ниÑ?е Ñ?ео бÑ?оÑ?"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1648
+#: ../src/math-equation.c:1807
 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"
 
 #. Label on close button in preferences dialog
-#: ../src/math-preferences.c:245
+#: ../src/math-preferences.c:236
 msgid "_Close"
 msgstr "_Ð?аÑ?воÑ?и"
 
+#. 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
+msgid "Degrees"
+msgstr "СÑ?епени"
+
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../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
+msgid "Gradians"
+msgstr "Ð?Ñ?адиÑ?ани"
+
+#. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234Ã?10^99)
+#: ../src/math-preferences.c:264
+msgid "Automatic"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки"
+
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:273
+#: ../src/math-preferences.c:268
 msgid "Fixed"
 msgstr "ФикÑ?ни"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã?10^3
-#: ../src/math-preferences.c:277
+#: ../src/math-preferences.c:272
 msgid "Scientific"
 msgstr "Ð?аÑ?Ñ?ни"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:281
+#: ../src/math-preferences.c:276
 msgid "Engineering"
 msgstr "Ð?нжеÑ?еÑ?Ñ?ки"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:292
+#: ../src/math-preferences.c:287
 #, c-format
 msgid "Show %d decimal _places"
 msgstr "_Ð?Ñ?икажи %d деÑ?имална меÑ?Ñ?а"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:170
+#: ../src/math-window.c:163
 msgid "Unable to open help file"
 msgstr "Ð?е могÑ? да оÑ?воÑ?им даÑ?оÑ?екÑ? за помоÑ?"
 
 #. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:201
+#: ../src/math-window.c:195
 msgid "translator-credits"
 msgstr ""
 "Ð?анило Шеган <danilo prevod org>\n"
@@ -1228,7 +1319,7 @@ msgstr ""
 "Prevod.org â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език"
 
 #. The license this software is under (GPL2+)
-#: ../src/math-window.c:204
+#: ../src/math-window.c:198
 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"
@@ -1259,133 +1350,137 @@ msgstr ""
 "02110-1301 USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:221
+#: ../src/math-window.c:215
 msgid "Gcalctool"
 msgstr "Ð?номов калкÑ?лаÑ?оÑ?"
 
 #. Copyright notice in the about dialog
-#: ../src/math-window.c:225
+#: ../src/math-window.c:219
 msgid "© 1986â??2010 The Gcalctool authors"
 msgstr "© 1986â??2010 Ð?Ñ?Ñ?оÑ?и Ð?номовог калкÑ?лаÑ?оÑ?а"
 
 #. Short description in the about dialog
-#: ../src/math-window.c:229
+#: ../src/math-window.c:223
 msgid "Calculator with financial and scientific modes."
 msgstr "Ð?алкÑ?лаÑ?оÑ? Ñ?а Ñ?инанÑ?иÑ?Ñ?ким и наÑ?Ñ?ним наÑ?ином Ñ?ада."
 
 #. Calculator menu
-#: ../src/math-window.c:355
+#: ../src/math-window.c:349
 msgid "_Calculator"
 msgstr "_Ð?алкÑ?лаÑ?оÑ?"
 
 #. Mode menu
-#: ../src/math-window.c:357
+#: ../src/math-window.c:351
 msgid "_Mode"
 msgstr "_Ð?од"
 
 #. Help menu label
-#: ../src/math-window.c:359
+#: ../src/math-window.c:353
 msgid "_Help"
 msgstr "_Ð?омоÑ?"
 
 #. Basic menu label
-#: ../src/math-window.c:361
+#: ../src/math-window.c:355
 msgid "_Basic"
 msgstr "_Ð?Ñ?новни"
 
 #. Advanced menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:357
 msgid "_Advanced"
 msgstr "Ð?а_пÑ?едни"
 
 #. Financial menu label
-#: ../src/math-window.c:365
+#: ../src/math-window.c:359
 msgid "_Financial"
 msgstr "_ФинанÑ?иÑ?Ñ?ки"
 
 #. Programming menu label
-#: ../src/math-window.c:367
+#: ../src/math-window.c:361
 msgid "_Programming"
 msgstr "Ð?_Ñ?огÑ?амеÑ?Ñ?ки"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:369
+#: ../src/math-window.c:363
 msgid "_Contents"
 msgstr "_СадÑ?жаÑ?"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:103
+#: ../src/mp-binary.c:115
 msgid "Boolean AND is only defined for positive integers"
 msgstr "Ð?огиÑ?ко Ð? Ñ?е деÑ?иниÑ?ано Ñ?амо за позиÑ?ивне Ñ?еле бÑ?оÑ?еве"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:116
+#: ../src/mp-binary.c:128
 msgid "Boolean OR is only defined for positive integers"
 msgstr "Ð?огиÑ?ко Ð?Ð?Ð? Ñ?е деÑ?иниÑ?ано Ñ?амо за позиÑ?ивне Ñ?еле бÑ?оÑ?еве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:129
+#: ../src/mp-binary.c:141
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "Ð?огиÑ?ко Ð?Ð?Ð?Ð? Ñ?е деÑ?иниÑ?ано Ñ?амо за позиÑ?ивне Ñ?еле бÑ?оÑ?еве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:144
+#: ../src/mp-binary.c:156
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "Ð?огиÑ?ко Ð?Ð? Ñ?е деÑ?иниÑ?ано Ñ?амо за позиÑ?ивне Ñ?еле бÑ?оÑ?еве"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:174
+#: ../src/mp-binary.c:187
 msgid "Shift is only possible on integer values"
 msgstr "Ð?омеÑ?аÑ?е Ñ?е могÑ?Ñ?е Ñ?амо за позиÑ?ивне Ñ?еле вÑ?едноÑ?Ñ?и"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:149
+#: ../src/mp.c:148
 msgid "Argument not defined for zero"
 msgstr "Ð?Ñ?гÑ?менÑ? ниÑ?е деÑ?иниÑ?ан за нÑ?лÑ?"
 
+#: ../src/mp.c:299
+msgid "Overflow: the result couldn't be calculated"
+msgstr "Ð?Ñ?екоÑ?аÑ?еÑ?е: Ñ?езÑ?лÑ?аÑ? Ñ?е не може изÑ?аÑ?Ñ?наÑ?и"
+
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:636 ../src/mp.c:668 ../src/mp.c:1602
+#: ../src/mp.c:644 ../src/mp.c:676 ../src/mp.c:1610
 msgid "Division by zero is undefined"
 msgstr "Ð?еÑ?еÑ?е Ñ?а нÑ?лом ниÑ?е деÑ?иниÑ?ано"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1273 ../src/mp.c:1310
+#: ../src/mp.c:1281 ../src/mp.c:1318
 msgid "Logarithm of zero is undefined"
 msgstr "Ð?огаÑ?иÑ?ам од нÑ?ле ниÑ?е деÑ?иниÑ?ан"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1675 ../src/mp.c:1990
+#: ../src/mp.c:1683 ../src/mp.c:1998
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "СÑ?епеноваÑ?е нÑ?ле ниÑ?е деÑ?иниÑ?ано за негаÑ?ивне екÑ?поненÑ?е"
 
-#: ../src/mp.c:1700
+#: ../src/mp.c:1708
 msgid "Reciprocal of zero is undefined"
 msgstr "РеÑ?ипÑ?оÑ?на вÑ?едноÑ?Ñ? нÑ?ле ниÑ?е деÑ?иниÑ?ана"
 
-#: ../src/mp.c:1785
+#: ../src/mp.c:1793
 msgid "Root must be non-zero"
 msgstr "Ð?оÑ?ан моÑ?а биÑ?и Ñ?азлиÑ?иÑ? од нÑ?ле"
 
-#: ../src/mp.c:1803
+#: ../src/mp.c:1811
 msgid "Negative root of zero is undefined"
 msgstr "Ð?егаÑ?ивни коÑ?ен од нÑ?ле ниÑ?е деÑ?иниÑ?ан"
 
-#: ../src/mp.c:1809
+#: ../src/mp.c:1817
 msgid "nth root of negative number is undefined for even n"
 msgstr "n-Ñ?и коÑ?ен од негаÑ?ивног бÑ?оÑ?а ниÑ?е деÑ?иниÑ?ан за паÑ?но n"
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1930
+#: ../src/mp.c:1938
 msgid "Factorial is only defined for natural numbers"
 msgstr "ФакÑ?оÑ?иÑ?ел Ñ?е деÑ?иниÑ?ан Ñ?амо за пÑ?иÑ?одне бÑ?оÑ?еве"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1950
+#: ../src/mp.c:1958
 msgid "Modulus division is only defined for integers"
 msgstr "Ð?еÑ?еÑ?е по модÑ?лÑ? Ñ?е деÑ?иниÑ?ано Ñ?амо за Ñ?еле бÑ?оÑ?еве"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../src/mp-trigonometric.c:311
+#: ../src/mp-trigonometric.c:310
 msgid ""
 "Tangent is undefined for angles that are multiples of Ï? (180°) from Ï?â??2 (90°)"
 msgstr ""
@@ -1393,22 +1488,20 @@ msgstr ""
 "(90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:356
+#: ../src/mp-trigonometric.c:355
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "Ð?нвеÑ?зни Ñ?инÑ?Ñ? ниÑ?е деÑ?иниÑ?ан за вÑ?едноÑ?Ñ?и изван [-1, 1]"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/mp-trigonometric.c:373
+#: ../src/mp-trigonometric.c:372
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 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 or equal to one"
+msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
-"Ð?нвеÑ?зни Ñ?инÑ?Ñ? Ñ?ипеÑ?болиÑ?ки ниÑ?е деÑ?иниÑ?ан за вÑ?едноÑ?Ñ?и веÑ?е или Ñ?еднако од "
-"Ñ?едан"
+"Ð?нвеÑ?зни коÑ?инÑ?Ñ? Ñ?ипеÑ?болиÑ?ки ниÑ?е деÑ?иниÑ?ан за вÑ?едноÑ?Ñ?и маÑ?е од Ñ?едан"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
 #: ../src/mp-trigonometric.c:615
@@ -1416,6 +1509,752 @@ msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr ""
 "Ð?нвеÑ?зни Ñ?ангенÑ? Ñ?ипеÑ?болиÑ?ки ниÑ?е деÑ?иниÑ?ан за вÑ?едноÑ?Ñ?и изван [-1, 1]"
 
+#: ../src/unit-manager.c:54
+#, c-format
+msgctxt "unit-format"
+msgid "%s degrees"
+msgstr "%s Ñ?Ñ?епени"
+
+#: ../src/unit-manager.c:54
+msgctxt "unit-symbols"
+msgid "degree,degrees,deg"
+msgstr "Ñ?Ñ?епен,Ñ?Ñ?епени,Ñ?Ñ?"
+
+#: ../src/unit-manager.c:55
+#, c-format
+msgctxt "unit-format"
+msgid "%s radians"
+msgstr "%s Ñ?адиÑ?ана"
+
+#: ../src/unit-manager.c:55
+msgctxt "unit-symbols"
+msgid "radian,radians,rad"
+msgstr "Ñ?адиÑ?ан,Ñ?адиÑ?ани,rad"
+
+#: ../src/unit-manager.c:56
+#, c-format
+msgctxt "unit-format"
+msgid "%s gradians"
+msgstr "%s гÑ?адиÑ?ана"
+
+#: ../src/unit-manager.c:56
+msgctxt "unit-symbols"
+msgid "gradian,gradians,grad"
+msgstr "гÑ?адиÑ?ан,гÑ?адиÑ?ана,grad"
+
+#: ../src/unit-manager.c:57
+msgid "Parsecs"
+msgstr "Ð?аÑ?Ñ?еÑ?и"
+
+#: ../src/unit-manager.c:57
+#, c-format
+msgctxt "unit-format"
+msgid "%s pc"
+msgstr "%s pc"
+
+#: ../src/unit-manager.c:57
+msgctxt "unit-symbols"
+msgid "parsec,parsecs,pc"
+msgstr "паÑ?Ñ?ек,паÑ?Ñ?еÑ?и,pc"
+
+#: ../src/unit-manager.c:58
+msgid "Light Years"
+msgstr "СвеÑ?лоÑ?не године"
+
+#: ../src/unit-manager.c:58
+#, c-format
+msgctxt "unit-format"
+msgid "%s ly"
+msgstr "%s ly"
+
+#: ../src/unit-manager.c:58
+msgctxt "unit-symbols"
+msgid "lightyear,lightyears,ly"
+msgstr "Ñ?веÑ?лоÑ?нагодина,Ñ?веÑ?лоÑ?негодине,ly"
+
+#: ../src/unit-manager.c:59
+msgid "Astronomical Units"
+msgstr "Ð?Ñ?Ñ?Ñ?ономÑ?ке Ñ?единиÑ?е"
+
+#: ../src/unit-manager.c:59
+#, c-format
+msgctxt "unit-format"
+msgid "%s au"
+msgstr "%s au"
+
+#: ../src/unit-manager.c:59
+msgctxt "unit-symbols"
+msgid "au"
+msgstr "au"
+
+#: ../src/unit-manager.c:60
+msgid "Nautical Miles"
+msgstr "Ð?аÑ?Ñ?иÑ?ке миÑ?е"
+
+#: ../src/unit-manager.c:60 ../src/unit-manager.c:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
+
+#: ../src/unit-manager.c:60
+msgctxt "unit-symbols"
+msgid "nm"
+msgstr "nm"
+
+#: ../src/unit-manager.c:61
+msgid "Miles"
+msgstr "Ð?иÑ?е"
+
+#: ../src/unit-manager.c:61
+#, c-format
+msgctxt "unit-format"
+msgid "%s mi"
+msgstr "%s mi"
+
+#: ../src/unit-manager.c:61
+msgctxt "unit-symbols"
+msgid "mile,miles,mi"
+msgstr "миÑ?а,миÑ?е,mi"
+
+#: ../src/unit-manager.c:62
+msgid "Kilometers"
+msgstr "Ð?иломеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:62
+#, c-format
+msgctxt "unit-format"
+msgid "%s km"
+msgstr "%s km"
+
+#: ../src/unit-manager.c:62
+msgctxt "unit-symbols"
+msgid "kilometer,kilometers,km,kms"
+msgstr "киломеÑ?аÑ?,киломеÑ?аÑ?а,км,km"
+
+#: ../src/unit-manager.c:63
+msgid "Cables"
+msgstr "Ð?аблови"
+
+#: ../src/unit-manager.c:63
+#, c-format
+msgctxt "unit-format"
+msgid "%s cb"
+msgstr "%s cb"
+
+#: ../src/unit-manager.c:63
+msgctxt "unit-symbols"
+msgid "cable,cables,cb"
+msgstr "кабл,кабла,каблова,cb"
+
+#: ../src/unit-manager.c:64
+msgid "Fathoms"
+msgstr "ХваÑ?и"
+
+#: ../src/unit-manager.c:64
+#, c-format
+msgctxt "unit-format"
+msgid "%s ftm"
+msgstr "%s ftm"
+
+#: ../src/unit-manager.c:64
+msgctxt "unit-symbols"
+msgid "fathom,fathoms,ftm"
+msgstr "Ñ?ваÑ?,Ñ?ваÑ?а,Ñ?ваÑ?ова,Ñ?в,ftm"
+
+#: ../src/unit-manager.c:65
+msgid "Meters"
+msgstr "Ð?еÑ?Ñ?и"
+
+#: ../src/unit-manager.c:65
+#, c-format
+msgctxt "unit-format"
+msgid "%s m"
+msgstr "%s m"
+
+#: ../src/unit-manager.c:65
+msgctxt "unit-symbols"
+msgid "meter,meters,m"
+msgstr "меÑ?аÑ?,меÑ?Ñ?а,меÑ?аÑ?а,м,m"
+
+#: ../src/unit-manager.c:66
+msgid "Yards"
+msgstr "Ð?аÑ?ди"
+
+#: ../src/unit-manager.c:66
+#, c-format
+msgctxt "unit-format"
+msgid "%s yd"
+msgstr "%s yd"
+
+#: ../src/unit-manager.c:66
+msgctxt "unit-symbols"
+msgid "yard,yards,yd"
+msgstr "Ñ?аÑ?д,Ñ?аÑ?да,Ñ?аÑ?ди,yd"
+
+#: ../src/unit-manager.c:67
+msgid "Feet"
+msgstr "СÑ?опе"
+
+#: ../src/unit-manager.c:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s ft"
+msgstr "%s ft"
+
+#: ../src/unit-manager.c:67
+msgctxt "unit-symbols"
+msgid "foot,feet,ft"
+msgstr "Ñ?Ñ?опа,Ñ?Ñ?опе,Ñ?Ñ?опа,ft"
+
+#: ../src/unit-manager.c:68
+msgid "Inches"
+msgstr "Ð?нÑ?и"
+
+#: ../src/unit-manager.c:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s in"
+msgstr "%s in"
+
+#: ../src/unit-manager.c:68
+msgctxt "unit-symbols"
+msgid "inch,inches,in"
+msgstr "инÑ?,инÑ?а,ин,in"
+
+#: ../src/unit-manager.c:69
+msgid "Centimeters"
+msgstr "ЦенÑ?имеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm"
+msgstr "%s cm"
+
+#: ../src/unit-manager.c:69
+msgctxt "unit-symbols"
+msgid "centimeter,centimeters,cm,cms"
+msgstr "Ñ?енÑ?имеÑ?аÑ?,Ñ?енÑ?имеÑ?аÑ?а,Ñ?м,cm"
+
+#: ../src/unit-manager.c:70
+msgid "Millimeters"
+msgstr "Ð?илимеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:70
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm"
+msgstr "%s mm"
+
+#: ../src/unit-manager.c:70
+msgctxt "unit-symbols"
+msgid "millimeter,millimeters,mm"
+msgstr "милимеÑ?аÑ?,милимеÑ?аÑ?а,мм,mm"
+
+#: ../src/unit-manager.c:71
+msgid "Micrometers"
+msgstr "Ð?икÑ?омеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:71
+#, c-format
+msgctxt "unit-format"
+msgid "%s μm"
+msgstr "%s μm"
+
+#: ../src/unit-manager.c:71
+msgctxt "unit-symbols"
+msgid "micrometer,micrometers,um"
+msgstr "микÑ?омеÑ?аÑ?,микÑ?омеÑ?аÑ?а,um"
+
+#: ../src/unit-manager.c:72
+msgid "Nanometers"
+msgstr "Ð?аномеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:72
+msgctxt "unit-symbols"
+msgid "nanometer,nanometers"
+msgstr "наномеÑ?аÑ?,наномеÑ?аÑ?а,нм,nm"
+
+#: ../src/unit-manager.c:73
+msgid "Hectares"
+msgstr "ХекÑ?аÑ?и"
+
+#: ../src/unit-manager.c:73
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: ../src/unit-manager.c:73
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "Ñ?екÑ?аÑ?,Ñ?екÑ?аÑ?а, Ñ?а,ha"
+
+#: ../src/unit-manager.c:74
+msgid "Acres"
+msgstr "Ð?кÑ?и"
+
+#: ../src/unit-manager.c:74
+#, c-format
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s акÑ?е"
+
+#: ../src/unit-manager.c:74
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "акÑ?,акÑ?е,акÑ?и"
+
+#: ../src/unit-manager.c:75
+msgid "Square Meter"
+msgstr "Ð?вадÑ?аÑ?ни меÑ?Ñ?и"
+
+#: ../src/unit-manager.c:75
+#, c-format
+msgctxt "unit-format"
+msgid "%s m²"
+msgstr "%s m²"
+
+#: ../src/unit-manager.c:75
+msgctxt "unit-symbols"
+msgid "m²"
+msgstr "m²"
+
+#: ../src/unit-manager.c:76
+msgid "Square Centimeter"
+msgstr "Ð?вадÑ?аÑ?ни Ñ?енÑ?Ñ?имеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:76
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm²"
+msgstr "%s cm²"
+
+#: ../src/unit-manager.c:76
+msgctxt "unit-symbols"
+msgid "cm²"
+msgstr "cm²"
+
+#: ../src/unit-manager.c:77
+msgid "Square Millimeter"
+msgstr "Ð?вадÑ?аÑ?ни милимеÑ?Ñ?и"
+
+#: ../src/unit-manager.c:77
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm²"
+msgstr "%s mm²"
+
+#: ../src/unit-manager.c:77
+msgctxt "unit-symbols"
+msgid "mm²"
+msgstr "mm²"
+
+#: ../src/unit-manager.c:78
+msgid "Cubic Meters"
+msgstr "Ð?Ñ?бни меÑ?Ñ?и"
+
+#: ../src/unit-manager.c:78
+#, c-format
+msgctxt "unit-format"
+msgid "%s m³"
+msgstr "%s m³"
+
+#: ../src/unit-manager.c:78
+msgctxt "unit-symbols"
+msgid "m³"
+msgstr "m³"
+
+#: ../src/unit-manager.c:79
+msgid "Gallons"
+msgstr "Ð?алони"
+
+#: ../src/unit-manager.c:79
+#, c-format
+msgctxt "unit-format"
+msgid "%s gal"
+msgstr "%s gal"
+
+#: ../src/unit-manager.c:79
+msgctxt "unit-symbols"
+msgid "gallon,gallons,gal"
+msgstr "галон,галони,гал,gal"
+
+#: ../src/unit-manager.c:80
+msgid "Litres"
+msgstr "Ð?иÑ?Ñ?и"
+
+#: ../src/unit-manager.c:80
+#, c-format
+msgctxt "unit-format"
+msgid "%s L"
+msgstr "%s L"
+
+#: ../src/unit-manager.c:80
+msgctxt "unit-symbols"
+msgid "litre,litres,liter,liters,L"
+msgstr "лиÑ?аÑ?,лиÑ?Ñ?а,лиÑ?аÑ?а,Ð?,L"
+
+#: ../src/unit-manager.c:81
+msgid "Quarts"
+msgstr "Ð?ваÑ?Ñ?и"
+
+#: ../src/unit-manager.c:81
+#, c-format
+msgctxt "unit-format"
+msgid "%s qt"
+msgstr "%s qt"
+
+#: ../src/unit-manager.c:81
+msgctxt "unit-symbols"
+msgid "quart,quarts,qt"
+msgstr "кваÑ?Ñ?,кваÑ?Ñ?а,кваÑ?Ñ?ова,qt"
+
+#: ../src/unit-manager.c:82
+msgid "Pints"
+msgstr "Ð?инÑ?е"
+
+#: ../src/unit-manager.c:82
+#, c-format
+msgctxt "unit-format"
+msgid "%s pt"
+msgstr "%s pt"
+
+#: ../src/unit-manager.c:82
+msgctxt "unit-symbols"
+msgid "pint,pints,pt"
+msgstr "пинÑ?а,пинÑ?е,пинÑ?и,пÑ?,pt"
+
+#: ../src/unit-manager.c:83
+msgid "Millilitres"
+msgstr "Ð?илилиÑ?Ñ?и"
+
+#: ../src/unit-manager.c:83
+#, c-format
+msgctxt "unit-format"
+msgid "%s mL"
+msgstr "%s mL"
+
+#: ../src/unit-manager.c:83
+msgctxt "unit-symbols"
+msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
+msgstr "милилиÑ?аÑ?,милиÑ?Ñ?а,милилиÑ?аÑ?а,мл,mL,cm³"
+
+#: ../src/unit-manager.c:84
+msgid "Microlitre"
+msgstr "Ð?икÑ?олиÑ?Ñ?и"
+
+#: ../src/unit-manager.c:84
+#, c-format
+msgctxt "unit-format"
+msgid "%s μL"
+msgstr "%s μL"
+
+#: ../src/unit-manager.c:84
+msgctxt "unit-symbols"
+msgid "mm³,μL,uL"
+msgstr "mm³,μL,uL"
+
+#: ../src/unit-manager.c:85
+msgid "Tonnes"
+msgstr "Тоне"
+
+#: ../src/unit-manager.c:85
+#, c-format
+msgctxt "unit-format"
+msgid "%s T"
+msgstr "%s T"
+
+#: ../src/unit-manager.c:85
+msgctxt "unit-symbols"
+msgid "tonne,tonnes"
+msgstr "Ñ?она,Ñ?оне,Ñ?,T"
+
+#: ../src/unit-manager.c:86
+msgid "Kilograms"
+msgstr "Ð?илогÑ?ами"
+
+#: ../src/unit-manager.c:86
+#, c-format
+msgctxt "unit-format"
+msgid "%s kg"
+msgstr "%s kg"
+
+#: ../src/unit-manager.c:86
+msgctxt "unit-symbols"
+msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+msgstr "килогÑ?ам,килогÑ?ама,кг,kg"
+
+#: ../src/unit-manager.c:87
+msgid "Pounds"
+msgstr "ФÑ?нÑ?е"
+
+#: ../src/unit-manager.c:87
+#, c-format
+msgctxt "unit-format"
+msgid "%s lb"
+msgstr "%s lb"
+
+#: ../src/unit-manager.c:87
+msgctxt "unit-symbols"
+msgid "pound,pounds,lb"
+msgstr "Ñ?Ñ?нÑ?а,Ñ?Ñ?нÑ?е,Ñ?Ñ?нÑ?и,lb"
+
+#: ../src/unit-manager.c:88
+msgid "Ounces"
+msgstr "УнÑ?е"
+
+#: ../src/unit-manager.c:88
+#, c-format
+msgctxt "unit-format"
+msgid "%s oz"
+msgstr "%s oz"
+
+#: ../src/unit-manager.c:88
+msgctxt "unit-symbols"
+msgid "ounce,ounces,oz"
+msgstr "Ñ?нÑ?а,Ñ?нÑ?и,оз,oz"
+
+#: ../src/unit-manager.c:89
+msgid "Grams"
+msgstr "Ð?Ñ?адиÑ?аниÐ?Ñ?ами"
+
+#: ../src/unit-manager.c:89
+#, c-format
+msgctxt "unit-format"
+msgid "%s g"
+msgstr "%s g"
+
+#: ../src/unit-manager.c:89
+msgctxt "unit-symbols"
+msgid "gram,grams,gramme,grammes,g"
+msgstr "гÑ?ам,гÑ?ама,г,g"
+
+#: ../src/unit-manager.c:90
+msgid "Years"
+msgstr "Ð?одине"
+
+#: ../src/unit-manager.c:90
+#, c-format
+msgctxt "unit-format"
+msgid "%s years"
+msgstr "%s година"
+
+#: ../src/unit-manager.c:90
+msgctxt "unit-symbols"
+msgid "year,years"
+msgstr "година"
+
+#: ../src/unit-manager.c:91
+msgid "Days"
+msgstr "Ð?ани"
+
+#: ../src/unit-manager.c:91
+#, c-format
+msgctxt "unit-format"
+msgid "%s days"
+msgstr "%s дана"
+
+#: ../src/unit-manager.c:91
+msgctxt "unit-symbols"
+msgid "day,days"
+msgstr "дан,дана"
+
+#: ../src/unit-manager.c:92
+msgid "Hours"
+msgstr "СаÑ?и"
+
+#: ../src/unit-manager.c:92
+#, c-format
+msgctxt "unit-format"
+msgid "%s hours"
+msgstr "%s Ñ?аÑ?и"
+
+#: ../src/unit-manager.c:92
+msgctxt "unit-symbols"
+msgid "hour,hours"
+msgstr "Ñ?аÑ?,Ñ?аÑ?а,Ñ?аÑ?и"
+
+#: ../src/unit-manager.c:93
+msgid "Minutes"
+msgstr "Ð?инÑ?Ñ?и"
+
+#: ../src/unit-manager.c:93
+#, c-format
+msgctxt "unit-format"
+msgid "%s minutes"
+msgstr "%s минÑ?Ñ?а"
+
+#: ../src/unit-manager.c:93
+msgctxt "unit-symbols"
+msgid "minute,minutes"
+msgstr "минÑ?Ñ?,минÑ?Ñ?а"
+
+#: ../src/unit-manager.c:94
+msgid "Seconds"
+msgstr "СекÑ?нде"
+
+#: ../src/unit-manager.c:94
+#, c-format
+msgctxt "unit-format"
+msgid "%s s"
+msgstr "%s s"
+
+#: ../src/unit-manager.c:94
+msgctxt "unit-symbols"
+msgid "second,seconds,s"
+msgstr "Ñ?екÑ?нд,Ñ?екÑ?нде,Ñ?екÑ?нди,Ñ?,s"
+
+#: ../src/unit-manager.c:95
+msgid "Milliseconds"
+msgstr "Ð?илиÑ?екÑ?нде"
+
+#: ../src/unit-manager.c:95
+#, c-format
+msgctxt "unit-format"
+msgid "%s ms"
+msgstr "%s ms"
+
+#: ../src/unit-manager.c:95
+msgctxt "unit-symbols"
+msgid "millisecond,milliseconds,ms"
+msgstr "милиÑ?екÑ?нд,милиÑ?екÑ?нде,милиÑ?енди,мÑ?,ms"
+
+#: ../src/unit-manager.c:96
+msgid "Microseconds"
+msgstr "Ð?икÑ?оÑ?екÑ?нде"
+
+#: ../src/unit-manager.c:96
+#, c-format
+msgctxt "unit-format"
+msgid "%s μs"
+msgstr "%s μs"
+
+#: ../src/unit-manager.c:96
+msgctxt "unit-symbols"
+msgid "microsecond,microseconds,us"
+msgstr "микÑ?оÑ?екÑ?нд,микÑ?оÑ?екÑ?нде,микÑ?оÑ?екÑ?нди,us"
+
+#: ../src/unit-manager.c:97
+msgid "Celcius"
+msgstr "ЦелзиÑ?Ñ?Ñ?и"
+
+#: ../src/unit-manager.c:97
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?C"
+msgstr "%sË?C"
+
+#: ../src/unit-manager.c:97
+msgctxt "unit-symbols"
+msgid "degC,Ë?C"
+msgstr "Ц,degC,Ë?C"
+
+#: ../src/unit-manager.c:98
+msgid "Farenheit"
+msgstr "ФаÑ?анÑ?аÑ?Ñ?и"
+
+#: ../src/unit-manager.c:98
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?F"
+msgstr "%sË?F"
+
+#: ../src/unit-manager.c:98
+msgctxt "unit-symbols"
+msgid "degF,Ë?F"
+msgstr "Ф,degF,Ë?F"
+
+#: ../src/unit-manager.c:99
+msgid "Kelvin"
+msgstr "Ð?елвини"
+
+#: ../src/unit-manager.c:99
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?K"
+msgstr "%sË?K"
+
+#: ../src/unit-manager.c:99
+msgctxt "unit-symbols"
+msgid "degK,Ë?K"
+msgstr "Ð?,degK,Ë?K"
+
+#: ../src/unit-manager.c:100
+msgid "Rankine"
+msgstr "Ранкини"
+
+#: ../src/unit-manager.c:100
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?R"
+msgstr "%sË?R"
+
+#: ../src/unit-manager.c:100
+msgctxt "unit-symbols"
+msgid "degR,Ë?R"
+msgstr "Р,degR,Ë?R"
+
+#: ../src/unit-manager.c:109
+msgid "Angle"
+msgstr "Угао"
+
+#: ../src/unit-manager.c:110
+msgid "Length"
+msgstr "Ð?Ñ?жина"
+
+#: ../src/unit-manager.c:111
+msgid "Area"
+msgstr "Ð?овÑ?Ñ?ина"
+
+#: ../src/unit-manager.c:112
+msgid "Volume"
+msgstr "Ð?апÑ?емина"
+
+#: ../src/unit-manager.c:113
+msgid "Weight"
+msgstr "Тежина"
+
+#: ../src/unit-manager.c:114
+msgid "Duration"
+msgstr "ТÑ?аÑ?аÑ?е"
+
+#: ../src/unit-manager.c:115
+msgid "Temperature"
+msgstr "ТемпеÑ?аÑ?Ñ?Ñ?а"
+
+#: ../src/unit-manager.c:127
+msgid "Currency"
+msgstr "Ð?алÑ?Ñ?а"
+
+#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
+#: ../src/unit-manager.c:137
+#, c-format
+msgid "%s%%s"
+msgstr "%%s%s"
+
+#~ msgid "&#x2190; R"
+#~ msgstr "&#x2190; R"
+
+#~ msgid "&#x2192; R"
+#~ msgstr "&#x2192; R"
+
+#~ msgid "Recall"
+#~ msgstr "УÑ?иÑ?аÑ?"
+
+#~ msgid "Undo"
+#~ msgstr "Ð?позови"
+
+#~ msgid "Assign Variable"
+#~ msgstr "Ð?одели пÑ?оменÑ?ивÑ?"
+
+#~ msgid "Insert Variable"
+#~ msgstr "УбаÑ?и пÑ?оменÑ?ивÑ?"
+
+#~ msgid "No variables defined"
+#~ msgstr "Ð?ема деÑ?иниÑ?аниÑ? пÑ?оменÑ?ивиÑ?"
+
 #~ msgid ""
 #~ "Converts between different currencies. Enter the amount and the currency "
 #~ "you want to convert from on the upper row, and the currency you want to "
@@ -1620,9 +2459,6 @@ msgstr ""
 #~ "Ð?е могÑ? да пÑ?еÑ?змем кÑ?Ñ?Ñ?не лиÑ?Ñ?е. Ð?ожда Ñ?еÑ?е добиÑ?и погÑ?еÑ?не Ñ?езÑ?лÑ?аÑ?е "
 #~ "или неÑ?еÑ?е добиÑ?и никакав Ñ?езÑ?лÑ?аÑ?."
 
-#~ msgid "Paste"
-#~ msgstr "УбаÑ?и"
-
 #~ msgid "Logarithm of negative values is undefined"
 #~ msgstr "Ð?огаÑ?иÑ?ам од негаÑ?ивне вÑ?едноÑ?Ñ? ниÑ?е деÑ?иниÑ?ан"
 
@@ -1743,9 +2579,6 @@ msgstr ""
 #~ msgid "<"
 #~ msgstr "<"
 
-#~ msgid "<i>x</i>!"
-#~ msgstr "<i>x</i>!"
-
 #~ msgid "<i>x</i><sup>2</sup>"
 #~ msgstr "<i>x</i><sup>2</sup>"
 
@@ -2157,9 +2990,6 @@ msgstr ""
 #~ msgid "Square"
 #~ msgstr "Ð?вадÑ?аÑ?"
 
-#~ msgid "Square root"
-#~ msgstr "Ð?вадÑ?аÑ?ни коÑ?ен"
-
 # Ð?окÑ?ени виÑ?е опеÑ?аÑ?иÑ?а?
 # Ð?окÑ?ени изÑ?аÑ?Ñ?наваÑ?е
 #~ msgid "Start group of calculations [(]"
@@ -2288,9 +3118,6 @@ msgstr ""
 #~ msgid "register 9"
 #~ msgstr "Ñ?егиÑ?Ñ?аÑ? 9"
 
-#~ msgid "x2"
-#~ msgstr "x2"
-
 #~ msgid "%s: accuracy should be in the range 0-%d\n"
 #~ msgstr "%s: Ñ?аÑ?ноÑ?Ñ? Ñ?Ñ?еба да бÑ?де Ñ? опÑ?егÑ? 0â??%d\n"
 
@@ -2333,9 +3160,6 @@ msgstr ""
 #~ msgstr[1] "Ð?оÑ?Ñ?ави пÑ?еÑ?изноÑ?Ñ? на 0 до %d знаÑ?аÑ?на меÑ?Ñ?а [Ð?]"
 #~ msgstr[2] "Ð?оÑ?Ñ?ави пÑ?еÑ?изноÑ?Ñ? на 0 до %d знаÑ?аÑ?ниÑ? меÑ?Ñ?а [Ð?]"
 
-#~ msgid "sin"
-#~ msgstr "sin"
-
 #~ msgid "sin<sup>â??1</sup>"
 #~ msgstr "sin<sup>-1</sup>"
 
@@ -2351,9 +3175,6 @@ msgstr ""
 #~ msgid "Hyperbolic Inverse Sine [K]"
 #~ msgstr "Ð?нвеÑ?зни СинÑ?Ñ? ХипеÑ?болиÑ?ни [K]"
 
-#~ msgid "cos"
-#~ msgstr "cos"
-
 #~ msgid "cos<sup>â??1</sup>"
 #~ msgstr "cos<sup>-1</sup>"
 
@@ -2435,9 +3256,6 @@ msgstr ""
 #~ msgid "No."
 #~ msgstr "бÑ?."
 
-#~ msgid "Value"
-#~ msgstr "Ð?Ñ?едноÑ?Ñ?"
-
 #~ msgid "Reset to _Default (%d)"
 #~ msgstr "_Ð?оÑ?Ñ?ави на подÑ?азÑ?мевано (%d)"
 
@@ -2609,9 +3427,6 @@ msgstr ""
 #~ msgid "And"
 #~ msgstr "Ð?"
 
-#~ msgid " And "
-#~ msgstr " Ð? "
-
 #~ msgid "Not"
 #~ msgstr "Ð?ег"
 
@@ -2846,9 +3661,6 @@ msgstr ""
 #~ msgid "*10^"
 #~ msgstr "*10^"
 
-#~ msgid "abs"
-#~ msgstr "abs"
-
 #~ msgid "acosh"
 #~ msgstr "acosh"
 
@@ -2873,9 +3685,6 @@ msgstr ""
 #~ msgid "cbrt"
 #~ msgstr "cbrt"
 
-#~ msgid "chs"
-#~ msgstr "chs"
-
 #~ msgid "clr"
 #~ msgstr "clr"
 
@@ -2891,9 +3700,6 @@ msgstr ""
 #~ msgid "fv"
 #~ msgstr "fv"
 
-#~ msgid "int"
-#~ msgstr "int"
-
 #~ msgid "not"
 #~ msgstr "not"
 
@@ -2915,27 +3721,15 @@ msgstr ""
 #~ msgid "sln"
 #~ msgstr "sln"
 
-#~ msgid "sqrt"
-#~ msgstr "sqrt"
-
 #~ msgid "sto"
 #~ msgstr "sto"
 
-#~ msgid "syd"
-#~ msgstr "syd"
-
-#~ msgid "term"
-#~ msgstr "term"
-
 #~ msgid "xnor"
 #~ msgstr "xnor"
 
 #~ msgid "xor"
 #~ msgstr "xor"
 
-#~ msgid "ans"
-#~ msgstr "ans"
-
 #~ msgid "_Quit"
 #~ msgstr "_Ð?заÑ?и"
 
@@ -2978,9 +3772,6 @@ msgstr ""
 #~ msgid "kilometers per hour or miles per hour"
 #~ msgstr "киломеÑ?аÑ?а по Ñ?аÑ?Ñ? или миÑ?а по Ñ?аÑ?Ñ?"
 
-#~ msgid "centimeters or inches"
-#~ msgstr "Ñ?енÑ?имеÑ?Ñ?и или инÑ?и"
-
 #~ msgid "grams or ounces"
 #~ msgstr "гÑ?ама или Ñ?нÑ?и"
 
diff --git a/po/sr latin po b/po/sr latin po
index 1e9f362..c956dba 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,13 +5,16 @@
 # Reviewed on 2005-07-18 by: Igor NestoroviÄ? <igor prevod org>
 # Translated on 2006-01-30 by: Slobodan D. SredojeviÄ? <slobo akrep be>
 # Translated on 2010-08-25 by: Branko KokanoviÄ? <branko kokanovic gmail com>
+# Translated on 2011-03-19 by: Branko KokanoviÄ? <branko kokanovic gmail com>
+# Branko KokanoviÄ? <branko kokanovic gmail com>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gcalctool&component=general\n"
-"POT-Creation-Date: 2010-08-25 15:33+0000\n"
-"PO-Revision-Date: 2010-08-25 22:36+0200\n"
+"product=gcalctool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-26 01:21+0000\n"
+"PO-Revision-Date: 2011-03-19 14:08+0100\n"
 "Last-Translator: Branko KokanoviÄ? <branko kokanovic gmail com>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
@@ -20,102 +23,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. The label on the memory recall button
+#. The label on the memory button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
-#: ../data/buttons-programming.ui.h:2
-msgid "&#x2190; R"
-msgstr "&#x2190; R"
-
-#. The label on the memory store button
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-financial.ui.h:4
-#: ../data/buttons-programming.ui.h:4
-msgid "&#x2192; R"
-msgstr "&#x2192; R"
+msgid "<i>x</i>"
+msgstr "<i>x</i>"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:6 ../data/buttons-programming.ui.h:6
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
 msgid "="
 msgstr "="
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:8 ../data/buttons-programming.ui.h:8
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
 msgid "Absolute Value"
 msgstr "Apsolutna vrednost"
 
-#. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:10 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:32 ../data/buttons-programming.ui.h:12
-msgid "Clear"
-msgstr "OÄ?isti"
-
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:6
-#: ../data/buttons-financial.ui.h:42 ../data/buttons-programming.ui.h:14
+#: ../data/buttons-advanced.ui.h:8 ../data/buttons-basic.ui.h:4
+#: ../data/buttons-financial.ui.h:38 ../data/buttons-programming.ui.h:8
 msgid "Exponent"
 msgstr "Eksponent"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:16
+#: ../data/buttons-advanced.ui.h:10 ../data/buttons-programming.ui.h:10
 msgid "Factorial"
 msgstr "Faktorijel"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:16 ../data/buttons-programming.ui.h:18
+#: ../data/buttons-advanced.ui.h:12 ../data/buttons-programming.ui.h:12
 msgid "Factorize"
 msgstr "Faktoriši"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:18 ../data/buttons-programming.ui.h:24
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
 msgid "Inverse"
 msgstr "Inverzno"
 
-#. Accessible name for the recall value button
-#: ../data/buttons-advanced.ui.h:20 ../data/buttons-financial.ui.h:72
-#: ../data/buttons-programming.ui.h:26
-msgid "Recall"
-msgstr "UÄ?itaj"
+#. 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
+msgid "Memory"
+msgstr "Memorija"
 
 #. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:22
+#: ../data/buttons-advanced.ui.h:18
 msgid "Scientific Exponent"
 msgstr "NauÄ?ni eksponent"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-financial.ui.h:76
-#: ../data/buttons-programming.ui.h:32
+#: ../data/buttons-advanced.ui.h:20 ../data/buttons-programming.ui.h:24
 msgid "Store"
 msgstr "Snimi"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:26 ../data/buttons-programming.ui.h:34
+#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:26
 msgid "Subscript"
 msgstr "Indeks"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:28 ../data/buttons-programming.ui.h:36
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:28
 msgid "Superscript"
 msgstr "Eksponent"
 
-#. Label on the undo button
-#. Label on the clear display button
-#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:8
-#: ../data/buttons-financial.ui.h:86
-msgid "Undo"
-msgstr "Opozovi"
-
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:8
+#: ../data/buttons-financial.ui.h:6
 msgid "C_alculate"
 msgstr "_IzraÄ?unaj"
 
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:10
+#: ../data/buttons-financial.ui.h:8
 msgid "C_ost:"
 msgstr "_Cena:"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:12
+#: ../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. "
@@ -124,7 +108,7 @@ msgstr ""
 "kraju perioda plaÄ?anja."
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:14
+#: ../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 "
@@ -138,7 +122,7 @@ msgstr ""
 "proizvoda je broj perioda, obiÄ?no godina, za koje je proizvod amortizovan. "
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:16
+#: ../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."
@@ -147,7 +131,7 @@ msgstr ""
 "metod dvostruko-opadajuÄ?eg umanjenja."
 
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:18
+#: ../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 "
@@ -157,7 +141,7 @@ msgstr ""
 "periodiÄ?nu kamatnu stopu nad odreÄ?enim brojem perioda plaÄ?anja."
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:20
+#: ../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 "
@@ -168,7 +152,7 @@ msgstr ""
 "periodu Ä?inioÄ?nog sastava."
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:22
+#: ../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 "
@@ -178,7 +162,7 @@ msgstr ""
 "buduÄ?a vrednost po periodiÄ?noj kamatnoj stopi."
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:24
+#: ../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. "
@@ -187,7 +171,7 @@ msgstr ""
 "investicije na buduÄ?u vrednost nad brojem perioda Ä?inioÄ?nog sastava."
 
 #. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:26
+#: ../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 "
@@ -197,7 +181,7 @@ msgstr ""
 "periodiÄ?noj kamatnoj stopi nad datim brojem perioda plaÄ?anja."
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:28
+#: ../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."
@@ -206,7 +190,7 @@ msgstr ""
 "bruto marže."
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:30
+#: ../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 "
@@ -220,208 +204,213 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:34 ../src/math-buttons.c:261
+#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:247
 msgid "Compounding Term"
 msgstr "Ä?inilac sastava"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: ../data/buttons-financial.ui.h:36
+#: ../data/buttons-financial.ui.h:32
 msgid "Ctrm"
 msgstr "Ctrm"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:38
+#: ../data/buttons-financial.ui.h:34
 msgid "Ddb"
 msgstr "Ddb"
 
 #. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:40
+#: ../data/buttons-financial.ui.h:36
 msgid "Double-Declining Depreciation"
 msgstr "Dvostruko-opadajuÄ?e umanjenje"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:44 ../src/math-buttons.c:267
+#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:253
 msgid "Future Value"
 msgstr "BuduÄ?a vrednost"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:46
+#: ../data/buttons-financial.ui.h:42
 msgid "Future _Value:"
 msgstr "BuduÄ?a _vrednost"
 
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: ../data/buttons-financial.ui.h:48
+#: ../data/buttons-financial.ui.h:44
 msgid "Fv"
 msgstr "Bv"
 
 #. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: ../data/buttons-financial.ui.h:50
+#: ../data/buttons-financial.ui.h:46
 msgid "Gpm"
 msgstr "BM"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:52 ../src/math-buttons.c:288
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:274
 msgid "Gross Profit Margin"
 msgstr "Bruto marža"
 
 #. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:54
+#: ../data/buttons-financial.ui.h:52
 msgid "Payment Period"
 msgstr "Period za plaÄ?anje"
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:56 ../src/math-buttons.c:279
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:265
 msgid "Periodic Interest Rate"
 msgstr "PeriodiÄ?na stopa kamate"
 
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:58
+#: ../data/buttons-financial.ui.h:56
 msgid "Periodic Interest _Rate:"
 msgstr "PeriodiÄ?na stopa _kamate"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:60 ../src/math-buttons.c:285
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:271
 msgid "Periodic Payment"
 msgstr "PeriodiÄ?no plaÄ?anje"
 
 #. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: ../data/buttons-financial.ui.h:62
+#: ../data/buttons-financial.ui.h:60
 msgid "Pmt"
 msgstr "Ppl"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:64 ../src/math-buttons.c:282
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:268
 msgid "Present Value"
 msgstr "Trenutna vrednost"
 
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:66
+#: ../data/buttons-financial.ui.h:64
 msgid "Present _Value:"
 msgstr "Trenutna _vrednost:"
 
 #. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: ../data/buttons-financial.ui.h:68
+#: ../data/buttons-financial.ui.h:66
 msgid "Pv"
 msgstr "Tv"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/buttons-financial.ui.h:70
+#: ../data/buttons-financial.ui.h:68
 msgid "Rate"
 msgstr "Stopa"
 
 #. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:74
+#: ../data/buttons-financial.ui.h:70
 msgid "Sln"
 msgstr "Sln"
 
 #. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:78
+#: ../data/buttons-financial.ui.h:72
 msgid "Straight-Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:80
+#: ../data/buttons-financial.ui.h:74
 msgid "Sum-of-the-Years'-Digits Depreciation"
 msgstr "Zbir-cifara-godine umanjenje"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:82
+#: ../data/buttons-financial.ui.h:76
 msgid "Syd"
 msgstr "Zcg"
 
 #. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: ../data/buttons-financial.ui.h:84
+#: ../data/buttons-financial.ui.h:78
 msgid "Term"
 msgstr "Rok"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:88
+#: ../data/buttons-financial.ui.h:80
 msgid "_Cost:"
 msgstr "_Cena:"
 
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:90
+#: ../data/buttons-financial.ui.h:82
 msgid "_Future Value:"
 msgstr "_BuduÄ?a vrednost:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:92
+#: ../data/buttons-financial.ui.h:84
 msgid "_Life:"
 msgstr "_Životni vek:"
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:94
+#: ../data/buttons-financial.ui.h:86
 msgid "_Margin:"
 msgstr "_Marža:"
 
 #. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:96
+#: ../data/buttons-financial.ui.h:88
 msgid "_Number of Periods:"
 msgstr "_Broj perioda:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:98
+#: ../data/buttons-financial.ui.h:90
 msgid "_Period:"
 msgstr "_Period:"
 
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:100
+#: ../data/buttons-financial.ui.h:92
 msgid "_Periodic Payment:"
 msgstr "_PeriodiÄ?no plaÄ?anje:"
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:102
+#: ../data/buttons-financial.ui.h:94
 msgid "_Principal:"
 msgstr "_Osnova:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:104
+#: ../data/buttons-financial.ui.h:96
 msgid "_Salvage:"
 msgstr "_Krajnja cena:"
 
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:106
+#: ../data/buttons-financial.ui.h:98
 msgid "_Term:"
 msgstr "_Rok:"
 
 #. Insert ASCII dialog: Label before character entry
-#: ../data/buttons-programming.ui.h:10
+#: ../data/buttons-programming.ui.h:6
 msgid "Ch_aracter:"
 msgstr "_Znak:"
 
 #. Accessible name for the insert character button
-#: ../data/buttons-programming.ui.h:20
+#: ../data/buttons-programming.ui.h:14
 msgid "Insert Character"
 msgstr "Ubaci Znak"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:240
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:226
 msgid "Insert Character Code"
 msgstr "Ubaci Kod Znak"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:255
+#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:241
 msgid "Shift Left"
 msgstr "Pomeri ulevo"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:30 ../src/math-buttons.c:258
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:244
 msgid "Shift Right"
 msgstr "Pomeri udesno"
 
 #. Insert ASCII dialog: Button to insert selected character
-#: ../data/buttons-programming.ui.h:38
+#: ../data/buttons-programming.ui.h:30
 msgid "_Insert"
 msgstr "U_metni"
 
+#. The label on the memory button
+#: ../data/buttons-programming.ui.h:32
+msgid "x"
+msgstr "x"
+
 #. Word size combo: 16 bits
 #: ../data/preferences.ui.h:2
 msgid "16-bit"
@@ -448,7 +437,7 @@ msgid "Number _Format:"
 msgstr "_Format broja:"
 
 #. Title of preferences dialog
-#: ../data/preferences.ui.h:11 ../src/math-preferences.c:239
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
 msgid "Preferences"
 msgstr "Podešavanja"
 
@@ -473,7 +462,7 @@ msgid "_Angle units:"
 msgstr "Jedinice uglov_a"
 
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:521
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:514
 msgid "Calculator"
 msgstr "Kalkulator"
 
@@ -534,179 +523,291 @@ msgid "Source currency"
 msgstr "Izvorna valuta"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
+msgid "Source units"
+msgstr "Izvorna jedinica"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
 msgid "Target currency"
 msgstr "Odredišna valuta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+msgid "Target units"
+msgstr "Odredišna jedinica"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
 msgid "The angle units to use"
 msgstr "Jedinice uglova koje treba koristiti"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
 msgid "The button mode"
 msgstr "Režim dugmeta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
 msgid "The format to display numbers in"
 msgstr "Format u kome treba prikazivati brojeve"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
 msgid "The number of digits displayed after the numeric point"
 msgstr "Broj cifara prikazan posle decimalnog zareza"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
 msgid "The numeric base"
 msgstr "Brojna osnova"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:21
 msgid "The size of the words used in bitwise operations"
 msgstr "Dužina reÄ?i koja se koristi za bitske operacije"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+msgid "Units of the current calculation"
+msgstr "Jedinica trenutne raÄ?unice"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+msgid "Units to convert the current calculation into"
+msgstr "Jedinica u koju treba pretvoriti raÄ?unicu"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
 msgid "Word size"
 msgstr "Dužina reÄ?i"
 
-#: ../src/currency.h:19
-msgid "Australian dollar"
+#: ../src/currency-manager.c:30
+msgid "UAE Dirham"
+msgstr "Emiratski dirham"
+
+#: ../src/currency-manager.c:31
+msgid "Australian Dollar"
 msgstr "Australijski dolar"
 
-#: ../src/currency.h:20
-msgid "Bulgarian lev"
+#: ../src/currency-manager.c:32
+msgid "Bulgarian Lev"
 msgstr "Bugarski lev"
 
-#: ../src/currency.h:21
-msgid "Brazilian real"
+#: ../src/currency-manager.c:33
+msgid "Bahraini Dinar"
+msgstr "Bahreinski dinar"
+
+#: ../src/currency-manager.c:34
+msgid "Brunei Dollar"
+msgstr "Brunejski dolar"
+
+#: ../src/currency-manager.c:35
+msgid "Brazilian Real"
 msgstr "Brazilski real"
 
-#: ../src/currency.h:22
-msgid "Canadian dollar"
+#: ../src/currency-manager.c:36
+msgid "Botswana Pula"
+msgstr "Bocvanska pula"
+
+#: ../src/currency-manager.c:37
+msgid "Canadian Dollar"
 msgstr "Kanadski dolar"
 
-#: ../src/currency.h:23
-msgid "Swiss franc"
+#: ../src/currency-manager.c:38
+msgid "Swiss Franc"
 msgstr "Å vajcarski franak"
 
-#: ../src/currency.h:24
-msgid "Chinese yuan renminbi"
+#: ../src/currency-manager.c:39
+msgid "Chilean Peso"
+msgstr "Ä?ileanski pezos"
+
+#: ../src/currency-manager.c:40
+msgid "Chinese Yuan"
 msgstr "Kineski juan"
 
-#: ../src/currency.h:25
-msgid "Czech koruna"
+#: ../src/currency-manager.c:41
+msgid "Colombian Peso"
+msgstr "Kolumbijski pezos"
+
+#: ../src/currency-manager.c:42
+msgid "Czech Koruna"
 msgstr "Ä?eÅ¡ka kruna"
 
-#: ../src/currency.h:26
-msgid "Danish krone"
+#: ../src/currency-manager.c:43
+msgid "Danish Krone"
 msgstr "Danska kruna"
 
-#: ../src/currency.h:27
-msgid "Estonian kroon"
+#: ../src/currency-manager.c:44
+msgid "Algerian Dinar"
+msgstr "Alžirski dinar"
+
+#: ../src/currency-manager.c:45
+msgid "Estonian Kroon"
 msgstr "Estonska kruna"
 
-#: ../src/currency.h:28
+#: ../src/currency-manager.c:46
 msgid "Euro"
 msgstr "Evro"
 
-#: ../src/currency.h:29
-msgid "Pound sterling"
+#: ../src/currency-manager.c:47
+msgid "Pound Sterling"
 msgstr "Funta sterling"
 
-#: ../src/currency.h:30
-msgid "Hong Kong dollar"
+#: ../src/currency-manager.c:48
+msgid "Hong Kong Dollar"
 msgstr "Hongkong dolar"
 
-#: ../src/currency.h:31
-msgid "Croatian kuna"
+#: ../src/currency-manager.c:49
+msgid "Croatian Kuna"
 msgstr "Hrvatska kuna"
 
-#: ../src/currency.h:32
-msgid "Hungarian forint"
+#: ../src/currency-manager.c:50
+msgid "Hungarian Forint"
 msgstr "MaÄ?arska forinta"
 
-#: ../src/currency.h:33
-msgid "Indonesian rupiah"
+#: ../src/currency-manager.c:51
+msgid "Indonesian Rupiah"
 msgstr "Indonežanska rupija"
 
-#: ../src/currency.h:34
-msgid "Indian rupee"
+#: ../src/currency-manager.c:52
+msgid "Israeli New Shekel"
+msgstr "Izraelski novi Å¡ekel"
+
+#: ../src/currency-manager.c:53
+msgid "Indian Rupee"
 msgstr "Indijska rupija"
 
-#: ../src/currency.h:35
-msgid "Icelandic krona"
+#: ../src/currency-manager.c:54
+msgid "Iranian Rial"
+msgstr "Iranski rijal"
+
+#: ../src/currency-manager.c:55
+msgid "Icelandic Krona"
 msgstr "Islandska kruna"
 
-#: ../src/currency.h:36
-msgid "Japanese yen"
+#: ../src/currency-manager.c:56
+msgid "Japanese Yen"
 msgstr "Japanski jen"
 
-#: ../src/currency.h:37
-msgid "South Korean won"
+#: ../src/currency-manager.c:57
+msgid "South Korean Won"
 msgstr "Južnokorejski von"
 
-#: ../src/currency.h:38
-msgid "Lithuanian litas"
+#: ../src/currency-manager.c:58
+msgid "Kuwaiti Dinar"
+msgstr "Kuvajtski dinar"
+
+#: ../src/currency-manager.c:59
+msgid "Kazakhstani Tenge"
+msgstr "Kazahstanski tenge"
+
+#: ../src/currency-manager.c:60
+msgid "Sri Lankan Rupee"
+msgstr "Å rilankanska rupija"
+
+#: ../src/currency-manager.c:61
+msgid "Lithuanian Litas"
 msgstr "Litvanski litas"
 
-#: ../src/currency.h:39
-msgid "Latvian lats"
+#: ../src/currency-manager.c:62
+msgid "Latvian Lats"
 msgstr "Letonski lats"
 
-#: ../src/currency.h:40
-msgid "Mexican peso"
+#: ../src/currency-manager.c:63
+msgid "Libyan Dinar"
+msgstr "Libijski dinar"
+
+#: ../src/currency-manager.c:64
+msgid "Mauritian Rupee"
+msgstr "Mauricijska rupija"
+
+#: ../src/currency-manager.c:65
+msgid "Mexican Peso"
 msgstr "MeksiÄ?ki pezos"
 
-#: ../src/currency.h:41
-msgid "Malaysian ringgit"
+#: ../src/currency-manager.c:66
+msgid "Malaysian Ringgit"
 msgstr "Malezijski ringit"
 
-#: ../src/currency.h:42
-msgid "Norwegian krone"
+#: ../src/currency-manager.c:67
+msgid "Norwegian Krone"
 msgstr "Norveška kruna"
 
-#: ../src/currency.h:43
-msgid "New Zealand dollar"
+#: ../src/currency-manager.c:68
+msgid "Nepalese Rupee"
+msgstr "Nepalska rupija"
+
+#: ../src/currency-manager.c:69
+msgid "New Zealand Dollar"
 msgstr "Novozelandski dolar"
 
-#: ../src/currency.h:44
-msgid "Philippine peso"
+#: ../src/currency-manager.c:70
+msgid "Omani Rial"
+msgstr "Omanski rijal"
+
+#: ../src/currency-manager.c:71
+msgid "Peruvian Nuevo Sol"
+msgstr "Peruanski novi sol"
+
+#: ../src/currency-manager.c:72
+msgid "Philippine Peso"
 msgstr "Filipinski pezos"
 
-#: ../src/currency.h:45
-msgid "Polish zloty"
+#: ../src/currency-manager.c:73
+msgid "Pakistani Rupee"
+msgstr "Pakistanska rupija"
+
+#: ../src/currency-manager.c:74
+msgid "Polish Zloty"
 msgstr "Poljski zlot"
 
-#: ../src/currency.h:46
-msgid "New Romanian leu"
+#: ../src/currency-manager.c:75
+msgid "Qatari Riyal"
+msgstr "Katarski rijal"
+
+#: ../src/currency-manager.c:76
+msgid "New Romanian Leu"
 msgstr "Novi rumunski lej"
 
-#: ../src/currency.h:47
-msgid "Russian rouble"
+#: ../src/currency-manager.c:77
+msgid "Russian Rouble"
 msgstr "Ruska rublja"
 
-#: ../src/currency.h:48
-msgid "Swedish krona"
+#: ../src/currency-manager.c:78
+msgid "Saudi Riyal"
+msgstr "Saudijski rijal"
+
+#: ../src/currency-manager.c:79
+msgid "Swedish Krona"
 msgstr "Å vedska kruna"
 
-#: ../src/currency.h:49
-msgid "Singapore dollar"
+#: ../src/currency-manager.c:80
+msgid "Singapore Dollar"
 msgstr "Singapurski dolar"
 
-#: ../src/currency.h:50
-msgid "Thai baht"
+#: ../src/currency-manager.c:81
+msgid "Thai Baht"
 msgstr "Tajlandski bat"
 
-#: ../src/currency.h:51
-msgid "New Turkish lira"
+#: ../src/currency-manager.c:82
+msgid "Tunisian Dinar"
+msgstr "Tunižanski dunar"
+
+#: ../src/currency-manager.c:83
+msgid "New Turkish Lira"
 msgstr "Nova turska lira"
 
-#: ../src/currency.h:52
-msgid "US dollar"
+#: ../src/currency-manager.c:84
+msgid "T&T Dollar (TTD)"
+msgstr "T&T dolar (TTD)"
+
+#: ../src/currency-manager.c:85
+msgid "US Dollar"
 msgstr "AmeriÄ?ki dolar"
 
-#: ../src/currency.h:53
-msgid "South African rand"
+#: ../src/currency-manager.c:86
+msgid "Uruguayan Peso"
+msgstr "Urugvajski pezos"
+
+#: ../src/currency-manager.c:87
+msgid "Venezuelan Bolívar"
+msgstr "Venecuelanski bolivar"
+
+#: ../src/currency-manager.c:88
+msgid "South African Rand"
 msgstr "JužnoafriÄ?ki rand"
 
 #. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:76
+#: ../src/gcalctool.c:77
 #, c-format
 msgid ""
 "Usage:\n"
@@ -716,7 +817,7 @@ msgstr ""
 "  %s â?? Obavlja matematiÄ?ka izraÄ?unavanja"
 
 #. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:84
+#: ../src/gcalctool.c:85
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -732,7 +833,7 @@ msgstr ""
 "  --help-gtk                      Prikazuje Gtk+ opcije"
 
 #. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:95
+#: ../src/gcalctool.c:96
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -756,15 +857,13 @@ msgstr ""
 "  --g-fatal-warnings              Postavlja sva upozorenja kao kobna"
 
 #. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:109
+#: ../src/gcalctool.c:110
 #, c-format
 msgid ""
 "Application Options:\n"
-"  -u, --unittest                  Perform unit tests\n"
 "  -s, --solve <equation>          Solve the given equation"
 msgstr ""
 "Opcije programa:\n"
-"  -u, --unittest                  VrÅ¡i jediniÄ?no testiranje\n"
 "  -s, --solve <equation>          ReÅ¡ava zadatu jednaÄ?inu"
 
 #. Error printed to stderr when user uses --solve argument without an equation
@@ -774,318 +873,284 @@ msgid "Argument --solve requires an equation to solve"
 msgstr "Argument --solve zahteva jednaÄ?inu za reÅ¡avanje"
 
 #. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:168
+#: ../src/gcalctool.c:164
 #, c-format
 msgid "Unknown argument '%s'"
 msgstr "Nepoznat argument â??%sâ??"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:95
 msgid "Pi [Ctrl+P]"
 msgstr "Pi [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:109
+#: ../src/math-buttons.c:98
 msgid "Eulerâ??s Number"
 msgstr "Ojlerov broj"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.c:103
 msgid "Subscript mode [Alt]"
 msgstr "Režim indeksa [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.c:106
 msgid "Superscript mode [Ctrl]"
 msgstr "Režim eksponenta [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.c:109
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "NauÄ?ni eksponent [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.c:112
 msgid "Add [+]"
 msgstr "Saberi [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.c:115
 msgid "Subtract [-]"
 msgstr "Oduzmi [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.c:118
 msgid "Multiply [*]"
 msgstr "Množenje [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.c:121
 msgid "Divide [/]"
 msgstr "Deljenje [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.c:124
 msgid "Modulus divide"
 msgstr "Deljenje po modulu"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.c:127
 msgid "Additional Functions"
 msgstr "Dodatne funkcije"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.c:130
 msgid "Exponent [^ or **]"
 msgstr "Eksponent [^ ili **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.c:133
 msgid "Square [Ctrl+2]"
 msgstr "Kvadrat [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.c:136
 msgid "Percentage [%]"
 msgstr "Procenat [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.c:139
 msgid "Factorial [!]"
 msgstr "Faktorijel [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.c:142
 msgid "Absolute value [|]"
 msgstr "Apsolutna vrednost [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.c:145
 msgid "Complex argument"
 msgstr "Kompleksni argument"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.c:148
 msgid "Complex conjugate"
 msgstr "Konjugovano kompleksna vrednost"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.c:151
 msgid "Root [Ctrl+R]"
 msgstr "Koren [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.c:154
 msgid "Square root [Ctrl+R]"
 msgstr "Kvadratni koren [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.c:157
 msgid "Logarithm"
 msgstr "Logaritam"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.c:160
 msgid "Natural Logarithm"
 msgstr "Prirodni logaritam"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.c:163
 msgid "Sine"
 msgstr "Sinus"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.c:166
 msgid "Cosine"
 msgstr "Kosinus"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.c:169
 msgid "Tangent"
 msgstr "Tangens"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.c:172
 msgid "Hyperbolic Sine"
 msgstr "Sinus HiperboliÄ?ni"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.c:175
 msgid "Hyperbolic Cosine"
 msgstr "Kosinus HiperboliÄ?ni"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.c:178
 msgid "Hyperbolic Tangent"
 msgstr "Tangens HiperboliÄ?ni"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.c:181
 msgid "Inverse [Ctrl+I]"
 msgstr "Inverzno [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:195
+#: ../src/math-buttons.c:184
 msgid "Boolean AND"
 msgstr "LogiÄ?ko I"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:198
+#: ../src/math-buttons.c:187
 msgid "Boolean OR"
 msgstr "LogiÄ?ko ILI"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.c:190
 msgid "Boolean Exclusive OR"
 msgstr "LogiÄ?ko ILLI"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:204
+#: ../src/math-buttons.c:193
 msgid "Boolean NOT"
 msgstr "LogiÄ?ko NE"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:207 ../src/math-buttons.c:1442
+#: ../src/math-buttons.c:196 ../src/math-buttons.c:1028
 msgid "Integer Component"
 msgstr "Celobrojni Deo"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:210 ../src/math-buttons.c:1444
+#: ../src/math-buttons.c:199 ../src/math-buttons.c:1030
 msgid "Fractional Component"
 msgstr "Razlomljeni Deo"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.c:202
 msgid "Real Component"
 msgstr "Realni Deo"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.c:205
 msgid "Imaginary Component"
 msgstr "Imaginarni Deo"
 
-#. Tooltip for the ones complement button
-#: ../src/math-buttons.c:219
+#. Tooltip for the ones' complement button
+#: ../src/math-buttons.c:208
 msgid "Ones' Complement"
 msgstr "Komplement Jedinice"
 
-#. Tooltip for the twos complement button
-#: ../src/math-buttons.c:222
+#. Tooltip for the two's complement button
+#: ../src/math-buttons.c:211
 msgid "Two's Complement"
 msgstr "Komplement Dvojke"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:225
+#: ../src/math-buttons.c:214
 msgid "Truncate"
 msgstr "Odseci"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.c:217
 msgid "Start Group [(]"
 msgstr "PoÄ?etak Grupe [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.c:220
 msgid "End Group [)]"
 msgstr "Kraj Grupe [)]"
 
-#. Tooltip for the assign variable button
-#: ../src/math-buttons.c:234
-msgid "Assign Variable"
-msgstr "Dodeli promenljivu"
-
-#. Tooltip for the insert variable button
-#: ../src/math-buttons.c:237
-msgid "Insert Variable"
-msgstr "Ubaci promenljivu"
-
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:243
+#: ../src/math-buttons.c:229
 msgid "Calculate Result"
 msgstr "IzraÄ?unaj Rezultat"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:246
+#: ../src/math-buttons.c:232
 msgid "Factorize [Ctrl+F]"
 msgstr "Faktoriši [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:249
+#: ../src/math-buttons.c:235
 msgid "Clear Display [Escape]"
 msgstr "OÄ?isti Ekran [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:252
+#: ../src/math-buttons.c:238
 msgid "Undo [Ctrl+Z]"
 msgstr "Opozovi [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:264
+#: ../src/math-buttons.c:250
 msgid "Double Declining Depreciation"
 msgstr "Dvostruko-OpadajuÄ?e Umanjenje"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:270
+#: ../src/math-buttons.c:256
 msgid "Financial Term"
 msgstr "Finansijski Izraz"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:273
+#: ../src/math-buttons.c:259
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Zbir-cifara-godine umanjenje"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:276
+#: ../src/math-buttons.c:262
 msgid "Straight Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
-#. Advanced buttons: Angle unit combo box: Use degrees for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../src/math-buttons.c:892 ../src/math-preferences.c:255
-msgid "Degrees"
-msgstr "Stepeni"
-
-#. Advanced buttons: Angle unit combo box: Use radians for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-buttons.c:896 ../src/math-preferences.c:259
-msgid "Radians"
-msgstr "Radijani"
-
-#. Advanced buttons: Angle unit combo box: Use gradians for trigonometric calculations
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-buttons.c:900 ../src/math-preferences.c:263
-msgid "Gradians"
-msgstr "Gradijani"
-
 #. Number display mode combo: Binary, e.g. 10011010010â??
-#: ../src/math-buttons.c:934
+#: ../src/math-buttons.c:652
 msgid "Binary"
 msgstr "Binarno"
 
 #. Number display mode combo: Octal, e.g. 2322â??
-#: ../src/math-buttons.c:938
+#: ../src/math-buttons.c:656
 msgid "Octal"
 msgstr "Oktalno"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:942
+#: ../src/math-buttons.c:660
 msgid "Decimal"
 msgstr "Decimalno"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2â??â??
-#: ../src/math-buttons.c:946
+#: ../src/math-buttons.c:664
 msgid "Hexadecimal"
 msgstr "Heksadecimalno"
 
-#. Text shown in store menu when no variables defined
-#. Text shown in recall menu when no variables defined
-#: ../src/math-buttons.c:1263 ../src/math-buttons.c:1309
-msgid "No variables defined"
-msgstr "Nema definisanih promenljivih"
-
 #. Left Shift Popup: Menu item to shift left by n places (n < 10)
 #. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:1352 ../src/math-buttons.c:1396
+#: ../src/math-buttons.c:938 ../src/math-buttons.c:982
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1095,7 +1160,7 @@ msgstr[2] "_%d mesta"
 
 #. Left Shift Popup: Menu item to shift left by n places (n >= 10)
 #. Right Shift Popup: Menu item to shift right by n places (n >= 10)
-#: ../src/math-buttons.c:1356 ../src/math-buttons.c:1400
+#: ../src/math-buttons.c:942 ../src/math-buttons.c:986
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1104,120 +1169,146 @@ msgstr[1] "%d mesta"
 msgstr[2] "%d mesta"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1446
+#: ../src/math-buttons.c:1032
 msgid "Round"
 msgstr "Zaokruži"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1448
+#: ../src/math-buttons.c:1034
 msgid "Floor"
 msgstr "Zaokruži na dole"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1450
+#: ../src/math-buttons.c:1036
 msgid "Ceiling"
 msgstr "Zaokruži na gore"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1452
+#: ../src/math-buttons.c:1038
 msgid "Sign"
 msgstr "Znak"
 
+#. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
+#: ../src/math-converter.c:364
+msgid " in "
+msgstr " u "
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:496
+#: ../src/math-equation.c:453
 msgid "No undo history"
 msgstr "Nema istorijata opozivanja"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:521
+#: ../src/math-equation.c:478
 msgid "No redo history"
 msgstr "Nema istorijata ponavljanja"
 
-#: ../src/math-equation.c:845
+#: ../src/math-equation.c:867
 msgid "No sane value to store"
 msgstr "Nema razumne vrednosti za smeštanje"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1105
+#: ../src/math-equation.c:1132
 msgid "Overflow. Try a bigger word size"
 msgstr "PrekoraÄ?enje. PokuÅ¡ajte sa veÄ?om dužinom reÄ?i"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1110
+#: ../src/math-equation.c:1137
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "Nepoznata promenljiva â??%sâ??"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1115
+#: ../src/math-equation.c:1142
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "Funkcija â??%sâ?? nije definisana"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1120
+#: ../src/math-equation.c:1147
 msgid "Unknown conversion"
 msgstr "Nepoznato pretvaranje"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1129
+#: ../src/math-equation.c:1156
 msgid "Malformed expression"
 msgstr "Neispravan izraz"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1152
+#: ../src/math-equation.c:1288
 msgid "Need an integer to factorize"
 msgstr "Za faktorisanje je potreban ceo broj"
 
 #. This message is displayed in the status bar when a bit
 #. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1229
+#: ../src/math-equation.c:1355
 msgid "No sane value to bitwise shift"
 msgstr "Nema razumne vrednosti za bitsko pomeranje"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1258
+#: ../src/math-equation.c:1384
 msgid "Displayed value not an integer"
 msgstr "Prikazana vrednost nije ceo broj"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1648
+#: ../src/math-equation.c:1807
 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"
 
 #. Label on close button in preferences dialog
-#: ../src/math-preferences.c:245
+#: ../src/math-preferences.c:236
 msgid "_Close"
 msgstr "_Zatvori"
 
+#. 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
+msgid "Degrees"
+msgstr "Stepeni"
+
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../src/math-preferences.c:250 ../src/unit-manager.c:55
+msgid "Radians"
+msgstr "Radijani"
+
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: ../src/math-preferences.c:254 ../src/unit-manager.c:56
+msgid "Gradians"
+msgstr "Gradijani"
+
+#. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234Ã?10^99)
+#: ../src/math-preferences.c:264
+msgid "Automatic"
+msgstr "Automatski"
+
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:273
+#: ../src/math-preferences.c:268
 msgid "Fixed"
 msgstr "Fiksni"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã?10^3
-#: ../src/math-preferences.c:277
+#: ../src/math-preferences.c:272
 msgid "Scientific"
 msgstr "NauÄ?ni"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:281
+#: ../src/math-preferences.c:276
 msgid "Engineering"
 msgstr "Inženjerski"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:292
+#: ../src/math-preferences.c:287
 #, c-format
 msgid "Show %d decimal _places"
 msgstr "_Prikaži %d decimalna mesta"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:170
+#: ../src/math-window.c:163
 msgid "Unable to open help file"
 msgstr "Ne mogu da otvorim datoteku za pomoÄ?"
 
 #. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:201
+#: ../src/math-window.c:195
 msgid "translator-credits"
 msgstr ""
 "Danilo Å egan <danilo prevod org>\n"
@@ -1228,7 +1319,7 @@ msgstr ""
 "Prevod.org â?? prevod na srpski jezik"
 
 #. The license this software is under (GPL2+)
-#: ../src/math-window.c:204
+#: ../src/math-window.c:198
 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"
@@ -1259,133 +1350,137 @@ msgstr ""
 "02110-1301 USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:221
+#: ../src/math-window.c:215
 msgid "Gcalctool"
 msgstr "Gnomov kalkulator"
 
 #. Copyright notice in the about dialog
-#: ../src/math-window.c:225
+#: ../src/math-window.c:219
 msgid "© 1986â??2010 The Gcalctool authors"
 msgstr "© 1986â??2010 Autori Gnomovog kalkulatora"
 
 #. Short description in the about dialog
-#: ../src/math-window.c:229
+#: ../src/math-window.c:223
 msgid "Calculator with financial and scientific modes."
 msgstr "Kalkulator sa finansijskim i nauÄ?nim naÄ?inom rada."
 
 #. Calculator menu
-#: ../src/math-window.c:355
+#: ../src/math-window.c:349
 msgid "_Calculator"
 msgstr "_Kalkulator"
 
 #. Mode menu
-#: ../src/math-window.c:357
+#: ../src/math-window.c:351
 msgid "_Mode"
 msgstr "_Mod"
 
 #. Help menu label
-#: ../src/math-window.c:359
+#: ../src/math-window.c:353
 msgid "_Help"
 msgstr "_PomoÄ?"
 
 #. Basic menu label
-#: ../src/math-window.c:361
+#: ../src/math-window.c:355
 msgid "_Basic"
 msgstr "_Osnovni"
 
 #. Advanced menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:357
 msgid "_Advanced"
 msgstr "Na_predni"
 
 #. Financial menu label
-#: ../src/math-window.c:365
+#: ../src/math-window.c:359
 msgid "_Financial"
 msgstr "_Finansijski"
 
 #. Programming menu label
-#: ../src/math-window.c:367
+#: ../src/math-window.c:361
 msgid "_Programming"
 msgstr "P_rogramerski"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:369
+#: ../src/math-window.c:363
 msgid "_Contents"
 msgstr "_Sadržaj"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:103
+#: ../src/mp-binary.c:115
 msgid "Boolean AND is only defined for positive integers"
 msgstr "LogiÄ?ko I je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:116
+#: ../src/mp-binary.c:128
 msgid "Boolean OR is only defined for positive integers"
 msgstr "LogiÄ?ko ILI je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:129
+#: ../src/mp-binary.c:141
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "LogiÄ?ko ILLI je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:144
+#: ../src/mp-binary.c:156
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "LogiÄ?ko NE je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:174
+#: ../src/mp-binary.c:187
 msgid "Shift is only possible on integer values"
 msgstr "Pomeranje je moguÄ?e samo za pozitivne cele vrednosti"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:149
+#: ../src/mp.c:148
 msgid "Argument not defined for zero"
 msgstr "Argument nije definisan za nulu"
 
+#: ../src/mp.c:299
+msgid "Overflow: the result couldn't be calculated"
+msgstr "PrekoraÄ?enje: rezultat se ne može izraÄ?unati"
+
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:636 ../src/mp.c:668 ../src/mp.c:1602
+#: ../src/mp.c:644 ../src/mp.c:676 ../src/mp.c:1610
 msgid "Division by zero is undefined"
 msgstr "Deljenje sa nulom nije definisano"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1273 ../src/mp.c:1310
+#: ../src/mp.c:1281 ../src/mp.c:1318
 msgid "Logarithm of zero is undefined"
 msgstr "Logaritam od nule nije definisan"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1675 ../src/mp.c:1990
+#: ../src/mp.c:1683 ../src/mp.c:1998
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "Stepenovanje nule nije definisano za negativne eksponente"
 
-#: ../src/mp.c:1700
+#: ../src/mp.c:1708
 msgid "Reciprocal of zero is undefined"
 msgstr "ReciproÄ?na vrednost nule nije definisana"
 
-#: ../src/mp.c:1785
+#: ../src/mp.c:1793
 msgid "Root must be non-zero"
 msgstr "Koran mora biti razliÄ?it od nule"
 
-#: ../src/mp.c:1803
+#: ../src/mp.c:1811
 msgid "Negative root of zero is undefined"
 msgstr "Negativni koren od nule nije definisan"
 
-#: ../src/mp.c:1809
+#: ../src/mp.c:1817
 msgid "nth root of negative number is undefined for even n"
 msgstr "n-ti koren od negativnog broja nije definisan za parno n"
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1930
+#: ../src/mp.c:1938
 msgid "Factorial is only defined for natural numbers"
 msgstr "Faktorijel je definisan samo za prirodne brojeve"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1950
+#: ../src/mp.c:1958
 msgid "Modulus division is only defined for integers"
 msgstr "Deljenje po modulu je definisano samo za cele brojeve"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../src/mp-trigonometric.c:311
+#: ../src/mp-trigonometric.c:310
 msgid ""
 "Tangent is undefined for angles that are multiples of Ï? (180°) from Ï?â??2 (90°)"
 msgstr ""
@@ -1393,22 +1488,20 @@ msgstr ""
 "(90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:356
+#: ../src/mp-trigonometric.c:355
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "Inverzni sinus nije definisan za vrednosti izvan [-1, 1]"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/mp-trigonometric.c:373
+#: ../src/mp-trigonometric.c:372
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "Inverzni kosinus nije definisan za vrednosti izvan [-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 or equal to one"
+msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
-"Inverzni sinus hiperboliÄ?ki nije definisan za vrednosti veÄ?e ili jednako od "
-"jedan"
+"Inverzni kosinus hiperboliÄ?ki nije definisan za vrednosti manje od jedan"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
 #: ../src/mp-trigonometric.c:615
@@ -1416,6 +1509,752 @@ msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr ""
 "Inverzni tangens hiperboliÄ?ki nije definisan za vrednosti izvan [-1, 1]"
 
+#: ../src/unit-manager.c:54
+#, c-format
+msgctxt "unit-format"
+msgid "%s degrees"
+msgstr "%s stepeni"
+
+#: ../src/unit-manager.c:54
+msgctxt "unit-symbols"
+msgid "degree,degrees,deg"
+msgstr "stepen,stepeni,st"
+
+#: ../src/unit-manager.c:55
+#, c-format
+msgctxt "unit-format"
+msgid "%s radians"
+msgstr "%s radijana"
+
+#: ../src/unit-manager.c:55
+msgctxt "unit-symbols"
+msgid "radian,radians,rad"
+msgstr "radijan,radijani,rad"
+
+#: ../src/unit-manager.c:56
+#, c-format
+msgctxt "unit-format"
+msgid "%s gradians"
+msgstr "%s gradijana"
+
+#: ../src/unit-manager.c:56
+msgctxt "unit-symbols"
+msgid "gradian,gradians,grad"
+msgstr "gradijan,gradijana,grad"
+
+#: ../src/unit-manager.c:57
+msgid "Parsecs"
+msgstr "Parseci"
+
+#: ../src/unit-manager.c:57
+#, c-format
+msgctxt "unit-format"
+msgid "%s pc"
+msgstr "%s pc"
+
+#: ../src/unit-manager.c:57
+msgctxt "unit-symbols"
+msgid "parsec,parsecs,pc"
+msgstr "parsek,parseci,pc"
+
+#: ../src/unit-manager.c:58
+msgid "Light Years"
+msgstr "Svetlosne godine"
+
+#: ../src/unit-manager.c:58
+#, c-format
+msgctxt "unit-format"
+msgid "%s ly"
+msgstr "%s ly"
+
+#: ../src/unit-manager.c:58
+msgctxt "unit-symbols"
+msgid "lightyear,lightyears,ly"
+msgstr "svetlosnagodina,svetlosnegodine,ly"
+
+#: ../src/unit-manager.c:59
+msgid "Astronomical Units"
+msgstr "Astronomske jedinice"
+
+#: ../src/unit-manager.c:59
+#, c-format
+msgctxt "unit-format"
+msgid "%s au"
+msgstr "%s au"
+
+#: ../src/unit-manager.c:59
+msgctxt "unit-symbols"
+msgid "au"
+msgstr "au"
+
+#: ../src/unit-manager.c:60
+msgid "Nautical Miles"
+msgstr "NautiÄ?ke milje"
+
+#: ../src/unit-manager.c:60 ../src/unit-manager.c:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
+
+#: ../src/unit-manager.c:60
+msgctxt "unit-symbols"
+msgid "nm"
+msgstr "nm"
+
+#: ../src/unit-manager.c:61
+msgid "Miles"
+msgstr "Milje"
+
+#: ../src/unit-manager.c:61
+#, c-format
+msgctxt "unit-format"
+msgid "%s mi"
+msgstr "%s mi"
+
+#: ../src/unit-manager.c:61
+msgctxt "unit-symbols"
+msgid "mile,miles,mi"
+msgstr "milja,milje,mi"
+
+#: ../src/unit-manager.c:62
+msgid "Kilometers"
+msgstr "Kilometri"
+
+#: ../src/unit-manager.c:62
+#, c-format
+msgctxt "unit-format"
+msgid "%s km"
+msgstr "%s km"
+
+#: ../src/unit-manager.c:62
+msgctxt "unit-symbols"
+msgid "kilometer,kilometers,km,kms"
+msgstr "kilometar,kilometara,km,km"
+
+#: ../src/unit-manager.c:63
+msgid "Cables"
+msgstr "Kablovi"
+
+#: ../src/unit-manager.c:63
+#, c-format
+msgctxt "unit-format"
+msgid "%s cb"
+msgstr "%s cb"
+
+#: ../src/unit-manager.c:63
+msgctxt "unit-symbols"
+msgid "cable,cables,cb"
+msgstr "kabl,kabla,kablova,cb"
+
+#: ../src/unit-manager.c:64
+msgid "Fathoms"
+msgstr "Hvati"
+
+#: ../src/unit-manager.c:64
+#, c-format
+msgctxt "unit-format"
+msgid "%s ftm"
+msgstr "%s ftm"
+
+#: ../src/unit-manager.c:64
+msgctxt "unit-symbols"
+msgid "fathom,fathoms,ftm"
+msgstr "hvat,hvata,hvatova,hv,ftm"
+
+#: ../src/unit-manager.c:65
+msgid "Meters"
+msgstr "Metri"
+
+#: ../src/unit-manager.c:65
+#, c-format
+msgctxt "unit-format"
+msgid "%s m"
+msgstr "%s m"
+
+#: ../src/unit-manager.c:65
+msgctxt "unit-symbols"
+msgid "meter,meters,m"
+msgstr "metar,metra,metara,m,m"
+
+#: ../src/unit-manager.c:66
+msgid "Yards"
+msgstr "Jardi"
+
+#: ../src/unit-manager.c:66
+#, c-format
+msgctxt "unit-format"
+msgid "%s yd"
+msgstr "%s yd"
+
+#: ../src/unit-manager.c:66
+msgctxt "unit-symbols"
+msgid "yard,yards,yd"
+msgstr "jard,jarda,jardi,yd"
+
+#: ../src/unit-manager.c:67
+msgid "Feet"
+msgstr "Stope"
+
+#: ../src/unit-manager.c:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s ft"
+msgstr "%s ft"
+
+#: ../src/unit-manager.c:67
+msgctxt "unit-symbols"
+msgid "foot,feet,ft"
+msgstr "stopa,stope,stopa,ft"
+
+#: ../src/unit-manager.c:68
+msgid "Inches"
+msgstr "InÄ?i"
+
+#: ../src/unit-manager.c:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s in"
+msgstr "%s in"
+
+#: ../src/unit-manager.c:68
+msgctxt "unit-symbols"
+msgid "inch,inches,in"
+msgstr "inÄ?,inÄ?a,in,in"
+
+#: ../src/unit-manager.c:69
+msgid "Centimeters"
+msgstr "Centimetri"
+
+#: ../src/unit-manager.c:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm"
+msgstr "%s cm"
+
+#: ../src/unit-manager.c:69
+msgctxt "unit-symbols"
+msgid "centimeter,centimeters,cm,cms"
+msgstr "centimetar,centimetara,cm,cm"
+
+#: ../src/unit-manager.c:70
+msgid "Millimeters"
+msgstr "Milimetri"
+
+#: ../src/unit-manager.c:70
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm"
+msgstr "%s mm"
+
+#: ../src/unit-manager.c:70
+msgctxt "unit-symbols"
+msgid "millimeter,millimeters,mm"
+msgstr "milimetar,milimetara,mm,mm"
+
+#: ../src/unit-manager.c:71
+msgid "Micrometers"
+msgstr "Mikrometri"
+
+#: ../src/unit-manager.c:71
+#, c-format
+msgctxt "unit-format"
+msgid "%s μm"
+msgstr "%s μm"
+
+#: ../src/unit-manager.c:71
+msgctxt "unit-symbols"
+msgid "micrometer,micrometers,um"
+msgstr "mikrometar,mikrometara,um"
+
+#: ../src/unit-manager.c:72
+msgid "Nanometers"
+msgstr "Nanometri"
+
+#: ../src/unit-manager.c:72
+msgctxt "unit-symbols"
+msgid "nanometer,nanometers"
+msgstr "nanometar,nanometara,nm,nm"
+
+#: ../src/unit-manager.c:73
+msgid "Hectares"
+msgstr "Hektari"
+
+#: ../src/unit-manager.c:73
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: ../src/unit-manager.c:73
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "hektar,hektara, ha,ha"
+
+#: ../src/unit-manager.c:74
+msgid "Acres"
+msgstr "Akri"
+
+#: ../src/unit-manager.c:74
+#, c-format
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s akre"
+
+#: ../src/unit-manager.c:74
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "akr,akre,akri"
+
+#: ../src/unit-manager.c:75
+msgid "Square Meter"
+msgstr "Kvadratni metri"
+
+#: ../src/unit-manager.c:75
+#, c-format
+msgctxt "unit-format"
+msgid "%s m²"
+msgstr "%s m²"
+
+#: ../src/unit-manager.c:75
+msgctxt "unit-symbols"
+msgid "m²"
+msgstr "m²"
+
+#: ../src/unit-manager.c:76
+msgid "Square Centimeter"
+msgstr "Kvadratni centrimetri"
+
+#: ../src/unit-manager.c:76
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm²"
+msgstr "%s cm²"
+
+#: ../src/unit-manager.c:76
+msgctxt "unit-symbols"
+msgid "cm²"
+msgstr "cm²"
+
+#: ../src/unit-manager.c:77
+msgid "Square Millimeter"
+msgstr "Kvadratni milimetri"
+
+#: ../src/unit-manager.c:77
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm²"
+msgstr "%s mm²"
+
+#: ../src/unit-manager.c:77
+msgctxt "unit-symbols"
+msgid "mm²"
+msgstr "mm²"
+
+#: ../src/unit-manager.c:78
+msgid "Cubic Meters"
+msgstr "Kubni metri"
+
+#: ../src/unit-manager.c:78
+#, c-format
+msgctxt "unit-format"
+msgid "%s m³"
+msgstr "%s m³"
+
+#: ../src/unit-manager.c:78
+msgctxt "unit-symbols"
+msgid "m³"
+msgstr "m³"
+
+#: ../src/unit-manager.c:79
+msgid "Gallons"
+msgstr "Galoni"
+
+#: ../src/unit-manager.c:79
+#, c-format
+msgctxt "unit-format"
+msgid "%s gal"
+msgstr "%s gal"
+
+#: ../src/unit-manager.c:79
+msgctxt "unit-symbols"
+msgid "gallon,gallons,gal"
+msgstr "galon,galoni,gal,gal"
+
+#: ../src/unit-manager.c:80
+msgid "Litres"
+msgstr "Litri"
+
+#: ../src/unit-manager.c:80
+#, c-format
+msgctxt "unit-format"
+msgid "%s L"
+msgstr "%s L"
+
+#: ../src/unit-manager.c:80
+msgctxt "unit-symbols"
+msgid "litre,litres,liter,liters,L"
+msgstr "litar,litra,litara,L,L"
+
+#: ../src/unit-manager.c:81
+msgid "Quarts"
+msgstr "Kvarti"
+
+#: ../src/unit-manager.c:81
+#, c-format
+msgctxt "unit-format"
+msgid "%s qt"
+msgstr "%s qt"
+
+#: ../src/unit-manager.c:81
+msgctxt "unit-symbols"
+msgid "quart,quarts,qt"
+msgstr "kvart,kvarta,kvartova,qt"
+
+#: ../src/unit-manager.c:82
+msgid "Pints"
+msgstr "Pinte"
+
+#: ../src/unit-manager.c:82
+#, c-format
+msgctxt "unit-format"
+msgid "%s pt"
+msgstr "%s pt"
+
+#: ../src/unit-manager.c:82
+msgctxt "unit-symbols"
+msgid "pint,pints,pt"
+msgstr "pinta,pinte,pinti,pt,pt"
+
+#: ../src/unit-manager.c:83
+msgid "Millilitres"
+msgstr "Mililitri"
+
+#: ../src/unit-manager.c:83
+#, c-format
+msgctxt "unit-format"
+msgid "%s mL"
+msgstr "%s mL"
+
+#: ../src/unit-manager.c:83
+msgctxt "unit-symbols"
+msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
+msgstr "mililitar,militra,mililitara,ml,mL,cm³"
+
+#: ../src/unit-manager.c:84
+msgid "Microlitre"
+msgstr "Mikrolitri"
+
+#: ../src/unit-manager.c:84
+#, c-format
+msgctxt "unit-format"
+msgid "%s μL"
+msgstr "%s μL"
+
+#: ../src/unit-manager.c:84
+msgctxt "unit-symbols"
+msgid "mm³,μL,uL"
+msgstr "mm³,μL,uL"
+
+#: ../src/unit-manager.c:85
+msgid "Tonnes"
+msgstr "Tone"
+
+#: ../src/unit-manager.c:85
+#, c-format
+msgctxt "unit-format"
+msgid "%s T"
+msgstr "%s T"
+
+#: ../src/unit-manager.c:85
+msgctxt "unit-symbols"
+msgid "tonne,tonnes"
+msgstr "tona,tone,t,T"
+
+#: ../src/unit-manager.c:86
+msgid "Kilograms"
+msgstr "Kilogrami"
+
+#: ../src/unit-manager.c:86
+#, c-format
+msgctxt "unit-format"
+msgid "%s kg"
+msgstr "%s kg"
+
+#: ../src/unit-manager.c:86
+msgctxt "unit-symbols"
+msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+msgstr "kilogram,kilograma,kg,kg"
+
+#: ../src/unit-manager.c:87
+msgid "Pounds"
+msgstr "Funte"
+
+#: ../src/unit-manager.c:87
+#, c-format
+msgctxt "unit-format"
+msgid "%s lb"
+msgstr "%s lb"
+
+#: ../src/unit-manager.c:87
+msgctxt "unit-symbols"
+msgid "pound,pounds,lb"
+msgstr "funta,funte,funti,lb"
+
+#: ../src/unit-manager.c:88
+msgid "Ounces"
+msgstr "Unce"
+
+#: ../src/unit-manager.c:88
+#, c-format
+msgctxt "unit-format"
+msgid "%s oz"
+msgstr "%s oz"
+
+#: ../src/unit-manager.c:88
+msgctxt "unit-symbols"
+msgid "ounce,ounces,oz"
+msgstr "unca,unci,oz,oz"
+
+#: ../src/unit-manager.c:89
+msgid "Grams"
+msgstr "GradijaniGrami"
+
+#: ../src/unit-manager.c:89
+#, c-format
+msgctxt "unit-format"
+msgid "%s g"
+msgstr "%s g"
+
+#: ../src/unit-manager.c:89
+msgctxt "unit-symbols"
+msgid "gram,grams,gramme,grammes,g"
+msgstr "gram,grama,g,g"
+
+#: ../src/unit-manager.c:90
+msgid "Years"
+msgstr "Godine"
+
+#: ../src/unit-manager.c:90
+#, c-format
+msgctxt "unit-format"
+msgid "%s years"
+msgstr "%s godina"
+
+#: ../src/unit-manager.c:90
+msgctxt "unit-symbols"
+msgid "year,years"
+msgstr "godina"
+
+#: ../src/unit-manager.c:91
+msgid "Days"
+msgstr "Dani"
+
+#: ../src/unit-manager.c:91
+#, c-format
+msgctxt "unit-format"
+msgid "%s days"
+msgstr "%s dana"
+
+#: ../src/unit-manager.c:91
+msgctxt "unit-symbols"
+msgid "day,days"
+msgstr "dan,dana"
+
+#: ../src/unit-manager.c:92
+msgid "Hours"
+msgstr "Sati"
+
+#: ../src/unit-manager.c:92
+#, c-format
+msgctxt "unit-format"
+msgid "%s hours"
+msgstr "%s sati"
+
+#: ../src/unit-manager.c:92
+msgctxt "unit-symbols"
+msgid "hour,hours"
+msgstr "sat,sata,sati"
+
+#: ../src/unit-manager.c:93
+msgid "Minutes"
+msgstr "Minuti"
+
+#: ../src/unit-manager.c:93
+#, c-format
+msgctxt "unit-format"
+msgid "%s minutes"
+msgstr "%s minuta"
+
+#: ../src/unit-manager.c:93
+msgctxt "unit-symbols"
+msgid "minute,minutes"
+msgstr "minut,minuta"
+
+#: ../src/unit-manager.c:94
+msgid "Seconds"
+msgstr "Sekunde"
+
+#: ../src/unit-manager.c:94
+#, c-format
+msgctxt "unit-format"
+msgid "%s s"
+msgstr "%s s"
+
+#: ../src/unit-manager.c:94
+msgctxt "unit-symbols"
+msgid "second,seconds,s"
+msgstr "sekund,sekunde,sekundi,s,s"
+
+#: ../src/unit-manager.c:95
+msgid "Milliseconds"
+msgstr "Milisekunde"
+
+#: ../src/unit-manager.c:95
+#, c-format
+msgctxt "unit-format"
+msgid "%s ms"
+msgstr "%s ms"
+
+#: ../src/unit-manager.c:95
+msgctxt "unit-symbols"
+msgid "millisecond,milliseconds,ms"
+msgstr "milisekund,milisekunde,milisendi,ms,ms"
+
+#: ../src/unit-manager.c:96
+msgid "Microseconds"
+msgstr "Mikrosekunde"
+
+#: ../src/unit-manager.c:96
+#, c-format
+msgctxt "unit-format"
+msgid "%s μs"
+msgstr "%s μs"
+
+#: ../src/unit-manager.c:96
+msgctxt "unit-symbols"
+msgid "microsecond,microseconds,us"
+msgstr "mikrosekund,mikrosekunde,mikrosekundi,us"
+
+#: ../src/unit-manager.c:97
+msgid "Celcius"
+msgstr "Celzijusi"
+
+#: ../src/unit-manager.c:97
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?C"
+msgstr "%sË?C"
+
+#: ../src/unit-manager.c:97
+msgctxt "unit-symbols"
+msgid "degC,Ë?C"
+msgstr "C,degC,Ë?C"
+
+#: ../src/unit-manager.c:98
+msgid "Farenheit"
+msgstr "Faranhajti"
+
+#: ../src/unit-manager.c:98
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?F"
+msgstr "%sË?F"
+
+#: ../src/unit-manager.c:98
+msgctxt "unit-symbols"
+msgid "degF,Ë?F"
+msgstr "F,degF,Ë?F"
+
+#: ../src/unit-manager.c:99
+msgid "Kelvin"
+msgstr "Kelvini"
+
+#: ../src/unit-manager.c:99
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?K"
+msgstr "%sË?K"
+
+#: ../src/unit-manager.c:99
+msgctxt "unit-symbols"
+msgid "degK,Ë?K"
+msgstr "K,degK,Ë?K"
+
+#: ../src/unit-manager.c:100
+msgid "Rankine"
+msgstr "Rankini"
+
+#: ../src/unit-manager.c:100
+#, c-format
+msgctxt "unit-format"
+msgid "%sË?R"
+msgstr "%sË?R"
+
+#: ../src/unit-manager.c:100
+msgctxt "unit-symbols"
+msgid "degR,Ë?R"
+msgstr "R,degR,Ë?R"
+
+#: ../src/unit-manager.c:109
+msgid "Angle"
+msgstr "Ugao"
+
+#: ../src/unit-manager.c:110
+msgid "Length"
+msgstr "Dužina"
+
+#: ../src/unit-manager.c:111
+msgid "Area"
+msgstr "Površina"
+
+#: ../src/unit-manager.c:112
+msgid "Volume"
+msgstr "Zapremina"
+
+#: ../src/unit-manager.c:113
+msgid "Weight"
+msgstr "Težina"
+
+#: ../src/unit-manager.c:114
+msgid "Duration"
+msgstr "Trajanje"
+
+#: ../src/unit-manager.c:115
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: ../src/unit-manager.c:127
+msgid "Currency"
+msgstr "Valuta"
+
+#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
+#: ../src/unit-manager.c:137
+#, c-format
+msgid "%s%%s"
+msgstr "%%s%s"
+
+#~ msgid "&#x2190; R"
+#~ msgstr "&#x2190; R"
+
+#~ msgid "&#x2192; R"
+#~ msgstr "&#x2192; R"
+
+#~ msgid "Recall"
+#~ msgstr "UÄ?itaj"
+
+#~ msgid "Undo"
+#~ msgstr "Opozovi"
+
+#~ msgid "Assign Variable"
+#~ msgstr "Dodeli promenljivu"
+
+#~ msgid "Insert Variable"
+#~ msgstr "Ubaci promenljivu"
+
+#~ msgid "No variables defined"
+#~ msgstr "Nema definisanih promenljivih"
+
 #~ msgid ""
 #~ "Converts between different currencies. Enter the amount and the currency "
 #~ "you want to convert from on the upper row, and the currency you want to "
@@ -1620,9 +2459,6 @@ msgstr ""
 #~ "Ne mogu da preuzmem kursne liste. Možda Ä?ete dobiti pogreÅ¡ne rezultate "
 #~ "ili neÄ?ete dobiti nikakav rezultat."
 
-#~ msgid "Paste"
-#~ msgstr "Ubaci"
-
 #~ msgid "Logarithm of negative values is undefined"
 #~ msgstr "Logaritam od negativne vrednost nije definisan"
 
@@ -1743,9 +2579,6 @@ msgstr ""
 #~ msgid "<"
 #~ msgstr "<"
 
-#~ msgid "<i>x</i>!"
-#~ msgstr "<i>x</i>!"
-
 #~ msgid "<i>x</i><sup>2</sup>"
 #~ msgstr "<i>x</i><sup>2</sup>"
 
@@ -2157,9 +2990,6 @@ msgstr ""
 #~ msgid "Square"
 #~ msgstr "Kvadrat"
 
-#~ msgid "Square root"
-#~ msgstr "Kvadratni koren"
-
 # Pokreni više operacija?
 # Pokreni izraÄ?unavanje
 #~ msgid "Start group of calculations [(]"
@@ -2288,9 +3118,6 @@ msgstr ""
 #~ msgid "register 9"
 #~ msgstr "registar 9"
 
-#~ msgid "x2"
-#~ msgstr "x2"
-
 #~ msgid "%s: accuracy should be in the range 0-%d\n"
 #~ msgstr "%s: taÄ?nost treba da bude u opsegu 0â??%d\n"
 
@@ -2333,9 +3160,6 @@ msgstr ""
 #~ msgstr[1] "Postavi preciznost na 0 do %d znaÄ?ajna mesta [A]"
 #~ msgstr[2] "Postavi preciznost na 0 do %d znaÄ?ajnih mesta [A]"
 
-#~ msgid "sin"
-#~ msgstr "sin"
-
 #~ msgid "sin<sup>â??1</sup>"
 #~ msgstr "sin<sup>-1</sup>"
 
@@ -2351,9 +3175,6 @@ msgstr ""
 #~ msgid "Hyperbolic Inverse Sine [K]"
 #~ msgstr "Inverzni Sinus HiperboliÄ?ni [K]"
 
-#~ msgid "cos"
-#~ msgstr "cos"
-
 #~ msgid "cos<sup>â??1</sup>"
 #~ msgstr "cos<sup>-1</sup>"
 
@@ -2435,9 +3256,6 @@ msgstr ""
 #~ msgid "No."
 #~ msgstr "br."
 
-#~ msgid "Value"
-#~ msgstr "Vrednost"
-
 #~ msgid "Reset to _Default (%d)"
 #~ msgstr "_Postavi na podrazumevano (%d)"
 
@@ -2609,9 +3427,6 @@ msgstr ""
 #~ msgid "And"
 #~ msgstr "I"
 
-#~ msgid " And "
-#~ msgstr " I "
-
 #~ msgid "Not"
 #~ msgstr "Neg"
 
@@ -2846,9 +3661,6 @@ msgstr ""
 #~ msgid "*10^"
 #~ msgstr "*10^"
 
-#~ msgid "abs"
-#~ msgstr "abs"
-
 #~ msgid "acosh"
 #~ msgstr "acosh"
 
@@ -2873,9 +3685,6 @@ msgstr ""
 #~ msgid "cbrt"
 #~ msgstr "cbrt"
 
-#~ msgid "chs"
-#~ msgstr "chs"
-
 #~ msgid "clr"
 #~ msgstr "clr"
 
@@ -2891,9 +3700,6 @@ msgstr ""
 #~ msgid "fv"
 #~ msgstr "fv"
 
-#~ msgid "int"
-#~ msgstr "int"
-
 #~ msgid "not"
 #~ msgstr "not"
 
@@ -2915,27 +3721,15 @@ msgstr ""
 #~ msgid "sln"
 #~ msgstr "sln"
 
-#~ msgid "sqrt"
-#~ msgstr "sqrt"
-
 #~ msgid "sto"
 #~ msgstr "sto"
 
-#~ msgid "syd"
-#~ msgstr "syd"
-
-#~ msgid "term"
-#~ msgstr "term"
-
 #~ msgid "xnor"
 #~ msgstr "xnor"
 
 #~ msgid "xor"
 #~ msgstr "xor"
 
-#~ msgid "ans"
-#~ msgstr "ans"
-
 #~ msgid "_Quit"
 #~ msgstr "_IzaÄ?i"
 
@@ -2978,9 +3772,6 @@ msgstr ""
 #~ msgid "kilometers per hour or miles per hour"
 #~ msgstr "kilometara po Ä?asu ili milja po Ä?asu"
 
-#~ msgid "centimeters or inches"
-#~ msgstr "centimetri ili inÄ?i"
-
 #~ msgid "grams or ounces"
 #~ msgstr "grama ili unci"
 



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