[gcalctool] Updated Serbian translation



commit a2751093b9473abb18ceeac209528d2cb86f328d
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Fri Jan 18 12:22:50 2013 +0100

    Updated Serbian translation

 po/sr.po       | 1508 +++++++++++++++++---------------------------------------
 po/sr latin po | 1508 +++++++++++++++++---------------------------------------
 2 files changed, 906 insertions(+), 2110 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 81e5078..624cbb9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,22 +7,22 @@
 # 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.
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gcalctool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-12 10:42+0000\n"
-"PO-Revision-Date: 2012-07-22 15:33+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=http:/";
+"/bugzilla.gnome.org/&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-01-09 09:15+0000\n"
+"PO-Revision-Date: 2013-01-18 12:06+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #. Accessible name for the inverse button
@@ -65,7 +65,7 @@ msgstr "ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:72
-#: ../src/math-buttons.c:222
+#: ../src/math-buttons.vala:384
 msgid "Memory"
 msgstr "ÐÐÐÐÑÐÑÐ"
 
@@ -93,7 +93,7 @@ msgstr "ÐÐÐÐÐ"
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.c:246
+#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:400
 msgid "Compounding Term"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
 
@@ -158,7 +158,7 @@ msgstr "_ÐÐÑÐÐÐ:"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.c:252
+#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:404
 msgid "Future Value"
 msgstr "ÐÑÐÑÑÐ ÐÑÐÐÐÐÑÑ"
 
@@ -184,7 +184,7 @@ msgstr "_ÐÑÐÑ ÐÐÑÐÐÐÐ:"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.c:273
+#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:418
 msgid "Gross Profit Margin"
 msgstr "ÐÑÑÑÐ ÐÐÑÐÐ"
 
@@ -204,7 +204,7 @@ msgstr "_ÐÐÑÐÐ:"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.c:270
+#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:416
 msgid "Periodic Payment"
 msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐ"
 
@@ -229,7 +229,7 @@ msgstr "_ÐÐÐ:"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.c:267
+#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:414
 msgid "Present Value"
 msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÑÑ"
 
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.c:264
+#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:412
 msgid "Periodic Interest Rate"
 msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐ"
 
@@ -377,13 +377,13 @@ msgstr "ÐÐ"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:240
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:396
 msgid "Shift Left"
 msgstr "ÐÐÐÐÑÐ ÑÐÐÐÐ"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.c:243
+#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:398
 msgid "Shift Right"
 msgstr "ÐÐÐÐÑÐ ÑÐÐÑÐÐ"
 
@@ -394,7 +394,7 @@ msgstr "ÐÐÐÑÐ ÐÐÐÐ"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:225
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:386
 msgid "Insert Character Code"
 msgstr "ÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐ"
 
@@ -408,103 +408,59 @@ msgstr "_ÐÐÐÐ:"
 msgid "_Insert"
 msgstr "_ÐÐÐÑÐÐ"
 
-#. Word size combo: 8 bits
-#: ../data/preferences.ui.h:2
-msgid "8-bit"
-msgstr "8 ÐÐÑÐ"
-
-#. Word size combo: 16 bits
-#: ../data/preferences.ui.h:4
-msgid "16-bit"
-msgstr "16 ÐÐÑÐ"
-
-#. Word size combo: 32 bits
-#: ../data/preferences.ui.h:6
-msgid "32-bit"
-msgstr "32 ÐÐÑÐ"
-
-#. Word size combo: 64 bits
-#: ../data/preferences.ui.h:8
-msgid "64-bit"
-msgstr "64 ÐÐÑÐ"
-
-#. Title of preferences dialog
-#: ../data/preferences.ui.h:9 ../src/math-preferences.c:231
-#: ../src/math-window.c:369
-msgid "Preferences"
-msgstr "ÐÐÑÑÐÐÐÐ"
-
-#. Preferences dialog: Label for angle unit combo box
-#: ../data/preferences.ui.h:11
-msgid "_Angle units:"
-msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐÐÐÐ:"
-
-#. Preferences dialog: Label for display format combo box
-#: ../data/preferences.ui.h:13
-msgid "Number _Format:"
-msgstr "_ÐÐÐÐÐ ÐÑÐÑÐ:"
-
-#. Preferences dialog: label for word size combo box
-#: ../data/preferences.ui.h:15
-msgid "Word _size:"
-msgstr "ÐÑÐÐÐÐ _ÑÐÑÐ:"
-
-#. Preferences dialog: label for show trailing zeroes check button
-#: ../data/preferences.ui.h:17
-msgid "Show trailing _zeroes"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ _ÐÑÐÐ"
-
-#. Preferences dialog: label for show thousands separator check button
-#: ../data/preferences.ui.h:19
-msgid "Show _thousands separators"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐÐÐÑÐÑ ÑÐÑÐÐÐ"
-
+#. Program name in the about dialog
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:493
+#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:265
+#: ../src/math-window.vala:29
 msgid "Calculator"
 msgstr "ÐÐÐÐÑÐÐÑÐÑ"
 
-#: ../data/gcalctool.desktop.in.h:2
+#: ../data/gnome-calculator.desktop.in.h:2
 msgid "Perform arithmetic, scientific or financial calculations"
 msgstr "ÐÐÐÑÑÐÑÐ ÐÑÐÑÐÐÑÐÑÐÐ, ÐÐÑÑÐÐ ÐÐÐ ÑÐÐÐÐÑÐÑÑÐÐ ÐÑÐÑÐÑÑÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:1
+#: ../data/gnome-calculator.desktop.in.h:3
+#| msgid "Perform arithmetic, scientific or financial calculations"
+msgid "calculation;arithmetic;scientific;financial;"
+msgstr "ÑÐÑÑÐÐÑÐ;ÐÑÐÑÐÐÑÐÐÐ;ÐÐÑÐÐ;ÑÐÐÐÐÑÐÑÐ;ÐÑÐÑÐÑÑÐÐ;"
+
+#: ../data/org.gnome.calculator.gschema.xml.in.h:1
 msgid "Accuracy value"
 msgstr "ÐÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:2
+#: ../data/org.gnome.calculator.gschema.xml.in.h:2
 msgid "The number of digits displayed after the numeric point"
 msgstr "ÐÑÐÑ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:3
+#: ../data/org.gnome.calculator.gschema.xml.in.h:3
 msgid "Word size"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:4
+#: ../data/org.gnome.calculator.gschema.xml.in.h:4
 msgid "The size of the words used in bitwise operations"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:5
+#: ../data/org.gnome.calculator.gschema.xml.in.h:5
 msgid "Numeric Base"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
+#: ../data/org.gnome.calculator.gschema.xml.in.h:6
 msgid "The numeric base"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
+#: ../data/org.gnome.calculator.gschema.xml.in.h:7
 msgid "Show Thousands Separators"
 msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÐ ÑÐÑÐÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:8
+#: ../data/org.gnome.calculator.gschema.xml.in.h:8
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "ÐÐ ÐÐ ÐÐ ÑÐ ÑÐÐÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐ."
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:9
+#: ../data/org.gnome.calculator.gschema.xml.in.h:9
 msgid "Show Trailing Zeroes"
 msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:10
+#: ../data/org.gnome.calculator.gschema.xml.in.h:10
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -512,983 +468,896 @@ msgstr ""
 "ÐÐ ÐÐ ÐÐ ÑÐ Ñ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÑ ÐÑÐÑÐÑÐ ÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐÐ "
 "ÐÐÑÐÐÐ."
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:11
+#: ../data/org.gnome.calculator.gschema.xml.in.h:11
 msgid "Number format"
 msgstr "ÐÐÐÐÐ ÐÑÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:12
+#: ../data/org.gnome.calculator.gschema.xml.in.h:12
 msgid "The format to display numbers in"
 msgstr "ÐÐÐÐÐ Ñ ÐÐÐÐ ÑÐ ÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
+#: ../data/org.gnome.calculator.gschema.xml.in.h:13
 msgid "Angle units"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
+#: ../data/org.gnome.calculator.gschema.xml.in.h:14
 msgid "The angle units to use"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+#: ../data/org.gnome.calculator.gschema.xml.in.h:15
 msgid "Button mode"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+#: ../data/org.gnome.calculator.gschema.xml.in.h:16
 msgid "The button mode"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#: ../data/org.gnome.calculator.gschema.xml.in.h:17
 msgid "Source currency"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
+#: ../data/org.gnome.calculator.gschema.xml.in.h:18
 msgid "Currency of the current calculation"
 msgstr "ÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐÐ ÐÑÐÑÐÑÑÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
+#: ../data/org.gnome.calculator.gschema.xml.in.h:19
 msgid "Target currency"
 msgstr "ÐÐÑÐÐ ÐÐÐÑÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
+#: ../data/org.gnome.calculator.gschema.xml.in.h:20
 msgid "Currency to convert the current calculation into"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÑ ÑÑÐÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÑÐÑÐÑÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:21
+#: ../data/org.gnome.calculator.gschema.xml.in.h:21
 msgid "Source units"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+#: ../data/org.gnome.calculator.gschema.xml.in.h:22
 msgid "Units of the current calculation"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÑÐÐÑÑÐÐÐ ÐÑÐÑÐÑÑÐÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+#: ../data/org.gnome.calculator.gschema.xml.in.h:23
 msgid "Target units"
 msgstr "ÐÐÑÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
+#: ../data/org.gnome.calculator.gschema.xml.in.h:24
 msgid "Units to convert the current calculation into"
 msgstr "ÐÐÐÐÐÐÑÐ Ñ ÐÐÑÑ ÑÑÐÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÑÐÑÐÑÑÐ"
 
-#: ../src/currency-manager.c:30
+#: ../src/currency.vala:28
 msgid "UAE Dirham"
 msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:31
+#: ../src/currency.vala:29
 msgid "Australian Dollar"
 msgstr "ÐÑÑÑÑÐÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:32
+#: ../src/currency.vala:30
 msgid "Bulgarian Lev"
 msgstr "ÐÑÐÐÑÑÐÐ ÐÐÐ"
 
-#: ../src/currency-manager.c:33
+#: ../src/currency.vala:31
 msgid "Bahraini Dinar"
 msgstr "ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:34
+#: ../src/currency.vala:32
 msgid "Brunei Dollar"
 msgstr "ÐÑÑÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:35
+#: ../src/currency.vala:33
 msgid "Brazilian Real"
 msgstr "ÐÑÐÐÐÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/currency-manager.c:36
+#: ../src/currency.vala:34
 msgid "Botswana Pula"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÑÐÐ"
 
-#: ../src/currency-manager.c:37
+#: ../src/currency.vala:35
 msgid "Canadian Dollar"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:38
+#: ../src/currency.vala:36
 msgid "CFA Franc"
 msgstr "ÐÐÐ ÑÑÐÐÐÐ"
 
-#: ../src/currency-manager.c:39
+#: ../src/currency.vala:37
 msgid "Swiss Franc"
 msgstr "ÐÐÐÑÑÐÑÑÐÐ ÑÑÐÐÐÐ"
 
-#: ../src/currency-manager.c:40
+#: ../src/currency.vala:38
 msgid "Chilean Peso"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:41
+#: ../src/currency.vala:39
 msgid "Chinese Yuan"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÐ"
 
-#: ../src/currency-manager.c:42
+#: ../src/currency.vala:40
 msgid "Colombian Peso"
 msgstr "ÐÐÐÑÐÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:43
+#: ../src/currency.vala:41
 msgid "Czech Koruna"
 msgstr "ÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:44
+#: ../src/currency.vala:42
 msgid "Danish Krone"
 msgstr "ÐÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:45
+#: ../src/currency.vala:43
 msgid "Algerian Dinar"
 msgstr "ÐÐÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:46
+#: ../src/currency.vala:44
 msgid "Estonian Kroon"
 msgstr "ÐÑÑÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:47
+#: ../src/currency.vala:45
 msgid "Euro"
 msgstr "ÐÐÑÐ"
 
-#: ../src/currency-manager.c:48
+#: ../src/currency.vala:46
 msgid "Pound Sterling"
 msgstr "ÐÑÐÑÐ ÑÑÐÑÐÐÐÐ"
 
-#: ../src/currency-manager.c:49
+#: ../src/currency.vala:47
 msgid "Hong Kong Dollar"
 msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:50
+#: ../src/currency.vala:48
 msgid "Croatian Kuna"
 msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐ"
 
-#: ../src/currency-manager.c:51
+#: ../src/currency.vala:49
 msgid "Hungarian Forint"
 msgstr "ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:52
+#: ../src/currency.vala:50
 msgid "Indonesian Rupiah"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:53
+#: ../src/currency.vala:51
 msgid "Israeli New Shekel"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../src/currency-manager.c:54
+#: ../src/currency.vala:52
 msgid "Indian Rupee"
 msgstr "ÐÐÐÐÑÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:55
+#: ../src/currency.vala:53
 msgid "Iranian Rial"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÐÐ"
 
-#: ../src/currency-manager.c:56
+#: ../src/currency.vala:54
 msgid "Icelandic Krona"
 msgstr "ÐÑÐÐÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:57
+#: ../src/currency.vala:55
 msgid "Japanese Yen"
 msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐ"
 
-#: ../src/currency-manager.c:58
+#: ../src/currency.vala:56
 msgid "South Korean Won"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÑÐÐ ÐÐÐ"
 
-#: ../src/currency-manager.c:59
+#: ../src/currency.vala:57
 msgid "Kuwaiti Dinar"
 msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:60
+#: ../src/currency.vala:58
 msgid "Kazakhstani Tenge"
 msgstr "ÐÐÐÐÑÑÑÐÐÑÐÐ ÑÐÐÐÐ"
 
-#: ../src/currency-manager.c:61
+#: ../src/currency.vala:59
 msgid "Sri Lankan Rupee"
 msgstr "ÐÑÐÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:62
+#: ../src/currency.vala:60
 msgid "Lithuanian Litas"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../src/currency-manager.c:63
+#: ../src/currency.vala:61
 msgid "Latvian Lats"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÑÑ"
 
-#: ../src/currency-manager.c:64
+#: ../src/currency.vala:62
 msgid "Libyan Dinar"
 msgstr "ÐÐÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:65
+#: ../src/currency.vala:63
 msgid "Mauritian Rupee"
 msgstr "ÐÐÑÑÐÑÐÑÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:66
+#: ../src/currency.vala:64
 msgid "Mexican Peso"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:67
+#: ../src/currency.vala:65
 msgid "Malaysian Ringgit"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:68
+#: ../src/currency.vala:66
 msgid "Norwegian Krone"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:69
+#: ../src/currency.vala:67
 msgid "Nepalese Rupee"
 msgstr "ÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:70
+#: ../src/currency.vala:68
 msgid "New Zealand Dollar"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:71
+#: ../src/currency.vala:69
 msgid "Omani Rial"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÑÐÐ"
 
-#: ../src/currency-manager.c:72
+#: ../src/currency.vala:70
 msgid "Peruvian Nuevo Sol"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐ ÑÐÐ"
 
-#: ../src/currency-manager.c:73
+#: ../src/currency.vala:71
 msgid "Philippine Peso"
 msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:74
+#: ../src/currency.vala:72
 msgid "Pakistani Rupee"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÐ ÑÑÐÐÑÐ"
 
-#: ../src/currency-manager.c:75
+#: ../src/currency.vala:73
 msgid "Polish Zloty"
 msgstr "ÐÐÑÑÐÐ ÐÐÐÑ"
 
-#: ../src/currency-manager.c:76
+#: ../src/currency.vala:74
 msgid "Qatari Riyal"
 msgstr "ÐÐÑÐÑÑÐÐ ÑÐÑÐÐ"
 
-#: ../src/currency-manager.c:77
+#: ../src/currency.vala:75
 msgid "New Romanian Leu"
 msgstr "ÐÐÐÐ ÑÑÐÑÐÑÐÐ ÐÐÑ"
 
-#: ../src/currency-manager.c:78
+#: ../src/currency.vala:76
 msgid "Russian Rouble"
 msgstr "ÐÑÑÐÐ ÑÑÐÑÐ"
 
-#: ../src/currency-manager.c:79
+#: ../src/currency.vala:77
 msgid "Saudi Riyal"
 msgstr "ÐÐÑÐÐÑÑÐÐ ÑÐÑÐÐ"
 
-#: ../src/currency-manager.c:80
+#: ../src/currency.vala:78
 msgid "Swedish Krona"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÑÐÐ"
 
-#: ../src/currency-manager.c:81
+#: ../src/currency.vala:79
 msgid "Singapore Dollar"
 msgstr "ÐÐÐÐÐÐÑÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:82
+#: ../src/currency.vala:80
 msgid "Thai Baht"
 msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÐÑ"
 
-#: ../src/currency-manager.c:83
+#: ../src/currency.vala:81
 msgid "Tunisian Dinar"
 msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:84
+#: ../src/currency.vala:82
 msgid "New Turkish Lira"
 msgstr "ÐÐÐÐ ÑÑÑÑÐÐ ÐÐÑÐ"
 
-#: ../src/currency-manager.c:85
+#: ../src/currency.vala:83
 msgid "T&T Dollar (TTD)"
 msgstr "T&T ÐÐÐÐÑ (TTD)"
 
-#: ../src/currency-manager.c:86
+#: ../src/currency.vala:84
 msgid "US Dollar"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:87
+#: ../src/currency.vala:85
 msgid "Uruguayan Peso"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:88
+#: ../src/currency.vala:86
 msgid "Venezuelan BolÃvar"
 msgstr "ÐÐÐÐÑÑÐÐÐÐÑÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../src/currency-manager.c:89
+#: ../src/currency.vala:87
 msgid "South African Rand"
 msgstr "ÐÑÐÐÐÐÑÑÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/financial.c:70
+#: ../src/financial.vala:114
 msgid "Error: the number of periods must be positive"
 msgstr "ÐÑÐÑÐÐ: ÐÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐÐ"
 
-#. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:77
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s â Perform mathematical calculations"
-msgstr ""
-"ÐÐÑÐÑÑÐÑÐ:\n"
-"  %s â ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÑÐÑÑÐÐÐÐÑÐ"
+#: ../src/gnome-calculator.vala:80
+msgid "Basic"
+msgstr "ÐÑÐÐÐÐÐ"
 
-#. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:85
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -v, --version                   Show release version\n"
-"  -h, -?, --help                  Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"ÐÐÑÐÑÐ ÐÐÐÐÑÐ:\n"
-"  -v, --version                   ÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ\n"
-"  -h, -?, --help                  ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ\n"
-"  --help-all                      ÐÑÐÐÐÐÑÑÐ ÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ\n"
-"  --help-gtk                      ÐÑÐÐÐÐÑÑÐ ÐÑÐ+ ÐÐÑÐÑÐ"
-
-#. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:96
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"ÐÑÐ+ ÐÐÑÐÑÐ:\n"
-"  --class=ÐÐÐÐÐÐ                  ÐÐÐÑÐÐ ÐÑÐÐÑÐÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÑÐÐÑÐÑ "
-"ÐÑÐÐÐÑÐ\n"
-"  --name=ÐÐÐÐÐ                    ÐÐÐÐÐ ÐÑÐÐÑÐÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÑÐÐÑÐÑ "
-"ÐÑÐÐÐÑÐ\n"
-"  --screen=ÐÐÐÐÐ                  ÐÐÑ ÐÐÑÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ\n"
-"  --sync                          ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÑÐÐÐÐ\n"
-"  --gtk-module=ÐÐÐÐÐÐ             ÐÑÐÑÐÐÐ ÐÐÐÑÐÑÐÐ ÐÑÐ+ ÐÐÐÑÐÐ\n"
-"  --g-fatal-warnings              ÐÐÐÐ ÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ"
-
-#. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:110
-#, c-format
-msgid ""
-"Application Options:\n"
-"  -s, --solve <equation>          Solve the given equation"
+#: ../src/gnome-calculator.vala:81
+msgid "Advanced"
+msgstr "ÐÐÐÑÐÐÐÐ"
+
+#: ../src/gnome-calculator.vala:82
+msgid "Financial"
+msgstr "ÐÐÐÐÐÑÐÑÑÐÐ"
+
+#: ../src/gnome-calculator.vala:83
+msgid "Programming"
+msgstr "ÐÑÐÐÑÐÐÐÑÑÐÐ"
+
+#: ../src/gnome-calculator.vala:84
+msgid "Mode"
+msgstr "ÐÐÐÐÐ"
+
+#. Title of preferences dialog
+#: ../src/gnome-calculator.vala:87 ../src/math-preferences.vala:26
+msgid "Preferences"
+msgstr "ÐÐÑÑÐÐÐÐ"
+
+#: ../src/gnome-calculator.vala:91
+msgid "About Calculator"
+msgstr "Ð ÐÐÐÐÑÐÐÑÐÑÑ"
+
+#: ../src/gnome-calculator.vala:92
+msgid "Help"
+msgstr "ÐÐÐÐÑ"
+
+#: ../src/gnome-calculator.vala:93
+msgid "Quit"
+msgstr "ÐÐÐÑÐ"
+
+#. Translators: Error message displayed when unable to launch help browser
+#: ../src/gnome-calculator.vala:228
+msgid "Unable to open help file"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐ"
+
+#. The translator credits. Please translate this with your name (s).
+#: ../src/gnome-calculator.vala:258
+msgid "translator-credits"
 msgstr ""
-"ÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐ:\n"
-"  -s, --solve <equation>          ÐÐÑÐÐÐ ÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐÑ"
+"ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
+"ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>\n"
+"ÐÐÐÐÐÐÐÐ Ð. ÐÑÐÐÐÑÐÐÐÑ <slobo akrep be>\n"
+"ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ <branko kokanovic gmail com>\n"
+"ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
+"\n"
+"http://prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ"
 
-#. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:154
-#, c-format
-msgid "Argument --solve requires an equation to solve"
-msgstr "ÐÑÐÑÐÐÐÑ â--solveâ ÐÐÑÑÐÐÐ ÑÐÐÐÐÑÐÐÑ ÐÐ ÑÐÑÐÐÐÑÐ"
+#. Short description in the about dialog
+#: ../src/gnome-calculator.vala:272
+msgid "Calculator with financial and scientific modes."
+msgstr "ÐÐÐÐÑÐÐÑÐÑ ÑÐ ÑÐÐÐÐÑÐÑÑÐÐÐ Ð ÐÐÑÑÐÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐ."
 
-#. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:164
-#, c-format
-msgid "Unknown argument '%s'"
-msgstr "ÐÐÐÐÐÐÐÑ ÐÑÐÑÐÐÐÑ â%sâ"
+#: ../src/gnome-calculator.vala:305
+msgid "Solve given equation"
+msgstr "ÐÐÑÐÐÐ ÐÐÑÑ ÑÐÐÐÐÑÐÐÑ"
 
+#: ../src/gnome-calculator.vala:313
+msgid "Start with given equation"
+msgstr "ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÐ ÑÐÐÐÐÑÐÐÐÐ"
+
+#: ../src/gnome-calculator.vala:322
+msgid "Show release version"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+
+#. Configure buttons
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:94
+#: ../src/math-buttons.vala:298
 msgid "Pi [Ctrl+P]"
 msgstr "ÐÐ [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:97
+#: ../src/math-buttons.vala:300
 msgid "Eulerâs Number"
 msgstr "ÐÑÐÐÑÐÐ ÐÑÐÑ"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:102
+#: ../src/math-buttons.vala:304
 msgid "Subscript mode [Alt]"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÑÐ [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:105
+#: ../src/math-buttons.vala:306
 msgid "Superscript mode [Ctrl]"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÐ [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:108
+#: ../src/math-buttons.vala:308
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:111
+#: ../src/math-buttons.vala:310
 msgid "Add [+]"
 msgstr "ÐÐÐÐÑÐÑÐ [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.vala:312
 msgid "Subtract [-]"
 msgstr "ÐÐÑÐÐÐÑÐ [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.vala:314
 msgid "Multiply [*]"
 msgstr "ÐÐÐÐÐÐÐÑÐ [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.vala:316
 msgid "Divide [/]"
 msgstr "ÐÐÐÐÐÐÑÐ [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.vala:318
 msgid "Modulus divide"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÐÑ"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.vala:320
 msgid "Additional Functions"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÐÑÐÑÐ"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.vala:322
 msgid "Exponent [^ or **]"
 msgstr "ÐÐÑÐÐÐÐÐÑ [^ ÐÐÐ **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.vala:324
 msgid "Square [Ctrl+2]"
 msgstr "ÐÐÐÐÑÐÑ [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.vala:326
 msgid "Percentage [%]"
 msgstr "ÐÑÐÑÐÐÐÑ [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.vala:328
 msgid "Factorial [!]"
 msgstr "ÐÐÐÑÐÑÐÑÐÐ [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.vala:330
 msgid "Absolute value [|]"
 msgstr "ÐÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÑÑ [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.vala:332
 msgid "Complex argument"
 msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.vala:334
 msgid "Complex conjugate"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑ"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.vala:336
 msgid "Root [Ctrl+R]"
 msgstr "ÐÐÑÐÐ [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.vala:338
 msgid "Square root [Ctrl+R]"
 msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐ [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.vala:340
 msgid "Logarithm"
 msgstr "ÐÐÐÐÑÐÑÐÐ"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.vala:342
 msgid "Natural Logarithm"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.vala:344
 msgid "Sine"
 msgstr "ÐÐÐÑÑ"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.vala:346
 msgid "Cosine"
 msgstr "ÐÐÑÐÐÑÑ"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.vala:348
 msgid "Tangent"
 msgstr "ÐÐÐÐÐÐÑ"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.vala:350
 msgid "Hyperbolic Sine"
 msgstr "ÐÐÐÐÑÐÐÐÐÑÐÐ ÑÐÐÑÑ"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.vala:352
 msgid "Hyperbolic Cosine"
 msgstr "ÐÐÐÐÑÐÐÐÐÑÐÐ ÐÐÑÐÐÑÑ"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.vala:354
 msgid "Hyperbolic Tangent"
 msgstr "ÐÐÐÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÑ"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.vala:356
 msgid "Inverse [Ctrl+I]"
 msgstr "ÐÐÑÐÐÑÐÑÐÐÑÑ [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.vala:358
 msgid "Boolean AND"
 msgstr "ÐÐÐÐÑÐÐ Ð"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.vala:360
 msgid "Boolean OR"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐ"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.vala:362
 msgid "Boolean Exclusive OR"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.vala:364
 msgid "Boolean NOT"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:195 ../src/math-buttons.c:983
+#: ../src/math-buttons.vala:366 ../src/math-buttons.vala:809
 msgid "Integer Component"
 msgstr "ÐÐÐÐÐÑÐÑÐÐ ÐÐÐ"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:198 ../src/math-buttons.c:985
+#: ../src/math-buttons.vala:368 ../src/math-buttons.vala:811
 msgid "Fractional Component"
 msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐ"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.vala:370
 msgid "Real Component"
 msgstr "ÐÐÐÐÐÐ ÐÐÐ"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:204
+#: ../src/math-buttons.vala:372
 msgid "Imaginary Component"
 msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:207
+#: ../src/math-buttons.vala:374
 msgid "Ones' Complement"
 msgstr "ÐÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÑÐ"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:210
+#: ../src/math-buttons.vala:376
 msgid "Two's Complement"
 msgstr "ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.vala:378
 msgid "Truncate"
 msgstr "ÐÐÑÐÑÐÑÐ"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.vala:380
 msgid "Start Group [(]"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑ [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:219
+#: ../src/math-buttons.vala:382
 msgid "End Group [)]"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑ [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.vala:388
 msgid "Calculate Result"
 msgstr "ÐÐÑÐÑÑÐÐÑÑÐ ÑÐÐÑÐÑÐÑ"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.vala:390
 msgid "Factorize [Ctrl+F]"
 msgstr "ÐÐÐÑÐÑÐÑÐÑÐ [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:234
+#: ../src/math-buttons.vala:392
 msgid "Clear Display [Escape]"
 msgstr "ÐÑÐÑÑÐÑÐ ÐÐÑÐÐ [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:237
+#: ../src/math-buttons.vala:394
 msgid "Undo [Ctrl+Z]"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÑÐÐÐÑ ÑÐÐÑÑ [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:249
+#: ../src/math-buttons.vala:402
 msgid "Double Declining Depreciation"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÑÑÑÑÐÐÐ ÐÐÐÐÐÑÐÐ"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:255
+#: ../src/math-buttons.vala:406
 msgid "Financial Term"
 msgstr "ÐÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÐ"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:258
+#: ../src/math-buttons.vala:408
 msgid "Sum of the Years Digits Depreciation"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÑÐÐ ÑÐÑÐÑÐ ÐÐÐÐÐÐ"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:261
+#: ../src/math-buttons.vala:410
 msgid "Straight Line Depreciation"
 msgstr "ÐÑÐÐÐÐÐÐÐÑÑÐÐ ÑÐÐÑÐÑÐ"
 
 #. Number display mode combo: Binary, e.g. 10011010010â
-#: ../src/math-buttons.c:601
+#: ../src/math-buttons.vala:523
 msgid "Binary"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:605
+#: ../src/math-buttons.vala:527
 msgid "Octal"
 msgstr "ÐÐÑÐÐÐÐ"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:609
+#: ../src/math-buttons.vala:531
 msgid "Decimal"
 msgstr "ÐÐÑÐÐÐÐÐÐ"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:613
+#: ../src/math-buttons.vala:535
 msgid "Hexadecimal"
 msgstr "ÐÐÐÑÐÐÐÑÐÐÐÐÐÐ"
 
 #. Left Shift Popup: Menu item to shift left by n places (n < 10)
 #. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:894 ../src/math-buttons.c:937
+#: ../src/math-buttons.vala:740 ../src/math-buttons.vala:777
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
 msgstr[0] "_%d ÐÐÑÑÐ"
 msgstr[1] "_%d ÐÐÑÑÐ"
 msgstr[2] "_%d ÐÐÑÑÐ"
+msgstr[3] "_%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:898 ../src/math-buttons.c:941
+#: ../src/math-buttons.vala:745 ../src/math-buttons.vala:782
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
 msgstr[0] "%d ÐÐÑÑÐ"
 msgstr[1] "%d ÐÐÑÑÐ"
 msgstr[2] "%d ÐÐÑÑÐ"
+msgstr[3] "%d ÐÐÑÑÐ"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:987
+#: ../src/math-buttons.vala:813
 msgid "Round"
 msgstr "ÐÐÐÐÑÑÐÐ"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:989
+#: ../src/math-buttons.vala:815
 msgid "Floor"
 msgstr "ÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:991
+#: ../src/math-buttons.vala:817
 msgid "Ceiling"
 msgstr "ÐÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐ"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:993
+#: ../src/math-buttons.vala:819
 msgid "Sign"
 msgstr "ÐÐÐÐ"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:412
+#: ../src/math-converter.vala:46
 msgid " in "
 msgstr " Ñ "
 
 #. Tooltip for swap conversion button
-#: ../src/math-converter.c:427
+#: ../src/math-converter.vala:60
 msgid "Switch conversion units"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐ ÐÑÐÑÐÐÑÐÑÐ"
 
+#. Digits localized for the given language
+#: ../src/math-equation.vala:171
+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"
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:459
+#: ../src/math-equation.vala:487
 msgid "No undo history"
 msgstr "ÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:486
+#: ../src/math-equation.vala:503
 msgid "No redo history"
 msgstr "ÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÑÐÑÐ"
 
-#: ../src/math-equation.c:944
+#: ../src/math-equation.vala:732
 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:1226
+#: ../src/math-equation.vala:888
 msgid "Overflow. Try a bigger word size"
 msgstr "ÐÑÐÐÐÑÐÑÐÑÐ. ÐÐÐÑÑÐÑÑÐ ÑÐ ÐÐÑÐÐ ÐÑÐÐÐÐÐ ÑÐÑÐ"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1231
+#: ../src/math-equation.vala:893
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐÐ â%sâ"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1236
+#: ../src/math-equation.vala:900
 #, 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:1241
+#: ../src/math-equation.vala:907
 msgid "Unknown conversion"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÑÐÑÐ"
 
+#: ../src/math-equation.vala:915
+#, c-format
+#| msgid "Malformed expression"
+msgid "Malformed expression at token '%s'"
+msgstr "ÐÐÑ ÐÐÑÐÐ ÐÑÐ â%sâ"
+
+#. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1250
+#: ../src/math-equation.vala:920 ../src/math-equation.vala:925
 msgid "Malformed expression"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/math-equation.c:1264
+#: ../src/math-equation.vala:936
 msgid "Calculating"
 msgstr "ÐÐÑÐÑÑÐÐÐÐÐ"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1380
+#: ../src/math-equation.vala:1063
 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:1452
+#. 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.vala:1117
 msgid "No sane value to bitwise shift"
 msgstr "ÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐÐÐÑÐÑÐ"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1483
+#: ../src/math-equation.vala:1131
 msgid "Displayed value not an integer"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÐÐÑÐ ÑÐÐ ÐÑÐÑ"
 
-#. Digits localized for the given language
-#: ../src/math-equation.c:1908
-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:235
+#: ../src/math-preferences.vala:29
 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:245 ../src/unit-manager.c:54
-msgid "Degrees"
-msgstr "ÐÑÐÐÐÐÐ"
-
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:249 ../src/unit-manager.c:55
-msgid "Radians"
-msgstr "ÐÐÐÐÑÐÐÐ"
-
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:253 ../src/unit-manager.c:56
-msgid "Gradians"
-msgstr "ÐÑÐÐÐÑÐÐÐ"
+#. Preferences dialog: Label for number format combo box
+#: ../src/math-preferences.vala:39
+msgid "Number _Format:"
+msgstr "_ÐÐÐÐÐ ÐÑÐÑÐ:"
 
 #. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234Ã10^99)
-#: ../src/math-preferences.c:263
+#: ../src/math-preferences.vala:56
 msgid "Automatic"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:267
+#: ../src/math-preferences.vala:60
 msgid "Fixed"
 msgstr "ÐÐÐÑÐÐ"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã10^3
-#: ../src/math-preferences.c:271
+#: ../src/math-preferences.vala:64
 msgid "Scientific"
 msgstr "ÐÐÑÑÐÐ"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:275
+#: ../src/math-preferences.vala:68
 msgid "Engineering"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:286
+#: ../src/math-preferences.vala:88
 #, c-format
 msgid "Show %d decimal _places"
 msgstr "_ÐÑÐÐÐÐÐ %d ÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐ"
 
-#. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:171
-msgid "Unable to open help file"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐ"
-
-#. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:204
-msgid "translator-credits"
-msgstr ""
-"ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
-"ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>\n"
-"ÐÐÐÐÐÐÐÐ Ð. ÐÑÐÐÐÑÐÐÐÑ <slobo akrep be>\n"
-"ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ <branko kokanovic gmail com>\n"
-"\n"
-"Prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ"
-
-#. The license this software is under (GPL2+)
-#: ../src/math-window.c:207
-msgid ""
-"Gcalctool is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"Gcalctool is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with Gcalctool; if not, write to the Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
-msgstr ""
-"ÐÐÐÐÑÐÐÑÐÑ ÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ; ÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÐÐÑÐÐÐÑÐ Ð/ÐÐÐ\n"
-"ÐÐÑÐÑÐ ÐÐÐ ÑÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÑÐ\n"
-"ÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐ; ÐÐÐÐ ÐÐÑÐÐÑÐ 2 ÑÐ ÐÐÑÐÐÑÐ, ÐÐÐ\n"
-"(ÐÐ ÐÐÑÐÐ ÐÐÑÑÐÑÑ) ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑÐ.\n"
-"\n"
-"ÐÐÐÐÑÐÐÑÐÑ ÑÐ ÑÐÑÐÐÐÐÑÑÑÐ Ñ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ, ÐÐÐ ÐÐÐ\n"
-"ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ; ÑÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐÐÐ\n"
-"ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ.  ÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÑ ÐÐÑÑÑ\n"
-"ÑÐÐÐÑ ÐÐÑÐÐÑÑ ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ.\n"
-"\n"
-"ÐÑÐÐÐÐÐ ÑÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐ\n"
-"ÐÐÐÐÑÐÐÑÐÑ; ÐÐÐ ÐÐÑÑÐ, ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐ ÐÐ:\n"
-"âFree Software Foundation, Inc.), 51 Franklin Street, Fifth Floor,\n"
-"Boston, MA 02110-1301 USAâ"
-
-#. Program name in the about dialog
-#: ../src/math-window.c:224
-msgid "Gcalctool"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑÐÑ"
-
-#. Copyright notice in the about dialog
-#: ../src/math-window.c:228
-msgid "Â 1986â2010 The Gcalctool authors"
-msgstr "Â 1986â2010 ÐÑÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑÐÑÐ"
-
-#. Short description in the about dialog
-#: ../src/math-window.c:232
-msgid "Calculator with financial and scientific modes."
-msgstr "ÐÐÐÐÑÐÐÑÐÑ ÑÐ ÑÐÐÐÐÑÐÑÑÐÐÐ Ð ÐÐÑÑÐÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐ."
-
-#: ../src/math-window.c:362
-msgid "Basic"
-msgstr "ÐÑÐÐÐÐÐ"
-
-#: ../src/math-window.c:363
-msgid "Advanced"
-msgstr "ÐÐÐÑÐÐÐÐ"
-
-#: ../src/math-window.c:364
-msgid "Financial"
-msgstr "ÐÐÐÐÐÑÐÑÑÐÐ"
+#. Preferences dialog: label for show trailing zeroes check button
+#: ../src/math-preferences.vala:115
+msgid "Show trailing _zeroes"
+msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ _ÐÑÐÐ"
 
-#: ../src/math-window.c:365
-msgid "Programming"
-msgstr "ÐÑÐÐÑÐÐÐÑÑÐÐ"
+#. Preferences dialog: label for show show thousands separator check button
+#: ../src/math-preferences.vala:121
+msgid "Show _thousands separators"
+msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐÐÐÑÐÑ ÑÐÑÐÐÐ"
 
-#: ../src/math-window.c:366
-msgid "Mode"
-msgstr "ÐÐÐÐÐ"
+#. Preferences dialog: Label for angle unit combo box
+#: ../src/math-preferences.vala:127
+msgid "_Angle units:"
+msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐÐÐÐ:"
 
-#: ../src/math-window.c:373
-msgid "About Calculator"
-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.vala:143 ../src/unit.vala:38
+msgid "Degrees"
+msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../src/math-window.c:374
-msgid "Help"
-msgstr "ÐÐÐÐÑ"
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../src/math-preferences.vala:147 ../src/unit.vala:39
+msgid "Radians"
+msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../src/math-window.c:375
-msgid "Quit"
-msgstr "ÐÐÐÑÐ"
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: ../src/math-preferences.vala:151 ../src/unit.vala:40
+msgid "Gradians"
+msgstr "ÐÑÐÐÐÑÐÐÐ"
 
-#. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:115
-msgid "Boolean AND is only defined for positive integers"
-msgstr "ÐÐÐÐÑÐÐ Ð ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
+#. Preferences dialog: Label for word size combo box
+#: ../src/math-preferences.vala:157
+msgid "Word _size:"
+msgstr "ÐÑÐÐÐÐ _ÑÐÑÐ:"
 
-#. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:128
-msgid "Boolean OR is only defined for positive integers"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
+#. Word size combo: 8 bits
+#: ../src/math-preferences.vala:171
+msgid "8 bits"
+msgstr "8 ÐÐÑÐ"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:141
-msgid "Boolean XOR is only defined for positive integers"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
+#. Word size combo: 16 bits
+#: ../src/math-preferences.vala:173
+msgid "16 bits"
+msgstr "16 ÐÐÑÐ"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:156
-msgid "Boolean NOT is only defined for positive integers"
-msgstr "ÐÐÐÐÑÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
+#. Word size combo: 32 bits
+#: ../src/math-preferences.vala:175
+msgid "32 bits"
+msgstr "32 ÐÐÑÐ"
 
-#. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:187
-msgid "Shift is only possible on integer values"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÐÐÐÑÑÐ"
+#. Word size combo: 64 bits
+#: ../src/math-preferences.vala:177
+msgid "64 bits"
+msgstr "64 ÐÐÑÐ"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:148
+#: ../src/number.vala:652
 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:644 ../src/mp.c:676 ../src/mp.c:1605
-msgid "Division by zero is undefined"
-msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ"
+#. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
+#: ../src/number.vala:909 ../src/number.vala:1858
+msgid "The power of zero is undefined for a negative exponent"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1276 ../src/mp.c:1313
+#: ../src/number.vala:992 ../src/number.vala:1025
 msgid "Logarithm of zero is undefined"
 msgstr "ÐÐÐÐÑÐÑÐÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ"
 
-#. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1680 ../src/mp.c:1994
-msgid "The power of zero is undefined for a negative exponent"
-msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
-
-#: ../src/mp.c:1704
-msgid "Reciprocal of zero is undefined"
-msgstr "ÐÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÑÑ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ"
-
-#: ../src/mp.c:1789
-msgid "Root must be non-zero"
-msgstr "ÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÐ ÐÑÐÐ"
-
-#: ../src/mp.c:1807
-msgid "Negative root of zero is undefined"
-msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ"
-
-#: ../src/mp.c:1813
-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:1934
+#: ../src/number.vala:1043
 msgid "Factorial is only defined for natural numbers"
 msgstr "ÐÐÐÑÐÑÐÑÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÑÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐ"
 
+#. Translators: Error displayed attempted to divide by zero
+#: ../src/number.vala:1119 ../src/number.vala:2608
+msgid "Division by zero is undefined"
+msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ"
+
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1954
+#: ../src/number.vala:1159
 msgid "Modulus division is only defined for integers"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÐÑ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../src/mp-trigonometric.c:310
+#: ../src/number.vala:1227
 msgid ""
 "Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
 msgstr ""
@@ -1496,753 +1365,282 @@ msgstr ""
 "Ïâ2 (90Â)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:355
+#: ../src/number.vala:1265
 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:372
+#: ../src/number.vala:1280
 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
+#: ../src/number.vala:1477
 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
+#: ../src/number.vala:1496
 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 ÑÑÐÐÐÐÐ"
+#. Translators: Error displayed when boolean AND attempted on non-integer values
+#: ../src/number.vala:1515
+msgid "Boolean AND is only defined for positive integers"
+msgstr "ÐÐÐÐÑÐÐ Ð ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:54
-msgctxt "unit-symbols"
-msgid "degree,degrees,deg"
-msgstr "ÑÑÐÐÐÐ,ÑÑÐÐÐÐÐ,ÑÑÐÐÐÐÐ,ÑÑ"
+#. Translators: Error displayed when boolean OR attempted on non-integer values
+#: ../src/number.vala:1527
+msgid "Boolean OR is only defined for positive integers"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:55
-#, c-format
-msgctxt "unit-format"
-msgid "%s radians"
-msgstr "%s ÑÐÐÐÑÐÐÐ"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: ../src/number.vala:1539
+msgid "Boolean XOR is only defined for positive integers"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:55
-msgctxt "unit-symbols"
-msgid "radian,radians,rad"
-msgstr "ÑÐÐÐÑÐÐ,ÑÐÐÐÑÐÐÐ,rad"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: ../src/number.vala:1551
+msgid "Boolean NOT is only defined for positive integers"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:56
-#, c-format
-msgctxt "unit-format"
-msgid "%s gradians"
-msgstr "%s ÐÑÐÐÐÑÐÐÐ"
+#. Translators: Error displayed when bit shift attempted on non-integer values
+#: ../src/number.vala:1574
+msgid "Shift is only possible on integer values"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐÐÐÐÑÑÐ"
 
-#: ../src/unit-manager.c:56
-msgctxt "unit-symbols"
-msgid "gradian,gradians,grad"
-msgstr "ÐÑÐÐÐÑÐÐ,ÐÑÐÐÐÑÐÐÐ,grad"
+#: ../src/number.vala:1878
+msgid "Root must be non-zero"
+msgstr "ÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÐ ÐÑÐÐ"
 
-#: ../src/unit-manager.c:57
-msgid "Parsecs"
-msgstr "ÐÐÑÑÐÑÐ"
+#: ../src/number.vala:1895
+msgid "Negative root of zero is undefined"
+msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../src/unit-manager.c:57
-#, c-format
-msgctxt "unit-format"
-msgid "%s pc"
-msgstr "%s pc"
+#: ../src/number.vala:1902
+msgid "nth root of negative number is undefined for even n"
+msgstr "n-ÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ n"
 
-#: ../src/unit-manager.c:57
-msgctxt "unit-symbols"
-msgid "parsec,parsecs,pc"
-msgstr "ÐÐÑÑÐÐ,ÐÐÑÑÐÐÐ,pc"
+#: ../src/number.vala:2225
+msgid "Overflow: the result couldn't be calculated"
+msgstr "ÐÑÐÐÐÑÐÑÐÑÐ: ÑÐÐÑÐÑÐÑ ÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÑÐ"
 
-#: ../src/unit-manager.c:58
-msgid "Light Years"
-msgstr "ÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
+#: ../src/number.vala:2553
+msgid "Reciprocal of zero is undefined"
+msgstr "ÐÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÑÑ ÐÑÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:58
-#, c-format
-msgctxt "unit-format"
-msgid "%s ly"
-msgstr "%s ly"
+#: ../src/unit.vala:29
+msgid "Angle"
+msgstr "ÐÐÐÐ"
 
-#: ../src/unit-manager.c:58
-msgctxt "unit-symbols"
-msgid "lightyear,lightyears,ly"
-msgstr "ÑÐÐÑÐÐÑÐÐÐÐÐÐÐÐ,ÑÐÐÑÐÐÑÐÐÐÐÐÐÐÐ,ÑÐÐÑÐÐÑÐÐÑÐÐÐÐÐÐ,ly"
+#: ../src/unit.vala:30
+msgid "Length"
+msgstr "ÐÑÐÐÐÐ"
 
-#: ../src/unit-manager.c:59
-msgid "Astronomical Units"
-msgstr "ÐÑÑÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÑÐ"
+#: ../src/unit.vala:31
+msgid "Area"
+msgstr "ÐÐÐÑÑÐÐÐ"
 
-#: ../src/unit-manager.c:59
-#, c-format
-msgctxt "unit-format"
-msgid "%s au"
-msgstr "%s au"
+#: ../src/unit.vala:32
+msgid "Volume"
+msgstr "ÐÐÐÑÐÐÐÐÐ"
 
-#: ../src/unit-manager.c:59
-msgctxt "unit-symbols"
-msgid "au"
-msgstr "au"
+#: ../src/unit.vala:33
+msgid "Weight"
+msgstr "ÐÐÐÐÐÐ"
 
-#: ../src/unit-manager.c:60
-msgid "Nautical Miles"
-msgstr "ÐÐÑÑÐÑÐÐ ÐÐÑÐ"
+#: ../src/unit.vala:34
+msgid "Duration"
+msgstr "ÐÑÐÐÐ"
 
-#: ../src/unit-manager.c:60
-#, c-format
-msgctxt "unit-format"
-msgid "%s nmi"
-msgstr "%s nmi"
+#: ../src/unit.vala:35
+msgid "Temperature"
+msgstr "ÐÐÐÐÐÑÐÑÑÑÐ"
 
-#: ../src/unit-manager.c:60
-msgctxt "unit-symbols"
-msgid "nmi"
-msgstr "nmi"
+#: ../src/unit.vala:41
+msgid "Parsecs"
+msgstr "ÐÐÑÑÐÑÐ"
 
-#: ../src/unit-manager.c:61
-msgid "Miles"
-msgstr "ÐÐÑÐ"
+#: ../src/unit.vala:42
+msgid "Light Years"
+msgstr "ÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../src/unit-manager.c:61
-#, c-format
-msgctxt "unit-format"
-msgid "%s mi"
-msgstr "%s mi"
+#: ../src/unit.vala:43
+msgid "Astronomical Units"
+msgstr "ÐÑÑÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../src/unit-manager.c:61
-msgctxt "unit-symbols"
-msgid "mile,miles,mi"
-msgstr "ÐÐÑÐ,ÐÐÑÐ,ÐÐÑÐ,mi"
+#: ../src/unit.vala:44
+msgid "Nautical Miles"
+msgstr "ÐÐÑÑÐÑÐÐ ÐÐÑÐ"
+
+#: ../src/unit.vala:45
+msgid "Miles"
+msgstr "ÐÐÑÐ"
 
-#: ../src/unit-manager.c:62
+#: ../src/unit.vala:46
 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
+#: ../src/unit.vala:47
 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
+#: ../src/unit.vala:48
 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
+#: ../src/unit.vala:49
 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
+#: ../src/unit.vala:50
 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
+#: ../src/unit.vala:51
 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
+#: ../src/unit.vala:52
 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
+#: ../src/unit.vala:53
 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
+#: ../src/unit.vala:54
 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
+#: ../src/unit.vala:55
 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
+#: ../src/unit.vala:56
 msgid "Nanometers"
 msgstr "ÐÐÐÐÐÐÑÑÐ"
 
-#: ../src/unit-manager.c:72
-#, c-format
-msgctxt "unit-format"
-msgid "%s nm"
-msgstr "%s nm"
-
-#: ../src/unit-manager.c:72
-msgctxt "unit-symbols"
-msgid "nanometer,nanometers,nm"
-msgstr "ÐÐÐÐÐÐÑÐÑ,ÐÐÐÐÐÐÑÑÐ,ÐÐÐÐÐÐÑÐÑÐ,ÐÐ,nm"
-
-#: ../src/unit-manager.c:73
+#: ../src/unit.vala:57
 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
+#: ../src/unit.vala:58
 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
+#: ../src/unit.vala:59
 msgid "Square Meters"
 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
+#: ../src/unit.vala:60
 msgid "Square Centimeters"
 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
+#: ../src/unit.vala:61
 msgid "Square Millimeters"
 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
+#: ../src/unit.vala:62
 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
+#: ../src/unit.vala:63
 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
+#: ../src/unit.vala:64
 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
+#: ../src/unit.vala:65
 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
+#: ../src/unit.vala:66
 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
+#: ../src/unit.vala:67
 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
+#: ../src/unit.vala:68
 msgid "Microlitres"
 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
+#: ../src/unit.vala:69
 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
+#: ../src/unit.vala:70
 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
+#: ../src/unit.vala:71
 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
+#: ../src/unit.vala:72
 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 "ÑÐÑÐ,unce,ÑÐÑÐ,ÐÐ,oz"
-
-#: ../src/unit-manager.c:89
+#: ../src/unit.vala:73
 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
+#: ../src/unit.vala:74
 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
+#: ../src/unit.vala:75
 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
+#: ../src/unit.vala:76
 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
+#: ../src/unit.vala:77
 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
+#: ../src/unit.vala:78
 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
+#: ../src/unit.vala:79
 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
+#: ../src/unit.vala:80
 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,Îs"
-msgstr "ÐÐÐÑÐÑÐÐÑÐÐa,ÐÐÐÑÐÑÐÐÑÐÐÐ,ÐÐÐÑÐÑÐÐÑÐÐÐ,Îs"
-
-#: ../src/unit-manager.c:97
+#: ../src/unit.vala:81
 msgid "Celsius"
 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 "ÑÑÐÐÐ,ËC"
-
-#: ../src/unit-manager.c:98
+#: ../src/unit.vala:82
 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 "ÑÑÐÐÐ,ËF"
-
-#: ../src/unit-manager.c:99
+#: ../src/unit.vala:83
 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 "K"
-msgstr "K"
-
-#: ../src/unit-manager.c:100
+#: ../src/unit.vala:84
 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,ËRa"
-msgstr "ÑÑÐÐÐ,ËR,ËRa"
-
-#: ../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
+#: ../src/unit.vala:86
 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
+#: ../src/unit.vala:92
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"
diff --git a/po/sr latin po b/po/sr latin po
index 5858b0c..ceb9ae5 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -7,22 +7,22 @@
 # 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.
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gcalctool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-12 10:42+0000\n"
-"PO-Revision-Date: 2012-07-22 15:33+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=http:/";
+"/bugzilla.gnome.org/&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-01-09 09:15+0000\n"
+"PO-Revision-Date: 2013-01-18 12:06+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #. Accessible name for the inverse button
@@ -65,7 +65,7 @@ msgstr "NauÄni eksponent"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:72
-#: ../src/math-buttons.c:222
+#: ../src/math-buttons.vala:384
 msgid "Memory"
 msgstr "Memorija"
 
@@ -93,7 +93,7 @@ msgstr "Snimi"
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.c:246
+#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:400
 msgid "Compounding Term"
 msgstr "Äinilac sastava"
 
@@ -158,7 +158,7 @@ msgstr "_Period:"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.c:252
+#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:404
 msgid "Future Value"
 msgstr "BuduÄa vrednost"
 
@@ -184,7 +184,7 @@ msgstr "_Broj perioda:"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.c:273
+#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:418
 msgid "Gross Profit Margin"
 msgstr "Bruto marÅa"
 
@@ -204,7 +204,7 @@ msgstr "_MarÅa:"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.c:270
+#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:416
 msgid "Periodic Payment"
 msgstr "PeriodiÄno plaÄanje"
 
@@ -229,7 +229,7 @@ msgstr "_Rok:"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.c:267
+#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:414
 msgid "Present Value"
 msgstr "Trenutna vrednost"
 
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.c:264
+#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:412
 msgid "Periodic Interest Rate"
 msgstr "PeriodiÄna kamatna stopa"
 
@@ -377,13 +377,13 @@ msgstr "BM"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:240
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:396
 msgid "Shift Left"
 msgstr "Pomeri ulevo"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.c:243
+#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:398
 msgid "Shift Right"
 msgstr "Pomeri udesno"
 
@@ -394,7 +394,7 @@ msgstr "Ubaci Znak"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:225
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:386
 msgid "Insert Character Code"
 msgstr "Ubaci kod znaka"
 
@@ -408,103 +408,59 @@ msgstr "_Znak:"
 msgid "_Insert"
 msgstr "_Umetni"
 
-#. Word size combo: 8 bits
-#: ../data/preferences.ui.h:2
-msgid "8-bit"
-msgstr "8 bita"
-
-#. Word size combo: 16 bits
-#: ../data/preferences.ui.h:4
-msgid "16-bit"
-msgstr "16 bita"
-
-#. Word size combo: 32 bits
-#: ../data/preferences.ui.h:6
-msgid "32-bit"
-msgstr "32 bita"
-
-#. Word size combo: 64 bits
-#: ../data/preferences.ui.h:8
-msgid "64-bit"
-msgstr "64 bita"
-
-#. Title of preferences dialog
-#: ../data/preferences.ui.h:9 ../src/math-preferences.c:231
-#: ../src/math-window.c:369
-msgid "Preferences"
-msgstr "Postavke"
-
-#. Preferences dialog: Label for angle unit combo box
-#: ../data/preferences.ui.h:11
-msgid "_Angle units:"
-msgstr "Jedinice _uglova:"
-
-#. Preferences dialog: Label for display format combo box
-#: ../data/preferences.ui.h:13
-msgid "Number _Format:"
-msgstr "_Oblik broja:"
-
-#. Preferences dialog: label for word size combo box
-#: ../data/preferences.ui.h:15
-msgid "Word _size:"
-msgstr "DuÅina _reÄi:"
-
-#. Preferences dialog: label for show trailing zeroes check button
-#: ../data/preferences.ui.h:17
-msgid "Show trailing _zeroes"
-msgstr "PrikaÅi prateÄe _nule"
-
-#. Preferences dialog: label for show thousands separator check button
-#: ../data/preferences.ui.h:19
-msgid "Show _thousands separators"
-msgstr "PrikaÅi _razdvajaÄ hiljada"
-
+#. Program name in the about dialog
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:493
+#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:265
+#: ../src/math-window.vala:29
 msgid "Calculator"
 msgstr "Kalkulator"
 
-#: ../data/gcalctool.desktop.in.h:2
+#: ../data/gnome-calculator.desktop.in.h:2
 msgid "Perform arithmetic, scientific or financial calculations"
 msgstr "IzvrÅite aritmetiÄke, nauÄne ili finansijske proraÄune"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:1
+#: ../data/gnome-calculator.desktop.in.h:3
+#| msgid "Perform arithmetic, scientific or financial calculations"
+msgid "calculation;arithmetic;scientific;financial;"
+msgstr "raÄunanje;aritmetika;nauka;finansije;proraÄuni;"
+
+#: ../data/org.gnome.calculator.gschema.xml.in.h:1
 msgid "Accuracy value"
 msgstr "Vrednost taÄnosti"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:2
+#: ../data/org.gnome.calculator.gschema.xml.in.h:2
 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:3
+#: ../data/org.gnome.calculator.gschema.xml.in.h:3
 msgid "Word size"
 msgstr "DuÅina reÄi"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:4
+#: ../data/org.gnome.calculator.gschema.xml.in.h:4
 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:5
+#: ../data/org.gnome.calculator.gschema.xml.in.h:5
 msgid "Numeric Base"
 msgstr "Osnova broja"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
+#: ../data/org.gnome.calculator.gschema.xml.in.h:6
 msgid "The numeric base"
 msgstr "Brojna osnova"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
+#: ../data/org.gnome.calculator.gschema.xml.in.h:7
 msgid "Show Thousands Separators"
 msgstr "Prikazivanje razdvajaÄa hiljada"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:8
+#: ../data/org.gnome.calculator.gschema.xml.in.h:8
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "Da li da se razdvajaÄ hiljada prikazuje za velike brojeve."
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:9
+#: ../data/org.gnome.calculator.gschema.xml.in.h:9
 msgid "Show Trailing Zeroes"
 msgstr "Prikazivanje prateÄih nula"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:10
+#: ../data/org.gnome.calculator.gschema.xml.in.h:10
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -512,983 +468,896 @@ msgstr ""
 "Da li da se u prikazanoj vrednosti prikazuju prateÄe nule posle decimalnog "
 "zareza."
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:11
+#: ../data/org.gnome.calculator.gschema.xml.in.h:11
 msgid "Number format"
 msgstr "Oblik broja"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:12
+#: ../data/org.gnome.calculator.gschema.xml.in.h:12
 msgid "The format to display numbers in"
 msgstr "Oblik u kome Äe se prikazivati brojevi"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
+#: ../data/org.gnome.calculator.gschema.xml.in.h:13
 msgid "Angle units"
 msgstr "Jedinice uglova"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
+#: ../data/org.gnome.calculator.gschema.xml.in.h:14
 msgid "The angle units to use"
 msgstr "Jedinice uglova za koriÅÄenje"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
+#: ../data/org.gnome.calculator.gschema.xml.in.h:15
 msgid "Button mode"
 msgstr "ReÅim dugmeta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+#: ../data/org.gnome.calculator.gschema.xml.in.h:16
 msgid "The button mode"
 msgstr "ReÅim dugmeta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#: ../data/org.gnome.calculator.gschema.xml.in.h:17
 msgid "Source currency"
 msgstr "Izvorna valuta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
+#: ../data/org.gnome.calculator.gschema.xml.in.h:18
 msgid "Currency of the current calculation"
 msgstr "Valuta trenutnog proraÄuna"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
+#: ../data/org.gnome.calculator.gschema.xml.in.h:19
 msgid "Target currency"
 msgstr "Ciljna valuta"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
+#: ../data/org.gnome.calculator.gschema.xml.in.h:20
 msgid "Currency to convert the current calculation into"
 msgstr "Valuta u koju treba pretvoriti proraÄun"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:21
+#: ../data/org.gnome.calculator.gschema.xml.in.h:21
 msgid "Source units"
 msgstr "Izvorna jedinica"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+#: ../data/org.gnome.calculator.gschema.xml.in.h:22
 msgid "Units of the current calculation"
 msgstr "Jedinica trenutnog proraÄuna"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+#: ../data/org.gnome.calculator.gschema.xml.in.h:23
 msgid "Target units"
 msgstr "Ciljna jedinica"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
+#: ../data/org.gnome.calculator.gschema.xml.in.h:24
 msgid "Units to convert the current calculation into"
 msgstr "Jedinica u koju treba pretvoriti proraÄun"
 
-#: ../src/currency-manager.c:30
+#: ../src/currency.vala:28
 msgid "UAE Dirham"
 msgstr "Emiratski dirham"
 
-#: ../src/currency-manager.c:31
+#: ../src/currency.vala:29
 msgid "Australian Dollar"
 msgstr "Australijski dolar"
 
-#: ../src/currency-manager.c:32
+#: ../src/currency.vala:30
 msgid "Bulgarian Lev"
 msgstr "Bugarski lev"
 
-#: ../src/currency-manager.c:33
+#: ../src/currency.vala:31
 msgid "Bahraini Dinar"
 msgstr "Bahreinski dinar"
 
-#: ../src/currency-manager.c:34
+#: ../src/currency.vala:32
 msgid "Brunei Dollar"
 msgstr "Brunejski dolar"
 
-#: ../src/currency-manager.c:35
+#: ../src/currency.vala:33
 msgid "Brazilian Real"
 msgstr "Brazilski real"
 
-#: ../src/currency-manager.c:36
+#: ../src/currency.vala:34
 msgid "Botswana Pula"
 msgstr "Bocvanska pula"
 
-#: ../src/currency-manager.c:37
+#: ../src/currency.vala:35
 msgid "Canadian Dollar"
 msgstr "Kanadski dolar"
 
-#: ../src/currency-manager.c:38
+#: ../src/currency.vala:36
 msgid "CFA Franc"
 msgstr "CFA franak"
 
-#: ../src/currency-manager.c:39
+#: ../src/currency.vala:37
 msgid "Swiss Franc"
 msgstr "Åvajcarski franak"
 
-#: ../src/currency-manager.c:40
+#: ../src/currency.vala:38
 msgid "Chilean Peso"
 msgstr "Äileanski pezos"
 
-#: ../src/currency-manager.c:41
+#: ../src/currency.vala:39
 msgid "Chinese Yuan"
 msgstr "Kineski juan"
 
-#: ../src/currency-manager.c:42
+#: ../src/currency.vala:40
 msgid "Colombian Peso"
 msgstr "Kolumbijski pezos"
 
-#: ../src/currency-manager.c:43
+#: ../src/currency.vala:41
 msgid "Czech Koruna"
 msgstr "ÄeÅka kruna"
 
-#: ../src/currency-manager.c:44
+#: ../src/currency.vala:42
 msgid "Danish Krone"
 msgstr "Danska kruna"
 
-#: ../src/currency-manager.c:45
+#: ../src/currency.vala:43
 msgid "Algerian Dinar"
 msgstr "AlÅirski dinar"
 
-#: ../src/currency-manager.c:46
+#: ../src/currency.vala:44
 msgid "Estonian Kroon"
 msgstr "Estonska kruna"
 
-#: ../src/currency-manager.c:47
+#: ../src/currency.vala:45
 msgid "Euro"
 msgstr "Evro"
 
-#: ../src/currency-manager.c:48
+#: ../src/currency.vala:46
 msgid "Pound Sterling"
 msgstr "Funta sterling"
 
-#: ../src/currency-manager.c:49
+#: ../src/currency.vala:47
 msgid "Hong Kong Dollar"
 msgstr "HongkonÅki dolar"
 
-#: ../src/currency-manager.c:50
+#: ../src/currency.vala:48
 msgid "Croatian Kuna"
 msgstr "Hrvatska kuna"
 
-#: ../src/currency-manager.c:51
+#: ../src/currency.vala:49
 msgid "Hungarian Forint"
 msgstr "MaÄarska forinta"
 
-#: ../src/currency-manager.c:52
+#: ../src/currency.vala:50
 msgid "Indonesian Rupiah"
 msgstr "IndoneÅanska rupija"
 
-#: ../src/currency-manager.c:53
+#: ../src/currency.vala:51
 msgid "Israeli New Shekel"
 msgstr "Izraelski novi Åekel"
 
-#: ../src/currency-manager.c:54
+#: ../src/currency.vala:52
 msgid "Indian Rupee"
 msgstr "Indijska rupija"
 
-#: ../src/currency-manager.c:55
+#: ../src/currency.vala:53
 msgid "Iranian Rial"
 msgstr "Iranski rijal"
 
-#: ../src/currency-manager.c:56
+#: ../src/currency.vala:54
 msgid "Icelandic Krona"
 msgstr "Islandska kruna"
 
-#: ../src/currency-manager.c:57
+#: ../src/currency.vala:55
 msgid "Japanese Yen"
 msgstr "Japanski jen"
 
-#: ../src/currency-manager.c:58
+#: ../src/currency.vala:56
 msgid "South Korean Won"
 msgstr "JuÅnokorejski von"
 
-#: ../src/currency-manager.c:59
+#: ../src/currency.vala:57
 msgid "Kuwaiti Dinar"
 msgstr "Kuvajtski dinar"
 
-#: ../src/currency-manager.c:60
+#: ../src/currency.vala:58
 msgid "Kazakhstani Tenge"
 msgstr "Kazahstanski tenge"
 
-#: ../src/currency-manager.c:61
+#: ../src/currency.vala:59
 msgid "Sri Lankan Rupee"
 msgstr "Årilankanska rupija"
 
-#: ../src/currency-manager.c:62
+#: ../src/currency.vala:60
 msgid "Lithuanian Litas"
 msgstr "Litvanski litas"
 
-#: ../src/currency-manager.c:63
+#: ../src/currency.vala:61
 msgid "Latvian Lats"
 msgstr "Letonski lats"
 
-#: ../src/currency-manager.c:64
+#: ../src/currency.vala:62
 msgid "Libyan Dinar"
 msgstr "Libijski dinar"
 
-#: ../src/currency-manager.c:65
+#: ../src/currency.vala:63
 msgid "Mauritian Rupee"
 msgstr "Mauricijska rupija"
 
-#: ../src/currency-manager.c:66
+#: ../src/currency.vala:64
 msgid "Mexican Peso"
 msgstr "MeksiÄki pezos"
 
-#: ../src/currency-manager.c:67
+#: ../src/currency.vala:65
 msgid "Malaysian Ringgit"
 msgstr "Malezijski ringit"
 
-#: ../src/currency-manager.c:68
+#: ../src/currency.vala:66
 msgid "Norwegian Krone"
 msgstr "NorveÅka kruna"
 
-#: ../src/currency-manager.c:69
+#: ../src/currency.vala:67
 msgid "Nepalese Rupee"
 msgstr "Nepalska rupija"
 
-#: ../src/currency-manager.c:70
+#: ../src/currency.vala:68
 msgid "New Zealand Dollar"
 msgstr "Novozelandski dolar"
 
-#: ../src/currency-manager.c:71
+#: ../src/currency.vala:69
 msgid "Omani Rial"
 msgstr "Omanski rijal"
 
-#: ../src/currency-manager.c:72
+#: ../src/currency.vala:70
 msgid "Peruvian Nuevo Sol"
 msgstr "Peruanski novi sol"
 
-#: ../src/currency-manager.c:73
+#: ../src/currency.vala:71
 msgid "Philippine Peso"
 msgstr "Filipinski pezos"
 
-#: ../src/currency-manager.c:74
+#: ../src/currency.vala:72
 msgid "Pakistani Rupee"
 msgstr "Pakistanska rupija"
 
-#: ../src/currency-manager.c:75
+#: ../src/currency.vala:73
 msgid "Polish Zloty"
 msgstr "Poljski zlot"
 
-#: ../src/currency-manager.c:76
+#: ../src/currency.vala:74
 msgid "Qatari Riyal"
 msgstr "Katarski rijal"
 
-#: ../src/currency-manager.c:77
+#: ../src/currency.vala:75
 msgid "New Romanian Leu"
 msgstr "Novi rumunski lej"
 
-#: ../src/currency-manager.c:78
+#: ../src/currency.vala:76
 msgid "Russian Rouble"
 msgstr "Ruska rublja"
 
-#: ../src/currency-manager.c:79
+#: ../src/currency.vala:77
 msgid "Saudi Riyal"
 msgstr "Saudijski rijal"
 
-#: ../src/currency-manager.c:80
+#: ../src/currency.vala:78
 msgid "Swedish Krona"
 msgstr "Åvedska kruna"
 
-#: ../src/currency-manager.c:81
+#: ../src/currency.vala:79
 msgid "Singapore Dollar"
 msgstr "Singapurski dolar"
 
-#: ../src/currency-manager.c:82
+#: ../src/currency.vala:80
 msgid "Thai Baht"
 msgstr "Tajlandski bat"
 
-#: ../src/currency-manager.c:83
+#: ../src/currency.vala:81
 msgid "Tunisian Dinar"
 msgstr "TuniÅanski dinar"
 
-#: ../src/currency-manager.c:84
+#: ../src/currency.vala:82
 msgid "New Turkish Lira"
 msgstr "Nova turska lira"
 
-#: ../src/currency-manager.c:85
+#: ../src/currency.vala:83
 msgid "T&T Dollar (TTD)"
 msgstr "T&T dolar (TTD)"
 
-#: ../src/currency-manager.c:86
+#: ../src/currency.vala:84
 msgid "US Dollar"
 msgstr "AmeriÄki dolar"
 
-#: ../src/currency-manager.c:87
+#: ../src/currency.vala:85
 msgid "Uruguayan Peso"
 msgstr "Urugvajski pezos"
 
-#: ../src/currency-manager.c:88
+#: ../src/currency.vala:86
 msgid "Venezuelan BolÃvar"
 msgstr "Venecuelanski bolivar"
 
-#: ../src/currency-manager.c:89
+#: ../src/currency.vala:87
 msgid "South African Rand"
 msgstr "JuÅnoafriÄki rand"
 
-#: ../src/financial.c:70
+#: ../src/financial.vala:114
 msgid "Error: the number of periods must be positive"
 msgstr "GreÅka: broj perioda mora biti pozitivan"
 
-#. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:77
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s â Perform mathematical calculations"
-msgstr ""
-"KoriÅÄenje:\n"
-"  %s â Obavite matematiÄka izraÄunavanja"
+#: ../src/gnome-calculator.vala:80
+msgid "Basic"
+msgstr "Osnovni"
 
-#. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:85
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -v, --version                   Show release version\n"
-"  -h, -?, --help                  Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opcije pomoÄi:\n"
-"  -v, --version                   Ispisuje izdanje programa\n"
-"  -h, -?, --help                  Prikazuje opcije pomoÄi\n"
-"  --help-all                      Prikazuje sve opcije pomoÄi\n"
-"  --help-gtk                      Prikazuje Gtk+ opcije"
-
-#. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:96
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Gtk+ opcije:\n"
-"  --class=RAZRED                  Razred programa kako ga koristi upravljaÄ "
-"prozora\n"
-"  --name=NAZIV                    Naziv programa kako ga koristi upravljaÄ "
-"prozora\n"
-"  --screen=EKRAN                  Iks ekran za koriÅÄenje\n"
-"  --sync                          Äini pozive Iksa usklaÄenim\n"
-"  --gtk-module=MODULI             UÄitava dopunske Gtk+ module\n"
-"  --g-fatal-warnings              Äini sva upozorenja kobnim"
-
-#. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:110
-#, c-format
-msgid ""
-"Application Options:\n"
-"  -s, --solve <equation>          Solve the given equation"
+#: ../src/gnome-calculator.vala:81
+msgid "Advanced"
+msgstr "Napredni"
+
+#: ../src/gnome-calculator.vala:82
+msgid "Financial"
+msgstr "Finansijski"
+
+#: ../src/gnome-calculator.vala:83
+msgid "Programming"
+msgstr "Programerski"
+
+#: ../src/gnome-calculator.vala:84
+msgid "Mode"
+msgstr "ReÅim"
+
+#. Title of preferences dialog
+#: ../src/gnome-calculator.vala:87 ../src/math-preferences.vala:26
+msgid "Preferences"
+msgstr "Postavke"
+
+#: ../src/gnome-calculator.vala:91
+msgid "About Calculator"
+msgstr "O Kalkulatoru"
+
+#: ../src/gnome-calculator.vala:92
+msgid "Help"
+msgstr "PomoÄ"
+
+#: ../src/gnome-calculator.vala:93
+msgid "Quit"
+msgstr "IzaÄi"
+
+#. Translators: Error message displayed when unable to launch help browser
+#: ../src/gnome-calculator.vala:228
+msgid "Unable to open help file"
+msgstr "Ne mogu da otvorim datoteku pomoÄi"
+
+#. The translator credits. Please translate this with your name (s).
+#: ../src/gnome-calculator.vala:258
+msgid "translator-credits"
 msgstr ""
-"Opcije programa:\n"
-"  -s, --solve <equation>          ReÅava zadatu jednaÄinu"
+"Danilo Åegan <danilo prevod org>\n"
+"Igor NestoroviÄ <igor prevod org>\n"
+"Slobodan D. SredojeviÄ <slobo akrep be>\n"
+"Branko KokanoviÄ <branko kokanovic gmail com>\n"
+"Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
+"\n"
+"http://prevod.org â prevod na srpski jezik"
 
-#. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:154
-#, c-format
-msgid "Argument --solve requires an equation to solve"
-msgstr "Argument â--solveâ zahteva jednaÄinu za reÅavanje"
+#. Short description in the about dialog
+#: ../src/gnome-calculator.vala:272
+msgid "Calculator with financial and scientific modes."
+msgstr "Kalkulator sa finansijskim i nauÄnim naÄinom rada."
 
-#. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:164
-#, c-format
-msgid "Unknown argument '%s'"
-msgstr "Nepoznat argument â%sâ"
+#: ../src/gnome-calculator.vala:305
+msgid "Solve given equation"
+msgstr "ReÅava datu jednaÄinu"
 
+#: ../src/gnome-calculator.vala:313
+msgid "Start with given equation"
+msgstr "PoÄinje sa datom jednaÄinom"
+
+#: ../src/gnome-calculator.vala:322
+msgid "Show release version"
+msgstr "Prikazuje izdanje programa"
+
+#. Configure buttons
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:94
+#: ../src/math-buttons.vala:298
 msgid "Pi [Ctrl+P]"
 msgstr "Pi [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:97
+#: ../src/math-buttons.vala:300
 msgid "Eulerâs Number"
 msgstr "Ojlerov broj"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:102
+#: ../src/math-buttons.vala:304
 msgid "Subscript mode [Alt]"
 msgstr "ReÅim indeksa [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:105
+#: ../src/math-buttons.vala:306
 msgid "Superscript mode [Ctrl]"
 msgstr "ReÅim eksponenta [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:108
+#: ../src/math-buttons.vala:308
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "NauÄni eksponent [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:111
+#: ../src/math-buttons.vala:310
 msgid "Add [+]"
 msgstr "Saberite [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.vala:312
 msgid "Subtract [-]"
 msgstr "Oduzmite [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.vala:314
 msgid "Multiply [*]"
 msgstr "PomnoÅite [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.vala:316
 msgid "Divide [/]"
 msgstr "Podelite [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.vala:318
 msgid "Modulus divide"
 msgstr "Deljenje po modulu"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.vala:320
 msgid "Additional Functions"
 msgstr "Dodatne funkcije"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.vala:322
 msgid "Exponent [^ or **]"
 msgstr "Eksponent [^ ili **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.vala:324
 msgid "Square [Ctrl+2]"
 msgstr "Kvadrat [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.vala:326
 msgid "Percentage [%]"
 msgstr "Procenat [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.vala:328
 msgid "Factorial [!]"
 msgstr "Faktorijel [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.vala:330
 msgid "Absolute value [|]"
 msgstr "Apsolutna vrednost [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.vala:332
 msgid "Complex argument"
 msgstr "Kompleksni argument"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.vala:334
 msgid "Complex conjugate"
 msgstr "Konjugovano kompleksna vrednost"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.vala:336
 msgid "Root [Ctrl+R]"
 msgstr "Koren [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.vala:338
 msgid "Square root [Ctrl+R]"
 msgstr "Kvadratni koren [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.vala:340
 msgid "Logarithm"
 msgstr "Logaritam"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.vala:342
 msgid "Natural Logarithm"
 msgstr "Prirodni logaritam"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.vala:344
 msgid "Sine"
 msgstr "Sinus"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.vala:346
 msgid "Cosine"
 msgstr "Kosinus"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.vala:348
 msgid "Tangent"
 msgstr "Tangens"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.vala:350
 msgid "Hyperbolic Sine"
 msgstr "HiperboliÄni sinus"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.vala:352
 msgid "Hyperbolic Cosine"
 msgstr "HiperboliÄni kosinus"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.vala:354
 msgid "Hyperbolic Tangent"
 msgstr "HiperboliÄni tangens"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.vala:356
 msgid "Inverse [Ctrl+I]"
 msgstr "ReciproÄnost [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.vala:358
 msgid "Boolean AND"
 msgstr "LogiÄko I"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.vala:360
 msgid "Boolean OR"
 msgstr "LogiÄko ILI"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.vala:362
 msgid "Boolean Exclusive OR"
 msgstr "LogiÄko ILLI"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.vala:364
 msgid "Boolean NOT"
 msgstr "LogiÄko NE"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:195 ../src/math-buttons.c:983
+#: ../src/math-buttons.vala:366 ../src/math-buttons.vala:809
 msgid "Integer Component"
 msgstr "Celobrojni deo"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:198 ../src/math-buttons.c:985
+#: ../src/math-buttons.vala:368 ../src/math-buttons.vala:811
 msgid "Fractional Component"
 msgstr "Razlomljeni deo"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.vala:370
 msgid "Real Component"
 msgstr "Realni deo"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:204
+#: ../src/math-buttons.vala:372
 msgid "Imaginary Component"
 msgstr "Imaginarni deo"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:207
+#: ../src/math-buttons.vala:374
 msgid "Ones' Complement"
 msgstr "Komplement jedinice"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:210
+#: ../src/math-buttons.vala:376
 msgid "Two's Complement"
 msgstr "Komplement dvojke"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.vala:378
 msgid "Truncate"
 msgstr "Odsecite"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.vala:380
 msgid "Start Group [(]"
 msgstr "Otvorite zagradu [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:219
+#: ../src/math-buttons.vala:382
 msgid "End Group [)]"
 msgstr "Zatvorite zagradu [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.vala:388
 msgid "Calculate Result"
 msgstr "IzraÄunajte rezultat"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.vala:390
 msgid "Factorize [Ctrl+F]"
 msgstr "FaktoriÅite [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:234
+#: ../src/math-buttons.vala:392
 msgid "Clear Display [Escape]"
 msgstr "OÄistite ekran [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:237
+#: ../src/math-buttons.vala:394
 msgid "Undo [Ctrl+Z]"
 msgstr "Opozovite prethodnu radnju [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:249
+#: ../src/math-buttons.vala:402
 msgid "Double Declining Depreciation"
 msgstr "Umanjenje dvostrukim opadanjem"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:255
+#: ../src/math-buttons.vala:406
 msgid "Financial Term"
 msgstr "Finansijski izraz"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:258
+#: ../src/math-buttons.vala:408
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Umanjenje zbirom cifara godine"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:261
+#: ../src/math-buttons.vala:410
 msgid "Straight Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
 #. Number display mode combo: Binary, e.g. 10011010010â
-#: ../src/math-buttons.c:601
+#: ../src/math-buttons.vala:523
 msgid "Binary"
 msgstr "Binarno"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:605
+#: ../src/math-buttons.vala:527
 msgid "Octal"
 msgstr "Oktalno"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:609
+#: ../src/math-buttons.vala:531
 msgid "Decimal"
 msgstr "Decimalno"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:613
+#: ../src/math-buttons.vala:535
 msgid "Hexadecimal"
 msgstr "Heksadecimalno"
 
 #. 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:894 ../src/math-buttons.c:937
+#: ../src/math-buttons.vala:740 ../src/math-buttons.vala:777
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
 msgstr[0] "_%d mesto"
 msgstr[1] "_%d mesta"
 msgstr[2] "_%d mesta"
+msgstr[3] "_%d mesto"
 
 #. 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:898 ../src/math-buttons.c:941
+#: ../src/math-buttons.vala:745 ../src/math-buttons.vala:782
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
 msgstr[0] "%d mesto"
 msgstr[1] "%d mesta"
 msgstr[2] "%d mesta"
+msgstr[3] "%d mesto"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:987
+#: ../src/math-buttons.vala:813
 msgid "Round"
 msgstr "ZaokruÅi"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:989
+#: ../src/math-buttons.vala:815
 msgid "Floor"
 msgstr "ZaokruÅi na dole"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:991
+#: ../src/math-buttons.vala:817
 msgid "Ceiling"
 msgstr "ZaokruÅi na gore"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:993
+#: ../src/math-buttons.vala:819
 msgid "Sign"
 msgstr "Znak"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:412
+#: ../src/math-converter.vala:46
 msgid " in "
 msgstr " u "
 
 #. Tooltip for swap conversion button
-#: ../src/math-converter.c:427
+#: ../src/math-converter.vala:60
 msgid "Switch conversion units"
 msgstr "Promenite jedinice pretvaranja"
 
+#. Digits localized for the given language
+#: ../src/math-equation.vala:171
+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"
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:459
+#: ../src/math-equation.vala:487
 msgid "No undo history"
 msgstr "Nema radnji opozivanja"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:486
+#: ../src/math-equation.vala:503
 msgid "No redo history"
 msgstr "Nema radnji ponavljanja"
 
-#: ../src/math-equation.c:944
+#: ../src/math-equation.vala:732
 msgid "No sane value to store"
 msgstr "Nema razumne vrednosti za Äuvanje"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1226
+#: ../src/math-equation.vala:888
 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:1231
+#: ../src/math-equation.vala:893
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "Nepoznata promenljiva â%sâ"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1236
+#: ../src/math-equation.vala:900
 #, 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:1241
+#: ../src/math-equation.vala:907
 msgid "Unknown conversion"
 msgstr "Nepoznato pretvaranje"
 
+#: ../src/math-equation.vala:915
+#, c-format
+#| msgid "Malformed expression"
+msgid "Malformed expression at token '%s'"
+msgstr "LoÅ izraz pri â%sâ"
+
+#. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1250
+#: ../src/math-equation.vala:920 ../src/math-equation.vala:925
 msgid "Malformed expression"
 msgstr "Neispravan izraz"
 
-#: ../src/math-equation.c:1264
+#: ../src/math-equation.vala:936
 msgid "Calculating"
 msgstr "IzraÄunavam"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1380
+#: ../src/math-equation.vala:1063
 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:1452
+#. 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.vala:1117
 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:1483
+#: ../src/math-equation.vala:1131
 msgid "Displayed value not an integer"
 msgstr "Prikazana vrednost nije ceo broj"
 
-#. Digits localized for the given language
-#: ../src/math-equation.c:1908
-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:235
+#: ../src/math-preferences.vala:29
 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:245 ../src/unit-manager.c:54
-msgid "Degrees"
-msgstr "Stepeni"
-
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:249 ../src/unit-manager.c:55
-msgid "Radians"
-msgstr "Radijani"
-
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:253 ../src/unit-manager.c:56
-msgid "Gradians"
-msgstr "Gradijani"
+#. Preferences dialog: Label for number format combo box
+#: ../src/math-preferences.vala:39
+msgid "Number _Format:"
+msgstr "_Oblik broja:"
 
 #. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234Ã10^99)
-#: ../src/math-preferences.c:263
+#: ../src/math-preferences.vala:56
 msgid "Automatic"
 msgstr "Automatski"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:267
+#: ../src/math-preferences.vala:60
 msgid "Fixed"
 msgstr "Fiksni"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã10^3
-#: ../src/math-preferences.c:271
+#: ../src/math-preferences.vala:64
 msgid "Scientific"
 msgstr "NauÄni"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:275
+#: ../src/math-preferences.vala:68
 msgid "Engineering"
 msgstr "InÅenjerski"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:286
+#: ../src/math-preferences.vala:88
 #, 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:171
-msgid "Unable to open help file"
-msgstr "Ne mogu da otvorim datoteku pomoÄi"
-
-#. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:204
-msgid "translator-credits"
-msgstr ""
-"Danilo Åegan <danilo prevod org>\n"
-"Igor NestoroviÄ <igor prevod org>\n"
-"Slobodan D. SredojeviÄ <slobo akrep be>\n"
-"Branko KokanoviÄ <branko kokanovic gmail com>\n"
-"\n"
-"Prevod.org â prevod na srpski jezik"
-
-#. The license this software is under (GPL2+)
-#: ../src/math-window.c:207
-msgid ""
-"Gcalctool is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"Gcalctool is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with Gcalctool; if not, write to the Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
-msgstr ""
-"Kalkulator je slobodan softver; moÅete ga raspodeljivati i/ili\n"
-"menjati pod uslovima GNU OpÅte javne licence kako je objavljuje\n"
-"ZaduÅbina slobodnog softvera; bilo verzije 2 te Licence, ili\n"
-"(po vaÅem miÅljenju) bilo koje novije verzije.\n"
-"\n"
-"Kalkulator se raspodeljuje u nadi da Äe biti koristan, ali BEZ\n"
-"IKAKVIH GARANCIJA; Äak i bez podrazumevane garancije KORISNOSTI\n"
-"ili PRILAGOÄENOSTI ODREÄENOJ NAMENI.  Pogledajte Gnuovu opÅtu\n"
-"javnu licencu za viÅe detalja.\n"
-"\n"
-"Trebali ste da primite primerak Gnuove opÅte javne licence uz\n"
-"Kalkulator; ako niste, piÅite ZaduÅbini slobodnog softvera na:\n"
-"âFree Software Foundation, Inc.), 51 Franklin Street, Fifth Floor,\n"
-"Boston, MA 02110-1301 USAâ"
-
-#. Program name in the about dialog
-#: ../src/math-window.c:224
-msgid "Gcalctool"
-msgstr "Gnomov kalkulator"
-
-#. Copyright notice in the about dialog
-#: ../src/math-window.c:228
-msgid "Â 1986â2010 The Gcalctool authors"
-msgstr "Â 1986â2010 Autori Gnomovog kalkulatora"
-
-#. Short description in the about dialog
-#: ../src/math-window.c:232
-msgid "Calculator with financial and scientific modes."
-msgstr "Kalkulator sa finansijskim i nauÄnim naÄinom rada."
-
-#: ../src/math-window.c:362
-msgid "Basic"
-msgstr "Osnovni"
-
-#: ../src/math-window.c:363
-msgid "Advanced"
-msgstr "Napredni"
-
-#: ../src/math-window.c:364
-msgid "Financial"
-msgstr "Finansijski"
+#. Preferences dialog: label for show trailing zeroes check button
+#: ../src/math-preferences.vala:115
+msgid "Show trailing _zeroes"
+msgstr "PrikaÅi prateÄe _nule"
 
-#: ../src/math-window.c:365
-msgid "Programming"
-msgstr "Programerski"
+#. Preferences dialog: label for show show thousands separator check button
+#: ../src/math-preferences.vala:121
+msgid "Show _thousands separators"
+msgstr "PrikaÅi _razdvajaÄ hiljada"
 
-#: ../src/math-window.c:366
-msgid "Mode"
-msgstr "ReÅim"
+#. Preferences dialog: Label for angle unit combo box
+#: ../src/math-preferences.vala:127
+msgid "_Angle units:"
+msgstr "Jedinice _uglova:"
 
-#: ../src/math-window.c:373
-msgid "About Calculator"
-msgstr "O Kalkulatoru"
+#. 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.vala:143 ../src/unit.vala:38
+msgid "Degrees"
+msgstr "Stepeni"
 
-#: ../src/math-window.c:374
-msgid "Help"
-msgstr "PomoÄ"
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../src/math-preferences.vala:147 ../src/unit.vala:39
+msgid "Radians"
+msgstr "Radijani"
 
-#: ../src/math-window.c:375
-msgid "Quit"
-msgstr "IzaÄi"
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: ../src/math-preferences.vala:151 ../src/unit.vala:40
+msgid "Gradians"
+msgstr "Gradijani"
 
-#. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../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"
+#. Preferences dialog: Label for word size combo box
+#: ../src/math-preferences.vala:157
+msgid "Word _size:"
+msgstr "DuÅina _reÄi:"
 
-#. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../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"
+#. Word size combo: 8 bits
+#: ../src/math-preferences.vala:171
+msgid "8 bits"
+msgstr "8 bita"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../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"
+#. Word size combo: 16 bits
+#: ../src/math-preferences.vala:173
+msgid "16 bits"
+msgstr "16 bita"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../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"
+#. Word size combo: 32 bits
+#: ../src/math-preferences.vala:175
+msgid "32 bits"
+msgstr "32 bita"
 
-#. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:187
-msgid "Shift is only possible on integer values"
-msgstr "Pomeranje je moguÄe samo za pozitivne cele vrednosti"
+#. Word size combo: 64 bits
+#: ../src/math-preferences.vala:177
+msgid "64 bits"
+msgstr "64 bita"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:148
+#: ../src/number.vala:652
 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:644 ../src/mp.c:676 ../src/mp.c:1605
-msgid "Division by zero is undefined"
-msgstr "Deljenje nulom nije definisano"
+#. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
+#: ../src/number.vala:909 ../src/number.vala:1858
+msgid "The power of zero is undefined for a negative exponent"
+msgstr "Stepenovanje nule nije definisano za negativne izloÅioce"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1276 ../src/mp.c:1313
+#: ../src/number.vala:992 ../src/number.vala:1025
 msgid "Logarithm of zero is undefined"
 msgstr "Logaritam nule nije definisan"
 
-#. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1680 ../src/mp.c:1994
-msgid "The power of zero is undefined for a negative exponent"
-msgstr "Stepenovanje nule nije definisano za negativne izloÅioce"
-
-#: ../src/mp.c:1704
-msgid "Reciprocal of zero is undefined"
-msgstr "ReciproÄna vrednost nule nije definisana"
-
-#: ../src/mp.c:1789
-msgid "Root must be non-zero"
-msgstr "Koren mora biti razliÄit od nule"
-
-#: ../src/mp.c:1807
-msgid "Negative root of zero is undefined"
-msgstr "Negativni koren nule nije definisan"
-
-#: ../src/mp.c:1813
-msgid "nth root of negative number is undefined for even n"
-msgstr "n-ti koren negativnog broja nije definisan za parno n"
-
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1934
+#: ../src/number.vala:1043
 msgid "Factorial is only defined for natural numbers"
 msgstr "Faktorijel je definisan samo za prirodne brojeve"
 
+#. Translators: Error displayed attempted to divide by zero
+#: ../src/number.vala:1119 ../src/number.vala:2608
+msgid "Division by zero is undefined"
+msgstr "Deljenje nulom nije definisano"
+
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1954
+#: ../src/number.vala:1159
 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:310
+#: ../src/number.vala:1227
 msgid ""
 "Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
 msgstr ""
@@ -1496,753 +1365,282 @@ msgstr ""
 "Ïâ2 (90Â)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:355
+#: ../src/number.vala:1265
 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:372
+#: ../src/number.vala:1280
 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
+#: ../src/number.vala:1477
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
 "Inverzni hiperboliÄki kosinus nije definisan za vrednosti manje od jedan"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../src/mp-trigonometric.c:615
+#: ../src/number.vala:1496
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr ""
 "Inverzni hiperboliÄki tangens nije definisan za vrednosti izvan [-1, 1]"
 
-#: ../src/unit-manager.c:54
-#, c-format
-msgctxt "unit-format"
-msgid "%s degrees"
-msgstr "%s stepeni"
+#. Translators: Error displayed when boolean AND attempted on non-integer values
+#: ../src/number.vala:1515
+msgid "Boolean AND is only defined for positive integers"
+msgstr "LogiÄko I je definisano samo za pozitivne cele brojeve"
 
-#: ../src/unit-manager.c:54
-msgctxt "unit-symbols"
-msgid "degree,degrees,deg"
-msgstr "stepen,stepena,stepeni,st"
+#. Translators: Error displayed when boolean OR attempted on non-integer values
+#: ../src/number.vala:1527
+msgid "Boolean OR is only defined for positive integers"
+msgstr "LogiÄko ILI je definisano samo za pozitivne cele brojeve"
 
-#: ../src/unit-manager.c:55
-#, c-format
-msgctxt "unit-format"
-msgid "%s radians"
-msgstr "%s radijana"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: ../src/number.vala:1539
+msgid "Boolean XOR is only defined for positive integers"
+msgstr "LogiÄko ILLI je definisano samo za pozitivne cele brojeve"
 
-#: ../src/unit-manager.c:55
-msgctxt "unit-symbols"
-msgid "radian,radians,rad"
-msgstr "radijan,radijana,rad"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: ../src/number.vala:1551
+msgid "Boolean NOT is only defined for positive integers"
+msgstr "LogiÄko NE je definisano samo za pozitivne cele brojeve"
 
-#: ../src/unit-manager.c:56
-#, c-format
-msgctxt "unit-format"
-msgid "%s gradians"
-msgstr "%s gradijana"
+#. Translators: Error displayed when bit shift attempted on non-integer values
+#: ../src/number.vala:1574
+msgid "Shift is only possible on integer values"
+msgstr "Pomeranje je moguÄe samo za pozitivne cele vrednosti"
 
-#: ../src/unit-manager.c:56
-msgctxt "unit-symbols"
-msgid "gradian,gradians,grad"
-msgstr "gradijan,gradijana,grad"
+#: ../src/number.vala:1878
+msgid "Root must be non-zero"
+msgstr "Koren mora biti razliÄit od nule"
 
-#: ../src/unit-manager.c:57
-msgid "Parsecs"
-msgstr "Parseci"
+#: ../src/number.vala:1895
+msgid "Negative root of zero is undefined"
+msgstr "Negativni koren nule nije definisan"
 
-#: ../src/unit-manager.c:57
-#, c-format
-msgctxt "unit-format"
-msgid "%s pc"
-msgstr "%s pc"
+#: ../src/number.vala:1902
+msgid "nth root of negative number is undefined for even n"
+msgstr "n-ti koren negativnog broja nije definisan za parno n"
 
-#: ../src/unit-manager.c:57
-msgctxt "unit-symbols"
-msgid "parsec,parsecs,pc"
-msgstr "parsek,parseka,pc"
+#: ../src/number.vala:2225
+msgid "Overflow: the result couldn't be calculated"
+msgstr "PrekoraÄenje: rezultat se ne moÅe izraÄunati"
 
-#: ../src/unit-manager.c:58
-msgid "Light Years"
-msgstr "Svetlosne godine"
+#: ../src/number.vala:2553
+msgid "Reciprocal of zero is undefined"
+msgstr "ReciproÄna vrednost nule nije definisana"
 
-#: ../src/unit-manager.c:58
-#, c-format
-msgctxt "unit-format"
-msgid "%s ly"
-msgstr "%s ly"
+#: ../src/unit.vala:29
+msgid "Angle"
+msgstr "Ugao"
 
-#: ../src/unit-manager.c:58
-msgctxt "unit-symbols"
-msgid "lightyear,lightyears,ly"
-msgstr "svetlosnagodina,svetlosnegodine,svetlosnihgodina,ly"
+#: ../src/unit.vala:30
+msgid "Length"
+msgstr "DuÅina"
 
-#: ../src/unit-manager.c:59
-msgid "Astronomical Units"
-msgstr "Astronomske jedinice"
+#: ../src/unit.vala:31
+msgid "Area"
+msgstr "PovrÅina"
 
-#: ../src/unit-manager.c:59
-#, c-format
-msgctxt "unit-format"
-msgid "%s au"
-msgstr "%s au"
+#: ../src/unit.vala:32
+msgid "Volume"
+msgstr "Zapremina"
 
-#: ../src/unit-manager.c:59
-msgctxt "unit-symbols"
-msgid "au"
-msgstr "au"
+#: ../src/unit.vala:33
+msgid "Weight"
+msgstr "TeÅina"
 
-#: ../src/unit-manager.c:60
-msgid "Nautical Miles"
-msgstr "NautiÄke milje"
+#: ../src/unit.vala:34
+msgid "Duration"
+msgstr "Vreme"
 
-#: ../src/unit-manager.c:60
-#, c-format
-msgctxt "unit-format"
-msgid "%s nmi"
-msgstr "%s nmi"
+#: ../src/unit.vala:35
+msgid "Temperature"
+msgstr "Temperatura"
 
-#: ../src/unit-manager.c:60
-msgctxt "unit-symbols"
-msgid "nmi"
-msgstr "nmi"
+#: ../src/unit.vala:41
+msgid "Parsecs"
+msgstr "Parseci"
 
-#: ../src/unit-manager.c:61
-msgid "Miles"
-msgstr "Milje"
+#: ../src/unit.vala:42
+msgid "Light Years"
+msgstr "Svetlosne godine"
 
-#: ../src/unit-manager.c:61
-#, c-format
-msgctxt "unit-format"
-msgid "%s mi"
-msgstr "%s mi"
+#: ../src/unit.vala:43
+msgid "Astronomical Units"
+msgstr "Astronomske jedinice"
 
-#: ../src/unit-manager.c:61
-msgctxt "unit-symbols"
-msgid "mile,miles,mi"
-msgstr "milja,milje,milja,mi"
+#: ../src/unit.vala:44
+msgid "Nautical Miles"
+msgstr "NautiÄke milje"
+
+#: ../src/unit.vala:45
+msgid "Miles"
+msgstr "Milje"
 
-#: ../src/unit-manager.c:62
+#: ../src/unit.vala:46
 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,kilometra,kilometara,km,km"
-
-#: ../src/unit-manager.c:63
+#: ../src/unit.vala:47
 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 "kabal,kabla,kablova,cb"
-
-#: ../src/unit-manager.c:64
+#: ../src/unit.vala:48
 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
+#: ../src/unit.vala:49
 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
+#: ../src/unit.vala:50
 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
+#: ../src/unit.vala:51
 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
+#: ../src/unit.vala:52
 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
+#: ../src/unit.vala:53
 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,centimetra,centimetara,cm,cm"
-
-#: ../src/unit-manager.c:70
+#: ../src/unit.vala:54
 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,milimetra,milimetara,mm,mm"
-
-#: ../src/unit-manager.c:71
+#: ../src/unit.vala:55
 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,mikrometra,mikrometara,um"
-
-#: ../src/unit-manager.c:72
+#: ../src/unit.vala:56
 msgid "Nanometers"
 msgstr "Nanometri"
 
-#: ../src/unit-manager.c:72
-#, c-format
-msgctxt "unit-format"
-msgid "%s nm"
-msgstr "%s nm"
-
-#: ../src/unit-manager.c:72
-msgctxt "unit-symbols"
-msgid "nanometer,nanometers,nm"
-msgstr "nanometar,nanometra,nanometara,nm,nm"
-
-#: ../src/unit-manager.c:73
+#: ../src/unit.vala:57
 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
+#: ../src/unit.vala:58
 msgid "Acres"
 msgstr "Akri"
 
-#: ../src/unit-manager.c:74
-#, c-format
-msgctxt "unit-format"
-msgid "%s acres"
-msgstr "%s akra"
-
-#: ../src/unit-manager.c:74
-msgctxt "unit-symbols"
-msgid "acre,acres"
-msgstr "akr,akra"
-
-#: ../src/unit-manager.c:75
+#: ../src/unit.vala:59
 msgid "Square Meters"
 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
+#: ../src/unit.vala:60
 msgid "Square Centimeters"
 msgstr "Kvadratni centimetri"
 
-#: ../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
+#: ../src/unit.vala:61
 msgid "Square Millimeters"
 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
+#: ../src/unit.vala:62
 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
+#: ../src/unit.vala:63
 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,galona,gal"
-
-#: ../src/unit-manager.c:80
+#: ../src/unit.vala:64
 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
+#: ../src/unit.vala:65
 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
+#: ../src/unit.vala:66
 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
+#: ../src/unit.vala:67
 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,mililitra,mililitara,ml,ml,cmÂ"
-
-#: ../src/unit-manager.c:84
+#: ../src/unit.vala:68
 msgid "Microlitres"
 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
+#: ../src/unit.vala:69
 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
+#: ../src/unit.vala:70
 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
+#: ../src/unit.vala:71
 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
+#: ../src/unit.vala:72
 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,unce,unci,oz,oz"
-
-#: ../src/unit-manager.c:89
+#: ../src/unit.vala:73
 msgid "Grams"
 msgstr "Grami"
 
-#: ../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
+#: ../src/unit.vala:74
 msgid "Years"
 msgstr "Godine"
 
-#: ../src/unit-manager.c:90
-#, c-format
-msgctxt "unit-format"
-msgid "%s years"
-msgstr "%s god."
-
-#: ../src/unit-manager.c:90
-msgctxt "unit-symbols"
-msgid "year,years"
-msgstr "godina,godine,godina"
-
-#: ../src/unit-manager.c:91
+#: ../src/unit.vala:75
 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
+#: ../src/unit.vala:76
 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
+#: ../src/unit.vala:77
 msgid "Minutes"
 msgstr "Minuti"
 
-#: ../src/unit-manager.c:93
-#, c-format
-msgctxt "unit-format"
-msgid "%s minutes"
-msgstr "%s min."
-
-#: ../src/unit-manager.c:93
-msgctxt "unit-symbols"
-msgid "minute,minutes"
-msgstr "minut,minuta"
-
-#: ../src/unit-manager.c:94
+#: ../src/unit.vala:78
 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 "sekunda,sekunde,sekundi,s,s"
-
-#: ../src/unit-manager.c:95
+#: ../src/unit.vala:79
 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 "milisekunda,milisekunde,milisendi,ms,ms"
-
-#: ../src/unit-manager.c:96
+#: ../src/unit.vala:80
 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,Îs"
-msgstr "mikrosekunda,mikrosekunde,mikrosekundi,Îs"
-
-#: ../src/unit-manager.c:97
+#: ../src/unit.vala:81
 msgid "Celsius"
 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 "stepC,ËC"
-
-#: ../src/unit-manager.c:98
+#: ../src/unit.vala:82
 msgid "Farenheit"
 msgstr "Farenhajti"
 
-#: ../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 "stepF,ËF"
-
-#: ../src/unit-manager.c:99
+#: ../src/unit.vala:83
 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 "K"
-msgstr "K"
-
-#: ../src/unit-manager.c:100
+#: ../src/unit.vala:84
 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,ËRa"
-msgstr "stepR,ËR,ËRa"
-
-#: ../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 "Vreme"
-
-#: ../src/unit-manager.c:115
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: ../src/unit-manager.c:127
+#: ../src/unit.vala:86
 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
+#: ../src/unit.vala:92
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"



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