[gcalctool] Assamese translation updated

[Nilamdyuti Goswami <ngoswami src gnome org>]

commit 5b53bd77f64c9a44649fea6a42031b1c94d211dd
Author: Nilamdyuti Goswami <ngoswami redhat com>
Date:   Thu Nov 22 21:33:10 2012 +0530

    Assamese translation updated

 po/as.po | 1841 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 867 insertions(+), 974 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index a70a70e..1e0972d 100644
--- a/po/as.po
+++ b/po/as.po
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gcalctool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-17 08:37+0000\n"
-"PO-Revision-Date: 2012-06-15 17:51+0530\n"
+"POT-Creation-Date: 2012-11-21 09:50+0000\n"
+"PO-Revision-Date: 2012-11-22 21:32+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: as_IN <kde-i18n-doc kde org>\n"
-"Language: \n"
+"Language: as_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. Accessible name for the inverse button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-programming.ui.h:24
@@ -62,7 +62,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 "ààààà"
 
@@ -91,7 +91,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 "ààà ààààà"
 
@@ -120,7 +120,8 @@ msgid ""
 "investment of present value to a future value, at a fixed interest rate per "
 "compounding period."
 msgstr ""
-"ààààààà àààà ààà àààààààà ààà ààààààà ààààà àààààà àààààà ààààààààà ààà àààààà "
+"ààààààà àààà ààà àààààààà ààà ààààààà ààààà àààààà àààààà ààààààààà ààà "
+"àààààà "
 "àààààà àààà ààà, ààààà ààà ààààà ààà ààààààààà àààà ààààà"
 
 #
@@ -141,7 +142,8 @@ msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
 msgstr ""
-"ààà àààààà ààà àààààààà àààà àààà àààààà ààààààà àààà ààà, ààààà-àààà ààààààà àààààà "
+"ààà àààààà ààà àààààààà àààà àààà àààààà ààààààà àààà ààà, ààààà-àààà ààààààà "
+"àààààà "
 "ààààààà àààà"
 
 #
@@ -163,7 +165,7 @@ msgstr "ààààà (_P):"
 #
 #. 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 "ààà"
 
@@ -174,7 +176,8 @@ msgid ""
 "payments at a periodic interest rate over the number of payment periods in "
 "the term."
 msgstr ""
-"ààà àààààààà ààààààà ààà àààààà àààààà àààààààààà ààààààà àààà ààà àààààà àààà àààà "
+"ààà àààààààà ààààààà ààà àààààà àààààà àààààààààà ààààààà àààà ààà àààààà "
+"àààà àààà "
 "ààààààà ààà ààààà àààà àààààà ààà àààà àààà"
 
 #
@@ -190,7 +193,7 @@ msgstr "àààààà àààààà (_N):"
 
 #. 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 "ààà àààà àààà"
 
@@ -200,7 +203,8 @@ msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
 msgstr ""
-"ààà àààààà àààà àààààà ààààà àààà ààà, ààààààà ààà ààà ààààà ààààààà àààà ààààà "
+"ààà àààààà àààà àààààà ààààà àààà ààà, ààààààà ààà ààà ààààà ààààààà àààà "
+"ààààà "
 "àààà àààààà àààà"
 
 #. Gross Profit Margin Dialog: Label before margin input
@@ -211,7 +215,7 @@ msgstr "àààà (_M):"
 #
 #. 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 "àààààà àààààà"
 
@@ -239,7 +243,7 @@ msgstr "ààààà (_T):"
 #
 #. 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 "ààààààà ààà"
 
@@ -250,13 +254,14 @@ msgid ""
 "payments discounted at a periodic interest rate over the number of payment "
 "periods in the term. "
 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 "àààààà àààà ààà"
 
@@ -266,7 +271,8 @@ msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
 msgstr ""
-"ààà àààààààà ààà ààààààà ààààà àààààà àààààà ààààààààà àààààà ààà àààà ààà, ààà "
+"ààà àààààààà ààà ààààààà ààààà àààààà àààààà ààààààààà àààààà ààà àààà ààà, "
+"ààà "
 "àààààà ààààààà ààààà "
 
 #
@@ -294,8 +300,10 @@ msgid ""
 "over the useful life of an asset. The useful life is the number of periods, "
 "typically years, over which an asset is depreciated. "
 msgstr ""
-"ààà àààààà àààà ààà àààààà ààà-àààà ààààà àààà àààà àààààà ààà-àààà àààààààà ààà "
-"àààààà àààààà àààààà àààààà àààà àààààààà ààà àààà àààààà àààà àà àààààà àààààà, "
+"ààà àààààà àààà ààà àààààà ààà-àààà ààààà àààà àààà àààààà ààà-àààà àààààààà "
+"ààà "
+"àààààà àààààà àààààà àààààà àààà àààààààà ààà àààà àààààà àààà àà àààààà "
+"àààààà, "
 "ààààààà ààà, ààà àààà ààà ààààà ààààà ààà "
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
@@ -312,9 +320,12 @@ msgid ""
 "occurs in earlier periods than in later ones. The useful life is the number "
 "of periods, typically years, over which an asset is depreciated. "
 msgstr ""
-"ààà àààààà àààààà ààààààà Sum-of-the-Years'-Digits àààààà ààààààà ààà, ààà àààààààà "
-"àààà àààà àààà àààà ààààà àà àààààààà àààààà ààà àààààà ààà, àààà àààà ààààà àààà "
-"àààà àààà àààà ààà àààà àààà ààà àààààà àààà àà àààààà àààààà, ààààààà ààà, àà "
+"ààà àààààà àààààà ààààààà Sum-of-the-Years'-Digits àààààà ààààààà ààà, ààà "
+"àààààààà "
+"àààà àààà àààà àààà ààààà àà àààààààà àààààà ààà àààààà ààà, àààà àààà ààààà "
+"àààà "
+"àààà àààà àààà ààà àààà àààà ààà àààààà àààà àà àààààà àààààà, ààààààà ààà, "
+"àà "
 "ààà ààààà àààààà ààà "
 
 #
@@ -336,7 +347,8 @@ msgid ""
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
 "rate."
 msgstr ""
-"ààà àààààà àààààààà ààààààà àààààà àààà ààààààààà àààààà àààààà àààààà àààà ààà, "
+"ààà àààààà àààààààà ààààààà àààààà àààà ààààààààà àààààà àààààà àààààà àààà "
+"ààà, "
 "ààà ààààààà ààà ààààà àààààà, ààà àààààà àààà ààààà"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
@@ -391,13 +403,13 @@ msgstr "Gpm"
 
 #. 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 "ààààààà àààààààààà ààà"
 
@@ -408,7 +420,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 "ààà à'à àààààààà"
 
@@ -422,59 +434,8 @@ msgstr "ààà (_a):"
 msgid "_Insert"
 msgstr "àààààààà (_I)"
 
-#. Word size combo: 8 bits
-#: ../data/preferences.ui.h:2
-msgid "8-bit"
-msgstr "8-bit"
-
-#. Word size combo: 16 bits
-#: ../data/preferences.ui.h:4
-msgid "16-bit"
-msgstr "16-bit"
-
-#. Word size combo: 32 bits
-#: ../data/preferences.ui.h:6
-msgid "32-bit"
-msgstr "32-bit"
-
-#. Word size combo: 64 bits
-#: ../data/preferences.ui.h:8
-msgid "64-bit"
-msgstr "64-bit"
-
-#. 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 "àààà ààààààà (_A):"
-
-#. Preferences dialog: Label for display format combo box
-#: ../data/preferences.ui.h:13
-msgid "Number _Format:"
-msgstr "àààààà ààààààà (_F):"
-
-#. Preferences dialog: label for word size combo box
-#: ../data/preferences.ui.h:15
-msgid "Word _size:"
-msgstr "ààààà àààà (_s):"
-
-#. Preferences dialog: label for show trailing zeroes check button
-#: ../data/preferences.ui.h:17
-msgid "Show trailing _zeroes"
-msgstr "àààààààààà ààààà àààààààà (_z)"
-
-#. Preferences dialog: label for show thousands separator check button
-#: ../data/preferences.ui.h:19
-msgid "Show _thousands separators"
-msgstr "ààààà àààààààààà àààààààà (_t)"
-
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:493
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.vala:29
 msgid "Calculator"
 msgstr "ààà"
 
@@ -523,7 +484,8 @@ msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
 msgstr ""
-"àààààààà àààà àààààààà ààààààà àààà àààà àààààààààà ààààà àààààà àà àà ààààà ààààà"
+"àààààààà àààà àààààààà ààààààà àààà àààà àààààààààà ààààà àààààà àà àà ààààà "
+"ààààà"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:11
 msgid "Number format"
@@ -581,252 +543,289 @@ msgstr "àààààà ààààààà"
 msgid "Units to convert the current calculation into"
 msgstr "ààààààà ààààà àààààààà àààààà ààààààà"
 
-#: ../src/currency-manager.c:30
+#: ../src/currency.vala:28
 msgid "UAE Dirham"
 msgstr "UAE àààààà"
 
-#: ../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 "CFA àààààà"
 
-#: ../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 "US à'ààà"
 
-#: ../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 "àààààà: àààààà àààààà ààààààà àà ààààà"
 
+#: ../src/gcalctool.vala:78
+msgid "Basic"
+msgstr "ààààà"
+
+#: ../src/gcalctool.vala:79
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../src/gcalctool.vala:80
+msgid "Financial"
+msgstr "àààààà"
+
+#: ../src/gcalctool.vala:81
+msgid "Programming"
+msgstr "ààààààààààà"
+
+#: ../src/gcalctool.vala:82
+msgid "Mode"
+msgstr "àààààà"
+
+#. Title of preferences dialog
+#: ../src/gcalctool.vala:85 ../src/math-preferences.vala:26
+msgid "Preferences"
+msgstr "ààààààààà"
+
+#: ../src/gcalctool.vala:89
+msgid "About Calculator"
+msgstr "àààà ààààà"
+
+#: ../src/gcalctool.vala:90
+msgid "Help"
+msgstr "àààà"
+
+#: ../src/gcalctool.vala:91
+msgid "Quit"
+msgstr "àààààààà ààà"
+
 #. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:77
+#: ../src/gcalctool.vala:162
 #, c-format
 msgid ""
 "Usage:\n"
@@ -836,7 +835,7 @@ msgstr ""
 "  %s â ààààààà àààààààà ààààààà ààà"
 
 #. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:85
+#: ../src/gcalctool.vala:167
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -852,7 +851,7 @@ msgstr ""
 "  --help-gtk                      GTK+ àààààààààà àààààààà"
 
 #. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:96
+#: ../src/gcalctool.vala:173
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -868,14 +867,15 @@ msgstr ""
 "GTK+ Options:\n"
 "  --class=CLASS                   àààààà àààààà ààààààà ààà àààààààà "
 "ààààààmanager\n"
-"  --name=NAME                     àààààà àààààà ààààààà ààà àààààààà àààmanager\n"
+"  --name=NAME                     àààààà àààààà ààààààà ààà àààààààà "
+"àààmanager\n"
 "  --screen=SCREEN                 ààààààà àààààà X ààààà\n"
 "  --sync                          X àààààà ààààààà ààà\n"
 "  --gtk-module=MODULES            àààààààà GTK+ ààààààààà à'à ààà\n"
 "  --g-fatal-warnings              àààà ààààààààààà àààààààà àààààààà"
 
 #. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:110
+#: ../src/gcalctool.vala:180
 #, c-format
 msgid ""
 "Application Options:\n"
@@ -885,290 +885,349 @@ msgstr ""
 "  -s, --solve <equation>          àààààà ààà àààààà àààààà ààà"
 
 #. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:154
+#: ../src/gcalctool.vala:220
 #, c-format
 msgid "Argument --solve requires an equation to solve"
 msgstr "àààà --solve à àààààà àààààà ààà ààààààà ààààààà"
 
 #. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:164
+#: ../src/gcalctool.vala:230
 #, c-format
 msgid "Unknown argument '%s'"
 msgstr "àààààà àààà '%s'"
 
+#
+#. Translators: Error message displayed when unable to launch help browser
+#: ../src/gcalctool.vala:321
+msgid "Unable to open help file"
+msgstr "àààààààà àààà ààààààà àààààà"
+
+#. The translator credits. Please translate this with your name (s).
+#: ../src/gcalctool.vala:351
+msgid "translator-credits"
+msgstr ""
+"àààààààà àààà (aphukan fedoraproject org), àààààààààà àààààààà "
+"(ngoswami redhat "
+"com)"
+
+#. The license this software is under (GPL2+)
+#: ../src/gcalctool.vala:354
+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 ""
+"Gcalctool ààà àààààààààà ààààààà; ààààà Free Software Foundation à àààààà\n"
+" àààààààà GNU General Public License à ààààààààààà àààààààà àààà àààà ààààà \n"
+"ààààà àààà àààà  àààà ààààà; àààà àààààààà ààààààà à, àààà (àààààà ààààààà)\n"
+" àààààà ààààààà àààààààà\n"
+"Gcalctool àààà àààà àààààà àààà àà à àààààààààààà à'à, àààààà àààà àààààààà\n"
+"àààààà; ààààààààà  àààà àààà ààà ààààà ààààà àààààààà àààà àààààà àààààààà\n"
+"ààààààà àààà ààààààà  GNU General Public License ààààà\n"
+"\n"
+"ààààà àààà àààààààà Gcalctool à àààà GNU General Public License à ààà ààà\n"
+"ààààà; ààà ààà àààààà Free Software Foundation, Inc., \n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA àà àààà"
+
+#. Program name in the about dialog
+#: ../src/gcalctool.vala:359
+msgid "Gcalctool"
+msgstr "Gcalctool"
+
+#. Copyright notice in the about dialog
+#: ../src/gcalctool.vala:363
+msgid "Â 1986â2010 The Gcalctool authors"
+msgstr "Â ààààâàààà Gcalctool àààààààà"
+
+#. Short description in the about dialog
+#: ../src/gcalctool.vala:367
+msgid "Calculator with financial and scientific modes."
+msgstr "ààààààààà ààà ààààààààà àààààààà àààà"
+
+#. 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 "Euler à àààààà"
 
 #. 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 "Sine"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.vala:346
 msgid "Cosine"
 msgstr "Cosine"
 
 #. 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 "àààààààà Sine"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.vala:352
 msgid "Hyperbolic Cosine"
 msgstr "àààààààà Cosine"
 
 #. 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 "ààààààà AND"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.vala:360
 msgid "Boolean OR"
 msgstr "ààààààà OR"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.vala:362
 msgid "Boolean Exclusive OR"
 msgstr "ààààààà àààààà OR"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.vala:364
 msgid "Boolean NOT"
 msgstr "ààààààà NOT"
 
 #. 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 "Sum of the Years Digits ààààà"
 
 #. 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"
@@ -1177,7 +1236,7 @@ msgstr[1] "_%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"
@@ -1185,1068 +1244,902 @@ msgstr[0] "%d ààààà"
 msgstr[1] "%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 "Floor"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:991
+#: ../src/math-buttons.vala:817
 msgid "Ceiling"
 msgstr "Ceiling"
 
 #. 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:169
+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:480
 msgid "No undo history"
 msgstr "ààààààà àààààà àààà àààààà ààà"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:486
+#: ../src/math-equation.vala:496
 msgid "No redo history"
 msgstr "àààà ààààààààààà àààààà ààà"
 
-#: ../src/math-equation.c:944
+#: ../src/math-equation.vala:725
 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:873
 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:878
 #, 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:885
 #, 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:892
 msgid "Unknown conversion"
 msgstr "àààààà àààààààà"
 
+#: ../src/math-equation.vala:900
+#, 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:905 ../src/math-equation.vala:910
 msgid "Malformed expression"
 msgstr "àààààà àààààààààà"
 
-#: ../src/math-equation.c:1264
+#: ../src/math-equation.vala:921
 msgid "Calculating"
 msgstr "àààà ààà àààà"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1380
+#: ../src/math-equation.vala:1048
 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:1102
 msgid "No sane value to bitwise shift"
 msgstr "bitwise ààààààààààà àààà àààà ààààààààà ààà ààà"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1483
+#: ../src/math-equation.vala:1116
 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 "àààà ààà (_C)"
 
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
-#: ../src/math-preferences.c: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 "àààààà ààààààà (_F):"
 
 #. 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 ààààà ààààààààà àààààààà (_p)"
 
-#
-#. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:171
-msgid "Unable to open help file"
-msgstr "àààààààà àààà ààààààà àààààà"
+#. Preferences dialog: label for show trailing zeroes check button
+#: ../src/math-preferences.vala:115
+msgid "Show trailing _zeroes"
+msgstr "àààààààààà ààààà àààààààà (_z)"
 
-#. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:204
-msgid "translator-credits"
-msgstr ""
-"àààààààà àààà (aphukan fedoraproject org), àààààààààà àààààààà (ngoswami redhat "
-"com)"
+#. Preferences dialog: label for show show thousands separator check button
+#: ../src/math-preferences.vala:121
+msgid "Show _thousands separators"
+msgstr "ààààà àààààààààà àààààààà (_t)"
 
-#. 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 ""
-"Gcalctool ààà àààààààààà ààààààà; ààààà Free Software Foundation à àààààà\n"
-" àààààààà GNU General Public License à ààààààààààà àààààààà àààà àààà ààààà \n"
-"ààààà àààà àààà  àààà ààààà; àààà àààààààà ààààààà à, àààà (àààààà ààààààà)\n"
-" àààààà ààààààà àààààààà\n"
-"Gcalctool àààà àààà àààààà àààà àà à àààààààààààà à'à, àààààà àààà àààààààà\n"
-"àààààà; ààààààààà  àààà àààà ààà ààààà ààààà àààààààà àààà àààààà àààààààà\n"
-"ààààààà àààà ààààààà  GNU General Public License ààààà\n"
-"\n"
-"ààààà àààà àààààààà Gcalctool à àààà GNU General Public License à ààà ààà\n"
-"ààààà; ààà ààà àààààà Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA àà àààà"
+#. Preferences dialog: Label for angle unit combo box
+#: ../src/math-preferences.vala:127
+msgid "_Angle units:"
+msgstr "àààà ààààààà (_A):"
 
-#. Program name in the about dialog
-#: ../src/math-window.c:224
-msgid "Gcalctool"
-msgstr "Gcalctool"
+#. 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 "àààààààààà"
 
-#. Copyright notice in the about dialog
-#: ../src/math-window.c:228
-msgid "Â 1986â2010 The Gcalctool authors"
-msgstr "Â ààààâàààà Gcalctool àààààààà"
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../src/math-preferences.vala:147 ../src/unit.vala:39
+msgid "Radians"
+msgstr "ààààààààààà"
 
-#. Short description in the about dialog
-#: ../src/math-window.c:232
-msgid "Calculator with financial and scientific modes."
-msgstr "ààààààààà ààà ààààààààà àààààààà àààà"
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: ../src/math-preferences.vala:151 ../src/unit.vala:40
+msgid "Gradians"
+msgstr "ààààààààààààà"
 
-#: ../src/math-window.c:362
-msgid "Basic"
-msgstr "ààààà"
+#. Preferences dialog: Label for word size combo box
+#: ../src/math-preferences.vala:157
+msgid "Word _size:"
+msgstr "ààààà àààà (_s):"
 
-#: ../src/math-window.c:363
-msgid "Advanced"
-msgstr "Advanced"
+#. Word size combo: 8 bits
+#: ../src/math-preferences.vala:171
+msgid "8 bits"
+msgstr "à ààà"
 
-#: ../src/math-window.c:364
-msgid "Financial"
-msgstr "àààààà"
+#. Word size combo: 16 bits
+#: ../src/math-preferences.vala:173
+msgid "16 bits"
+msgstr "àà ààà"
 
-#: ../src/math-window.c:365
-msgid "Programming"
-msgstr "ààààààààààà"
+#. Word size combo: 32 bits
+#: ../src/math-preferences.vala:175
+msgid "32 bits"
+msgstr "àà ààà"
 
-#: ../src/math-window.c:366
-msgid "Mode"
-msgstr "àààààà"
+#. Word size combo: 64 bits
+#: ../src/math-preferences.vala:177
+msgid "64 bits"
+msgstr "àà ààà"
 
-#: ../src/math-window.c:373
-msgid "About Calculator"
-msgstr "àààà ààààà"
+#. Translators: Error display when attempting to take argument of zero
+#: ../src/number.vala:652
+msgid "Argument not defined for zero"
+msgstr "àààà àààààà àààà àààààà ààà"
 
-#: ../src/math-window.c:374
-msgid "Help"
-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 "àààààà ààà ààà ààààààà ààààààààà àààà ààààààà"
 
-#: ../src/math-window.c:375
-msgid "Quit"
-msgstr "àààààààà ààà"
+#. Translators: Error displayed when attempting to take logarithm of zero
+#: ../src/number.vala:992 ../src/number.vala:1025
+msgid "Logarithm of zero is undefined"
+msgstr "àààààà ààààààà ààààààà"
+
+#. Translators: Error displayed when attempted take the factorial of a fractional number
+#: ../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/number.vala:1159
+msgid "Modulus division is only defined for integers"
+msgstr "àààààà ààà àààà àààààààààààà àààà àààààà"
+
+#. Translators: Error displayed when tangent value is undefined
+#: ../src/number.vala:1227
+msgid ""
+"Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
+msgstr ""
+"àààààà ààà Ïâ2 (90Â) ààà Ï (180Â) à àààààà ààààà àààà ààààààààà ààààààà"
+
+#. Translators: Error displayed when inverse sine value is undefined
+#: ../src/number.vala:1265
+msgid "Inverse sine is undefined for values outside [-1, 1]"
+msgstr "ààààà sine [-1, 1] à ààààà àààààààà àààà ààààààà"
+
+#. Translators: Error displayed when inverse cosine value is undefined
+#: ../src/number.vala:1280
+msgid "Inverse cosine is undefined for values outside [-1, 1]"
+msgstr "ààààà cosine [-1, 1] à ààààà àààààààà àààà ààààààà"
+
+#. Translators: Error displayed when inverse hyperbolic cosine value is undefined
+#: ../src/number.vala:1477
+msgid "Inverse hyperbolic cosine is undefined for values less than one"
+msgstr "ààààà ààààààààà cosine ààà àà àààààààà àààà ààààààà"
+
+#. Translators: Error displayed when inverse hyperbolic tangent value is undefined
+#: ../src/number.vala:1496
+msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
+msgstr "ààààà ààààààààà ààààààààà [-1, 1] à ààààà àààààààà àààà ààààààà"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:115
+#: ../src/number.vala:1515
 msgid "Boolean AND is only defined for positive integers"
 msgstr "ààààààà AND àààà ààààààà àààààààààààà àààà àààààà"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:128
+#: ../src/number.vala:1527
 msgid "Boolean OR is only defined for positive integers"
 msgstr "ààààààà OR àààà ààààààà àààààààààààà àààà àààààà"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:141
+#: ../src/number.vala:1539
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "ààààààà XOR àààà ààààààà àààààààààààà àààà àààààà"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:156
+#: ../src/number.vala:1551
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "ààààààà NOT àààà ààààààà àààààààààààà àààà àààààà"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:187
+#: ../src/number.vala:1574
 msgid "Shift is only possible on integer values"
 msgstr "àààààààààà àààà ààààààààààà àààààààà ààààà"
 
-#. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:148
-msgid "Argument not defined for zero"
-msgstr "àààà àààààà àààà àààààà ààà"
-
-#: ../src/mp.c:299
-msgid "Overflow: the result couldn't be calculated"
-msgstr "àààà ààààà: ààààà àààà àààà àààààà"
-
-#. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:644 ../src/mp.c:676 ../src/mp.c:1605
-msgid "Division by zero is undefined"
-msgstr "ààààààà ààà ààààààà"
-
-#. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1276 ../src/mp.c:1313
-msgid "Logarithm of zero is undefined"
-msgstr "àààààà ààààààà ààààààà"
-
-#. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c: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
+#: ../src/number.vala:1878
 msgid "Root must be non-zero"
 msgstr "ààà ààààà àà ààààààà"
 
-#: ../src/mp.c:1807
+#: ../src/number.vala:1895
 msgid "Negative root of zero is undefined"
 msgstr "àààààà ààààààà ààààààà ààààààà"
 
-#: ../src/mp.c:1813
+#: ../src/number.vala:1902
 msgid "nth root of negative number is undefined for even n"
 msgstr "ààààààà ààààààà nth ààààààà ààààà n à àààà ààààààà"
 
-#. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1934
-msgid "Factorial is only defined for natural numbers"
-msgstr "ààààà àààà ààààààààà àààààààààà àààà àààààà"
-
-#. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1954
-msgid "Modulus division is only defined for integers"
-msgstr "àààààà ààà àààà àààààààààààà àààà àààààà"
-
-#. Translators: Error displayed when tangent value is undefined
-#: ../src/mp-trigonometric.c:310
-msgid ""
-"Tangent is undefined for angles that are multiples of Ï (180Â) from Ïâ2 (90Â)"
-msgstr "àààààà ààà Ïâ2 (90Â) ààà Ï (180Â) à àààààà ààààà àààà ààààààààà ààààààà"
-
-#. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:355
-msgid "Inverse sine is undefined for values outside [-1, 1]"
-msgstr "ààààà sine [-1, 1] à ààààà àààààààà àààà ààààààà"
-
-#. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/mp-trigonometric.c:372
-msgid "Inverse cosine is undefined for values outside [-1, 1]"
-msgstr "ààààà cosine [-1, 1] à ààààà àààààààà àààà ààààààà"
+#: ../src/number.vala:2225
+msgid "Overflow: the result couldn't be calculated"
+msgstr "àààà ààààà: ààààà àààà àààà àààààà"
 
-#. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../src/mp-trigonometric.c:591
-msgid "Inverse hyperbolic cosine is undefined for values less than one"
-msgstr "ààààà ààààààààà cosine ààà àà àààààààà àààà ààààààà"
+#: ../src/number.vala:2553
+msgid "Reciprocal of zero is undefined"
+msgstr "àààààà àààààààààà ààààààà"
 
-#. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../src/mp-trigonometric.c:615
-msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
-msgstr "ààààà ààààààààà ààààààààà [-1, 1] à ààààà àààààààà àààà ààààààà"
+#: ../src/unit.vala:29
+msgid "Angle"
+msgstr "ààà"
 
-#: ../src/unit-manager.c:54
-#, c-format
-msgctxt "unit-format"
-msgid "%s degrees"
-msgstr "%s àààààààààà"
+#: ../src/unit.vala:30
+msgid "Length"
+msgstr "ààààààà"
 
-#: ../src/unit-manager.c:54
-msgctxt "unit-symbols"
-msgid "degree,degrees,deg"
-msgstr "àààààà, àààààààààà, ààà"
+#: ../src/unit.vala:31
+msgid "Area"
+msgstr "àààà"
 
-#: ../src/unit-manager.c:55
-#, c-format
-msgctxt "unit-format"
-msgid "%s radians"
-msgstr "%s ààààààààààà"
+#: ../src/unit.vala:32
+msgid "Volume"
+msgstr "àààà"
 
-#: ../src/unit-manager.c:55
-msgctxt "unit-symbols"
-msgid "radian,radians,rad"
-msgstr "ààààààà, ààààààààààà, ààà"
+#: ../src/unit.vala:33
+msgid "Weight"
+msgstr "ààà"
 
-#: ../src/unit-manager.c:56
-#, c-format
-msgctxt "unit-format"
-msgid "%s gradians"
-msgstr "%s ààààààààààààà"
+#: ../src/unit.vala:34
+msgid "Duration"
+msgstr "àààà"
 
-#: ../src/unit-manager.c:56
-msgctxt "unit-symbols"
-msgid "gradian,gradians,grad"
-msgstr "ààààààààà, ààààààààààààà, ààààà"
+#: ../src/unit.vala:35
+msgid "Temperature"
+msgstr "àààààà"
 
-#: ../src/unit-manager.c:57
+#: ../src/unit.vala:41
 msgid "Parsecs"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:57
-#, c-format
-msgctxt "unit-format"
-msgid "%s pc"
-msgstr "%s pc"
-
-#: ../src/unit-manager.c:57
-msgctxt "unit-symbols"
-msgid "parsec,parsecs,pc"
-msgstr "àààààà, àààààààà, pc"
-
-#: ../src/unit-manager.c:58
+#: ../src/unit.vala:42
 msgid "Light Years"
 msgstr "àààà àààààààà"
 
-#: ../src/unit-manager.c:58
-#, c-format
-msgctxt "unit-format"
-msgid "%s ly"
-msgstr "%s ly"
-
-#: ../src/unit-manager.c:58
-msgctxt "unit-symbols"
-msgid "lightyear,lightyears,ly"
-msgstr "àààààààà, àààààààààààà, ly"
-
-#: ../src/unit-manager.c:59
+#: ../src/unit.vala:43
 msgid "Astronomical Units"
 msgstr "ààààààààààààààà ààààààà"
 
-#: ../src/unit-manager.c:59
-#, c-format
-msgctxt "unit-format"
-msgid "%s au"
-msgstr "%s au"
-
-#: ../src/unit-manager.c:59
-msgctxt "unit-symbols"
-msgid "au"
-msgstr "au"
-
-#: ../src/unit-manager.c:60
+#: ../src/unit.vala:44
 msgid "Nautical Miles"
 msgstr "àà àààà"
 
-#: ../src/unit-manager.c:60
-#, c-format
-msgctxt "unit-format"
-msgid "%s nmi"
-msgstr "%s nmi"
-
-#: ../src/unit-manager.c:60
-msgctxt "unit-symbols"
-msgid "nmi"
-msgstr "nmi"
-
-#: ../src/unit-manager.c:61
+#: ../src/unit.vala:45
 msgid "Miles"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:61
-#, c-format
-msgctxt "unit-format"
-msgid "%s mi"
-msgstr "%s mi"
-
-#: ../src/unit-manager.c:61
-msgctxt "unit-symbols"
-msgid "mile,miles,mi"
-msgstr "àààà, àààà, mi"
-
-#: ../src/unit-manager.c:62
+#: ../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 "ààààààààà, ààààààààà, kms"
-
-#: ../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, cms"
-
-#: ../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 "àà, àà"
-
-#: ../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, kgs"
-
-#: ../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 "ààààà, ààààà, 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 "àààààààààààààà, àààààààààààààà, us,Î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 "degC,ËC"
-
-#: ../src/unit-manager.c:98
+#: ../src/unit.vala:82
 msgid "Farenheit"
 msgstr "Farenheit"
 
-#: ../src/unit-manager.c:98
-#, c-format
-msgctxt "unit-format"
-msgid "%s ËF"
-msgstr "%s ËF"
-
-#: ../src/unit-manager.c:98
-msgctxt "unit-symbols"
-msgid "degF,ËF"
-msgstr "degF,ËF"
-
-#: ../src/unit-manager.c:99
+#: ../src/unit.vala:83
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: ../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 "Rankine"
 
-#: ../src/unit-manager.c:100
+#: ../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.vala:92
 #, c-format
-msgctxt "unit-format"
-msgid "%s ËR"
-msgstr "%s ËR"
+msgid "%s%%s"
+msgstr "%s%%s"
 
-#: ../src/unit-manager.c:100
-msgctxt "unit-symbols"
-msgid "degR,ËR,ËRa"
-msgstr "degR,ËR,ËRa"
+#~ msgid "8-bit"
+#~ msgstr "8-bit"
 
-#: ../src/unit-manager.c:109
-msgid "Angle"
-msgstr "ààà"
+#~ msgid "16-bit"
+#~ msgstr "16-bit"
 
-#: ../src/unit-manager.c:110
-msgid "Length"
-msgstr "ààààààà"
+#~ msgid "32-bit"
+#~ msgstr "32-bit"
 
-#: ../src/unit-manager.c:111
-msgid "Area"
-msgstr "àààà"
+#~ msgid "64-bit"
+#~ msgstr "64-bit"
 
-#: ../src/unit-manager.c:112
-msgid "Volume"
-msgstr "àààà"
+#~ msgctxt "unit-format"
+#~ msgid "%s degrees"
+#~ msgstr "%s àààààààààà"
 
-#: ../src/unit-manager.c:113
-msgid "Weight"
-msgstr "ààà"
+#~ msgctxt "unit-symbols"
+#~ msgid "degree,degrees,deg"
+#~ msgstr "àààààà, àààààààààà, ààà"
 
-#: ../src/unit-manager.c:114
-msgid "Duration"
-msgstr "àààà"
+#~ msgctxt "unit-format"
+#~ msgid "%s radians"
+#~ msgstr "%s ààààààààààà"
 
-#: ../src/unit-manager.c:115
-msgid "Temperature"
-msgstr "àààààà"
+#~ msgctxt "unit-symbols"
+#~ msgid "radian,radians,rad"
+#~ msgstr "ààààààà, ààààààààààà, ààà"
 
-#: ../src/unit-manager.c:127
-msgid "Currency"
-msgstr "ààà"
+#~ msgctxt "unit-format"
+#~ msgid "%s gradians"
+#~ msgstr "%s ààààààààààààà"
 
-#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
-#: ../src/unit-manager.c:137
-#, c-format
-msgid "%s%%s"
-msgstr "%s%%s"
+#~ msgctxt "unit-symbols"
+#~ msgid "gradian,gradians,grad"
+#~ msgstr "ààààààààà, ààààààààààààà, ààààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s pc"
+#~ msgstr "%s pc"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "parsec,parsecs,pc"
+#~ msgstr "àààààà, àààààààà, pc"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ly"
+#~ msgstr "%s ly"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "lightyear,lightyears,ly"
+#~ msgstr "àààààààà, àààààààààààà, ly"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s au"
+#~ msgstr "%s au"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "au"
+#~ msgstr "au"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s nmi"
+#~ msgstr "%s nmi"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "nmi"
+#~ msgstr "nmi"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mi"
+#~ msgstr "%s mi"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "mile,miles,mi"
+#~ msgstr "àààà, àààà, mi"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s km"
+#~ msgstr "%s km"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "kilometer,kilometers,km,kms"
+#~ msgstr "ààààààààà, ààààààààà, kms"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s cb"
+#~ msgstr "%s cb"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "cable,cables,cb"
+#~ msgstr "ààààà, ààààà, cb"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ftm"
+#~ msgstr "%s ftm"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "fathom,fathoms,ftm"
+#~ msgstr "àààà, àààà, ftm"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s m"
+#~ msgstr "%s m"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "meter,meters,m"
+#~ msgstr "ààààà, ààààà, m"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s yd"
+#~ msgstr "%s yd"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "yard,yards,yd"
+#~ msgstr "àààààà, àààààà, yd"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ft"
+#~ msgstr "%s ft"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "foot,feet,ft"
+#~ msgstr "ààà, ààà, ft"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s in"
+#~ msgstr "%s in"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "inch,inches,in"
+#~ msgstr "ààààà, ààààààààà, in"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s cm"
+#~ msgstr "%s cm"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "centimeter,centimeters,cm,cms"
+#~ msgstr "ààààààààààà, ààààààààààà, cm, cms"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mm"
+#~ msgstr "%s mm"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "millimeter,millimeters,mm"
+#~ msgstr "ààààààààà, ààààààààà, mm"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s Îm"
+#~ msgstr "%s Îm"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "micrometer,micrometers,um"
+#~ msgstr "àààààààààààà, àààààààààààà, um"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s nm"
+#~ msgstr "%s nm"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "nanometer,nanometers,nm"
+#~ msgstr "ààààààààà, ààààààààà, nm"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ha"
+#~ msgstr "%s ha"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "hectare,hectares,ha"
+#~ msgstr "àààààà, àààààà, ha"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s acres"
+#~ msgstr "%s ààà"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "acre,acres"
+#~ msgstr "ààà, ààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mÂ"
+#~ msgstr "%s mÂ"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "mÂ"
+#~ msgstr "mÂ"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s cmÂ"
+#~ msgstr "%s cmÂ"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "cmÂ"
+#~ msgstr "cmÂ"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mmÂ"
+#~ msgstr "%s mmÂ"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "mmÂ"
+#~ msgstr "mmÂ"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mÂ"
+#~ msgstr "%s mÂ"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "mÂ"
+#~ msgstr "mÂ"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s gal"
+#~ msgstr "%s gal"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "gallon,gallons,gal"
+#~ msgstr "ààà'à, ààà'à, gal"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s L"
+#~ msgstr "%s L"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "litre,litres,liter,liters,L"
+#~ msgstr "ààààà, ààààà, ààààà, ààààààààà, L"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s qt"
+#~ msgstr "%s qt"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "quart,quarts,qt"
+#~ msgstr "ààààààà, ààààààà, qt"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s pt"
+#~ msgstr "%s pt"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "pint,pints,pt"
+#~ msgstr "ààààà, ààààà, pt"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s mL"
+#~ msgstr "%s mL"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
+#~ msgstr "ààààààààà, ààààààààà, ààààààààà, ààààààààà, mL, cmÂ"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ÎL"
+#~ msgstr "%s ÎL"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "mmÂ,ÎL,uL"
+#~ msgstr "mmÂ,ÎL,uL"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s T"
+#~ msgstr "%s T"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "tonne,tonnes"
+#~ msgstr "àà, àà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s kg"
+#~ msgstr "%s kg"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+#~ msgstr "ààààààààà, ààààààààà, ààààààààà, ààààààààà, kg, kgs"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s lb"
+#~ msgstr "%s lb"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "pound,pounds,lb"
+#~ msgstr "àààààà, àààààà, lb"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s oz"
+#~ msgstr "%s oz"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "ounce,ounces,oz"
+#~ msgstr "ààààà, ààààà, oz"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s g"
+#~ msgstr "%s g"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "gram,grams,gramme,grammes,g"
+#~ msgstr "ààààà, ààààà, ààààà, ààààà, g"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s years"
+#~ msgstr "%s ààààààà"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "year,years"
+#~ msgstr "ààà, ààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s days"
+#~ msgstr "%s àààààà"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "day,days"
+#~ msgstr "ààà, àààààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s hours"
+#~ msgstr "%s ààààà"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "hour,hours"
+#~ msgstr "ààààà, ààààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s minutes"
+#~ msgstr "%s ààààà"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "minute,minutes"
+#~ msgstr "ààààà, ààààà"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s s"
+#~ msgstr "%s s"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "second,seconds,s"
+#~ msgstr "ààààààà, ààààààà, s"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ms"
+#~ msgstr "%s ms"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "millisecond,milliseconds,ms"
+#~ msgstr "ààààààààààà, ààààààààààà, ms"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s Îs"
+#~ msgstr "%s Îs"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "microsecond,microseconds,us,Îs"
+#~ msgstr "àààààààààààààà, àààààààààààààà, us,Îs"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ËC"
+#~ msgstr "%s ËC"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degC,ËC"
+#~ msgstr "degC,ËC"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ËF"
+#~ msgstr "%s ËF"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degF,ËF"
+#~ msgstr "degF,ËF"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s K"
+#~ msgstr "%s K"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "K"
+#~ msgstr "K"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s ËR"
+#~ msgstr "%s ËR"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degR,ËR,ËRa"
+#~ msgstr "degR,ËR,ËRa"
 
 #~ msgid "<i>x</i>"
 #~ msgstr "<i>x</i>"