[gcalctool] update Punjabi Translation

[Amanpreet Singh Alam <aman src gnome org>]

commit e6a3a1d17062aaf51bf63cc0d762537fbf63d953
Author: A S Alam <aalam users sf net>
Date:   Sun Sep 18 01:05:53 2011 +0530

    update Punjabi Translation

 po/pa.po |  889 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 435 insertions(+), 454 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 102d23e..99687f0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=gcalctool&component=general\n"
-"POT-Creation-Date: 2011-02-17 02:30+0000\n"
-"PO-Revision-Date: 2011-02-25 07:06+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gcalctool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-07-20 16:59+0000\n"
+"PO-Revision-Date: 2011-09-15 20:53+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,6 @@ msgstr ""
 
 #. The label on the memory button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
-#| msgid "<i>x</i>!"
 msgid "<i>x</i>"
 msgstr "<i>x</i>"
 
@@ -62,7 +61,7 @@ msgstr "ààà"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
-#: ../src/math-buttons.c:231
+#: ../src/math-buttons.c:224
 msgid "Memory"
 msgstr "àààààà"
 
@@ -211,7 +210,7 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:255
+#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:248
 msgid "Compounding Term"
 msgstr "àààààà àà"
 
@@ -232,7 +231,7 @@ msgstr "àààà àààà àààààà ààà"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:261
+#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:254
 msgid "Future Value"
 msgstr "àààààà àààà"
 
@@ -253,7 +252,7 @@ msgstr "Gpm"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:282
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:275
 msgid "Gross Profit Margin"
 msgstr "ààààà àààà àààà"
 
@@ -264,7 +263,7 @@ msgstr "àààààà àààà"
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:273
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:266
 msgid "Periodic Interest Rate"
 msgstr "ààààà àààà àà"
 
@@ -275,7 +274,7 @@ msgstr "ààààà àààà àà(_R):"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:279
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:272
 msgid "Periodic Payment"
 msgstr "ààààà àààààà"
 
@@ -286,7 +285,7 @@ msgstr "Pmt"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:276
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:269
 msgid "Present Value"
 msgstr "àààààà àààà"
 
@@ -392,19 +391,19 @@ msgstr "àààà ààààà"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:234
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:227
 msgid "Insert Character Code"
 msgstr "àààà ààà ààààà"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:249
+#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:242
 msgid "Shift Left"
 msgstr "àààà ààààà"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:252
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:245
 msgid "Shift Right"
 msgstr "àààà ààààà"
 
@@ -415,7 +414,6 @@ msgstr "ààààà(_i)"
 
 #. The label on the memory button
 #: ../data/buttons-programming.ui.h:32
-#| msgid "x2"
 msgid "x"
 msgstr "x"
 
@@ -445,7 +443,7 @@ msgid "Number _Format:"
 msgstr "àààà àààààà(_F):"
 
 #. Title of preferences dialog
-#: ../data/preferences.ui.h:11 ../src/math-preferences.c:239
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
 msgid "Preferences"
 msgstr "àààà àààà"
 
@@ -470,7 +468,7 @@ msgid "_Angle units:"
 msgstr "ààà àààà(_A):"
 
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:522
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:546
 msgid "Calculator"
 msgstr "ààààààààà"
 
@@ -577,300 +575,254 @@ msgstr "àààà, ààà 'à àààààà ààààà àà
 msgid "Word size"
 msgstr "àààà ààààà"
 
-#: ../src/currency-manager.c:20
+#: ../src/currency-manager.c:30
 msgid "UAE Dirham"
 msgstr "UAE ààààà"
 
-#: ../src/currency-manager.c:21
-#| msgid "Australian dollar"
+#: ../src/currency-manager.c:31
 msgid "Australian Dollar"
 msgstr "ààààààààà àààà"
 
-#: ../src/currency-manager.c:22
-#| msgid "Bulgarian lev"
+#: ../src/currency-manager.c:32
 msgid "Bulgarian Lev"
 msgstr "ààààààààà ààà"
 
-#: ../src/currency-manager.c:23
-#| msgid "Bahraini dinar"
+#: ../src/currency-manager.c:33
 msgid "Bahraini Dinar"
 msgstr "ààààààà ààààà"
 
-#: ../src/currency-manager.c:24
-#| msgid "Brunei dollar"
+#: ../src/currency-manager.c:34
 msgid "Brunei Dollar"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:25
-#| msgid "Brazilian real"
+#: ../src/currency-manager.c:35
 msgid "Brazilian Real"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:26
-#| msgid "Botswana pula"
+#: ../src/currency-manager.c:36
 msgid "Botswana Pula"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:27
-#| msgid "Canadian dollar"
+#: ../src/currency-manager.c:37
 msgid "Canadian Dollar"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:28
-#| msgid "Swiss franc"
+#: ../src/currency-manager.c:38
+#| msgid "Frac"
+msgid "CFA Franc"
+msgstr "CFA àààà"
+
+#: ../src/currency-manager.c:39
 msgid "Swiss Franc"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:29
-#| msgid "Chilean peso"
+#: ../src/currency-manager.c:40
 msgid "Chilean Peso"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:30
-#| msgid "Chinese yuan renminbi"
+#: ../src/currency-manager.c:41
 msgid "Chinese Yuan"
 msgstr "àààà ààà"
 
-#: ../src/currency-manager.c:31
-#| msgid "Colombian peso"
+#: ../src/currency-manager.c:42
 msgid "Colombian Peso"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:32
-#| msgid "Czech koruna"
+#: ../src/currency-manager.c:43
 msgid "Czech Koruna"
 msgstr "àààà àààààà"
 
-#: ../src/currency-manager.c:33
-#| msgid "Danish krone"
+#: ../src/currency-manager.c:44
 msgid "Danish Krone"
 msgstr "àààààà ààààà"
 
-#: ../src/currency-manager.c:34
-#| msgid "Algerian dinar"
+#: ../src/currency-manager.c:45
 msgid "Algerian Dinar"
 msgstr "àààààààà ààààà"
 
-#: ../src/currency-manager.c:35
-#| msgid "Estonian kroon"
+#: ../src/currency-manager.c:46
 msgid "Estonian Kroon"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:36
+#: ../src/currency-manager.c:47
 msgid "Euro"
 msgstr "àààà"
 
-#: ../src/currency-manager.c:37
-#| msgid "Pound sterling"
+#: ../src/currency-manager.c:48
 msgid "Pound Sterling"
 msgstr "àààà ààààààà"
 
-#: ../src/currency-manager.c:38
-#| msgid "Hong Kong dollar"
+#: ../src/currency-manager.c:49
 msgid "Hong Kong Dollar"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:39
-#| msgid "Croatian kuna"
+#: ../src/currency-manager.c:50
 msgid "Croatian Kuna"
 msgstr "ààààààà àààà"
 
-#: ../src/currency-manager.c:40
-#| msgid "Hungarian forint"
+#: ../src/currency-manager.c:51
 msgid "Hungarian Forint"
 msgstr "ààààààà àààààà"
 
-#: ../src/currency-manager.c:41
-#| msgid "Indonesian rupiah"
+#: ../src/currency-manager.c:52
 msgid "Indonesian Rupiah"
 msgstr "ààààààààààà ààààà"
 
-#: ../src/currency-manager.c:42
-#| msgid "Israeli new shekel"
+#: ../src/currency-manager.c:53
 msgid "Israeli New Shekel"
 msgstr "àààààààà àààà àààààà"
 
-#: ../src/currency-manager.c:43
-#| msgid "Indian rupee"
+#: ../src/currency-manager.c:54
 msgid "Indian Rupee"
 msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:44
-#| msgid "Iranian rial"
+#: ../src/currency-manager.c:55
 msgid "Iranian Rial"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:45
-#| msgid "Icelandic krona"
+#: ../src/currency-manager.c:56
 msgid "Icelandic Krona"
 msgstr "ààààààààà ààààà"
 
-#: ../src/currency-manager.c:46
-#| msgid "Japanese yen"
+#: ../src/currency-manager.c:57
 msgid "Japanese Yen"
 msgstr "àààààà ààà"
 
-#: ../src/currency-manager.c:47
-#| msgid "South Korean won"
+#: ../src/currency-manager.c:58
 msgid "South Korean Won"
 msgstr "ààààà àààààà ààà"
 
-#: ../src/currency-manager.c:48
-#| msgid "Kuwaiti dinar"
+#: ../src/currency-manager.c:59
 msgid "Kuwaiti Dinar"
 msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:49
-#| msgid "Kazakhstani tenge"
+#: ../src/currency-manager.c:60
 msgid "Kazakhstani Tenge"
 msgstr "ààààààààà ààààà"
 
-#: ../src/currency-manager.c:50
-#| msgid "Sri Lankan rupee"
+#: ../src/currency-manager.c:61
 msgid "Sri Lankan Rupee"
 msgstr "àààà àààà ààààà"
 
-#: ../src/currency-manager.c:51
-#| msgid "Lithuanian litas"
+#: ../src/currency-manager.c:62
 msgid "Lithuanian Litas"
 msgstr "àààààààà ààààà"
 
-#: ../src/currency-manager.c:52
-#| msgid "Latvian lats"
+#: ../src/currency-manager.c:63
 msgid "Latvian Lats"
 msgstr "ààààààà àààà"
 
-#: ../src/currency-manager.c:53
-#| msgid "Libyan dinar"
+#: ../src/currency-manager.c:64
 msgid "Libyan Dinar"
 msgstr "àààààà ààààà"
 
-#: ../src/currency-manager.c:54
-#| msgid "Mauritian rupee"
+#: ../src/currency-manager.c:65
 msgid "Mauritian Rupee"
 msgstr "àààààààà ààààà"
 
-#: ../src/currency-manager.c:55
-#| msgid "Mexican peso"
+#: ../src/currency-manager.c:66
 msgid "Mexican Peso"
 msgstr "ààààààà àààà"
 
-#: ../src/currency-manager.c:56
-#| msgid "Malaysian ringgit"
+#: ../src/currency-manager.c:67
 msgid "Malaysian Ringgit"
 msgstr "àààààààà àààààààà"
 
-#: ../src/currency-manager.c:57
-#| msgid "Norwegian krone"
+#: ../src/currency-manager.c:68
 msgid "Norwegian Krone"
 msgstr "ààààààààà ààààà"
 
-#: ../src/currency-manager.c:58
-#| msgid "Nepalese rupee"
+#: ../src/currency-manager.c:69
 msgid "Nepalese Rupee"
 msgstr "àààààà ààààà"
 
-#: ../src/currency-manager.c:59
-#| msgid "New Zealand dollar"
+#: ../src/currency-manager.c:70
 msgid "New Zealand Dollar"
 msgstr "àààààààààà àààà"
 
-#: ../src/currency-manager.c:60
-#| msgid "Omani rial"
+#: ../src/currency-manager.c:71
 msgid "Omani Rial"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:61
-#| msgid "Peruvian nuevo sol"
+#: ../src/currency-manager.c:72
 msgid "Peruvian Nuevo Sol"
 msgstr "àààààààà ààààà ààà"
 
-#: ../src/currency-manager.c:62
-#| msgid "Philippine peso"
+#: ../src/currency-manager.c:73
 msgid "Philippine Peso"
 msgstr "ààààààààà àààà"
 
-#: ../src/currency-manager.c:63
-#| msgid "Pakistani rupee"
+#: ../src/currency-manager.c:74
 msgid "Pakistani Rupee"
 msgstr "ààààààààà ààààà"
 
-#: ../src/currency-manager.c:64
-#| msgid "Polish zloty"
+#: ../src/currency-manager.c:75
 msgid "Polish Zloty"
 msgstr "ààààààà àààààà"
 
-#: ../src/currency-manager.c:65
-#| msgid "Qatari riyal"
+#: ../src/currency-manager.c:76
 msgid "Qatari Riyal"
 msgstr "ààà àààà"
 
-#: ../src/currency-manager.c:66
-#| msgid "New Romanian leu"
+#: ../src/currency-manager.c:77
 msgid "New Romanian Leu"
 msgstr "ààà àààààààà ààà"
 
-#: ../src/currency-manager.c:67
-#| msgid "Russian rouble"
+#: ../src/currency-manager.c:78
 msgid "Russian Rouble"
 msgstr "àààà àààà"
 
-#: ../src/currency-manager.c:68
-#| msgid "Saudi riyal"
+#: ../src/currency-manager.c:79
 msgid "Saudi Riyal"
 msgstr "ààààà àààà"
 
-#: ../src/currency-manager.c:69
-#| msgid "Swedish krona"
+#: ../src/currency-manager.c:80
 msgid "Swedish Krona"
 msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:70
-#| msgid "Singapore dollar"
+#: ../src/currency-manager.c:81
 msgid "Singapore Dollar"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:71
-#| msgid "Thai baht"
+#: ../src/currency-manager.c:82
 msgid "Thai Baht"
 msgstr "ààà ààà"
 
-#: ../src/currency-manager.c:72
-#| msgid "Tunisian dinar"
+#: ../src/currency-manager.c:83
 msgid "Tunisian Dinar"
 msgstr "ààààààà ààààà"
 
-#: ../src/currency-manager.c:73
-#| msgid "New Turkish lira"
+#: ../src/currency-manager.c:84
 msgid "New Turkish Lira"
 msgstr "ààà àààà àààà"
 
-#: ../src/currency-manager.c:74
+#: ../src/currency-manager.c:85
 msgid "T&T Dollar (TTD)"
 msgstr "T&T àààà (TTD)"
 
-#: ../src/currency-manager.c:75
-#| msgid "US dollar"
+#: ../src/currency-manager.c:86
 msgid "US Dollar"
 msgstr "àààààà àààà"
 
-#: ../src/currency-manager.c:76
-#| msgid "Uruguayan peso"
+#: ../src/currency-manager.c:87
 msgid "Uruguayan Peso"
 msgstr "àààààà àààà"
 
-#: ../src/currency-manager.c:77
-#| msgid "Venezuelan bolÃvar"
+#: ../src/currency-manager.c:88
 msgid "Venezuelan BolÃvar"
 msgstr "ààààààààà ààààààà"
 
-#: ../src/currency-manager.c:78
-#| msgid "South African rand"
+#: ../src/currency-manager.c:89
 msgid "South African Rand"
 msgstr "ààààà ààààààà àààà"
 
+#: ../src/financial.c:70
+#| msgid "Error, operands must be integers"
+msgid "Error: the number of periods must be positive"
+msgstr "àààà: àààààà àà ààààà ààààààà àààà àààààà àà"
+
 #. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:86
+#: ../src/gcalctool.c:77
 #, c-format
 msgid ""
 "Usage:\n"
@@ -880,7 +832,7 @@ msgstr ""
 "  %s â Perform mathematical calculations"
 
 #. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:94
+#: ../src/gcalctool.c:85
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -896,7 +848,7 @@ msgstr ""
 "  --help-gtk                      Show GTK+ options"
 
 #. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:105
+#: ../src/gcalctool.c:96
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -920,303 +872,305 @@ msgstr ""
 "  --g-fatal-warnings              Make all warnings fatal"
 
 #. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:119
+#: ../src/gcalctool.c:110
 #, c-format
+#| msgid ""
+#| "Application Options:\n"
+#| "  -u, --unittest                  Perform unit tests\n"
+#| "  -s, --solve <equation>          Solve the given equation"
 msgid ""
 "Application Options:\n"
-"  -u, --unittest                  Perform unit tests\n"
 "  -s, --solve <equation>          Solve the given equation"
 msgstr ""
 "Application Options:\n"
-"  -u, --unittest                  Perform unit tests\n"
 "  -s, --solve <equation>          Solve the given equation"
 
 #. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:164
+#: ../src/gcalctool.c:154
 #, c-format
 msgid "Argument --solve requires an equation to solve"
 msgstr "Argument --solve requires an equation to solve"
 
 #. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:178
+#: ../src/gcalctool.c:164
 #, c-format
 msgid "Unknown argument '%s'"
 msgstr "ààààà àààààààà '%s'"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:103
+#: ../src/math-buttons.c:96
 msgid "Pi [Ctrl+P]"
 msgstr "ààà [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:99
 msgid "Eulerâs Number"
 msgstr "àààà àààà"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:111
+#: ../src/math-buttons.c:104
 msgid "Subscript mode [Alt]"
 msgstr "ààààà 'à ààà [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:114
+#: ../src/math-buttons.c:107
 msgid "Superscript mode [Ctrl]"
 msgstr "ààà ààà [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:117
+#: ../src/math-buttons.c:110
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "ààààààà ààààààààà [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:120
+#: ../src/math-buttons.c:113
 msgid "Add [+]"
 msgstr "àààà[+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:123
+#: ../src/math-buttons.c:116
 msgid "Subtract [-]"
 msgstr "àààà [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:126
+#: ../src/math-buttons.c:119
 msgid "Multiply [*]"
 msgstr "àààà [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:129
+#: ../src/math-buttons.c:122
 msgid "Divide [/]"
 msgstr "ààà [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:132
+#: ../src/math-buttons.c:125
 msgid "Modulus divide"
 msgstr "ààààààà ààà"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:135
+#: ../src/math-buttons.c:128
 msgid "Additional Functions"
 msgstr "ààà àààààà"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:138
+#: ../src/math-buttons.c:131
 msgid "Exponent [^ or **]"
 msgstr "àààààààà [^ ààà **]"
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:141
+#: ../src/math-buttons.c:134
 msgid "Square [Ctrl+2]"
 msgstr "ààà [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:144
+#: ../src/math-buttons.c:137
 msgid "Percentage [%]"
 msgstr "ààà-ààà [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:147
+#: ../src/math-buttons.c:140
 msgid "Factorial [!]"
 msgstr "ààààààààà [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:150
+#: ../src/math-buttons.c:143
 msgid "Absolute value [|]"
 msgstr "àààà àààà [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:153
+#: ../src/math-buttons.c:146
 msgid "Complex argument"
 msgstr "ààààààà àààààààà"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:156
+#: ../src/math-buttons.c:149
 msgid "Complex conjugate"
 msgstr "ààààààà ààààààà"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:159
+#: ../src/math-buttons.c:152
 msgid "Root [Ctrl+R]"
 msgstr "ààà [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:162
+#: ../src/math-buttons.c:155
 msgid "Square root [Ctrl+R]"
 msgstr "àààààà [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:165
+#: ../src/math-buttons.c:158
 msgid "Logarithm"
 msgstr "ààààààà"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:168
+#: ../src/math-buttons.c:161
 msgid "Natural Logarithm"
 msgstr "àààààà ààààààà"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:171
+#: ../src/math-buttons.c:164
 msgid "Sine"
 msgstr "Sine"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:174
+#: ../src/math-buttons.c:167
 msgid "Cosine"
 msgstr "Cosine"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:177
+#: ../src/math-buttons.c:170
 msgid "Tangent"
 msgstr "Tangent"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:180
+#: ../src/math-buttons.c:173
 msgid "Hyperbolic Sine"
 msgstr "àààààààààà àààà"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:183
+#: ../src/math-buttons.c:176
 msgid "Hyperbolic Cosine"
 msgstr "àààààààààà àààààà"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:186
+#: ../src/math-buttons.c:179
 msgid "Hyperbolic Tangent"
 msgstr "àààààààààà àààààà"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:189
+#: ../src/math-buttons.c:182
 msgid "Inverse [Ctrl+I]"
 msgstr "ààà [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:192
+#: ../src/math-buttons.c:185
 msgid "Boolean AND"
 msgstr "àààààà AND"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:195
+#: ../src/math-buttons.c:188
 msgid "Boolean OR"
 msgstr "àààààà OR"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:198
+#: ../src/math-buttons.c:191
 msgid "Boolean Exclusive OR"
 msgstr "àààààà ààà OR"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:201
+#: ../src/math-buttons.c:194
 msgid "Boolean NOT"
 msgstr "àààààà NOT"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:204 ../src/math-buttons.c:1036
+#: ../src/math-buttons.c:197 ../src/math-buttons.c:1038
 msgid "Integer Component"
 msgstr "àààà ààà àààà ààààà"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:207 ../src/math-buttons.c:1038
+#: ../src/math-buttons.c:200 ../src/math-buttons.c:1040
 msgid "Fractional Component"
 msgstr "ààààààà ààà"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:210
+#: ../src/math-buttons.c:203
 msgid "Real Component"
 msgstr "àààà ààà"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:213
+#: ../src/math-buttons.c:206
 msgid "Imaginary Component"
 msgstr "ààààààààà ààà"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:216
+#: ../src/math-buttons.c:209
 msgid "Ones' Complement"
 msgstr "ààà àà ààà"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:219
+#: ../src/math-buttons.c:212
 msgid "Two's Complement"
 msgstr "àà àà ààà"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:222
+#: ../src/math-buttons.c:215
 msgid "Truncate"
 msgstr "àààààà"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:225
+#: ../src/math-buttons.c:218
 msgid "Start Group [(]"
 msgstr "ààààà ààààà [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:228
+#: ../src/math-buttons.c:221
 msgid "End Group [)]"
 msgstr "ààààà ààà [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:237
+#: ../src/math-buttons.c:230
 msgid "Calculate Result"
 msgstr "àààà ààààà"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:240
+#: ../src/math-buttons.c:233
 msgid "Factorize [Ctrl+F]"
 msgstr "ààààààà [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:243
+#: ../src/math-buttons.c:236
 msgid "Clear Display [Escape]"
 msgstr "ààààààà àààà ààà [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:246
+#: ../src/math-buttons.c:239
 msgid "Undo [Ctrl+Z]"
 msgstr "àààà [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:258
+#: ../src/math-buttons.c:251
 msgid "Double Declining Depreciation"
 msgstr "àààà àààà àààààà ààà"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:264
+#: ../src/math-buttons.c:257
 msgid "Financial Term"
 msgstr "ààààà ààà"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:267
+#: ../src/math-buttons.c:260
 msgid "Sum of the Years Digits Depreciation"
 msgstr "ààààà ààààà àà àààà àààà ààà"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:270
+#: ../src/math-buttons.c:263
 msgid "Straight Line Depreciation"
 msgstr "ààà-àààà ààà"
 
 #  Strings for each base value.
 #. Number display mode combo: Binary, e.g. 10011010010â
-#: ../src/math-buttons.c:660
+#: ../src/math-buttons.c:653
 msgid "Binary"
 msgstr "àààààà"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:664
+#: ../src/math-buttons.c:657
 msgid "Octal"
 msgstr "ààààà"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:668
+#: ../src/math-buttons.c:661
 msgid "Decimal"
 msgstr "àààààà"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:672
+#: ../src/math-buttons.c:665
 msgid "Hexadecimal"
 msgstr "ààààààààààà"
 
 #. Left Shift Popup: Menu item to shift left by n places (n < 10)
 #. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:946 ../src/math-buttons.c:990
+#: ../src/math-buttons.c:948 ../src/math-buttons.c:992
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1225,7 +1179,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:950 ../src/math-buttons.c:994
+#: ../src/math-buttons.c:952 ../src/math-buttons.c:996
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1233,146 +1187,156 @@ msgstr[0] "%d ààà"
 msgstr[1] "%d ààààà"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1040
+#: ../src/math-buttons.c:1042
 msgid "Round"
 msgstr "ààààà"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1042
+#: ../src/math-buttons.c:1044
 msgid "Floor"
 msgstr "àààà"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1044
+#: ../src/math-buttons.c:1046
 msgid "Ceiling"
 msgstr "àààààà"
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1046
+#: ../src/math-buttons.c:1048
 msgid "Sign"
 msgstr "àààà"
 
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:359
+#: ../src/math-converter.c:412
 msgid " in "
 msgstr " àààà "
 
+#. Tooltip for swap conversion button
+#: ../src/math-converter.c:427
+msgid "Switch conversion units"
+msgstr "àààà ààààààà ààààà"
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:461
+#: ../src/math-equation.c:458
 msgid "No undo history"
 msgstr "ààà ààààà àààà àààà"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:486
+#: ../src/math-equation.c:485
 msgid "No redo history"
 msgstr "ààà ààà-ààààà àààà àààà"
 
-#: ../src/math-equation.c:875
+#: ../src/math-equation.c:943
 msgid "No sane value to store"
 msgstr "àààààà àà sane àààà àààà"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1140
+#: ../src/math-equation.c:1225
 msgid "Overflow. Try a bigger word size"
 msgstr "àààà ààà ààà àààà àààà àààà àààà ààààà"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1145
+#: ../src/math-equation.c:1230
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "ààààà àààààà '%s'"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1150
+#: ../src/math-equation.c:1235
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "àààààà '%s' ààààà àààà"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1155
+#: ../src/math-equation.c:1240
 msgid "Unknown conversion"
 msgstr "ààààà ààààà"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1164
+#: ../src/math-equation.c:1249
 msgid "Malformed expression"
 msgstr "àààà àààààà"
 
+#: ../src/math-equation.c:1263
+#| msgid "C_alculate"
+msgid "Calculating"
+msgstr "ààààà àààà àà ààà àà"
+
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1296
+#: ../src/math-equation.c:1394
 msgid "Need an integer to factorize"
 msgstr "ààààààà ààààà àà àààà ààà àààààà àà"
 
 #. This message is displayed in the status bar when a bit
 #. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1363
+#: ../src/math-equation.c:1469
 msgid "No sane value to bitwise shift"
 msgstr "bitwise shift àà sane àààà àààà"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1392
+#: ../src/math-equation.c:1500
 msgid "Displayed value not an integer"
 msgstr "àààààà àààà àààà ààà àààà àà"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1815
+#: ../src/math-equation.c:1925
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
 #. Label on close button in preferences dialog
-#: ../src/math-preferences.c:244
+#: ../src/math-preferences.c:236
 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:254 ../src/unit-manager.c:43
+#: ../src/math-preferences.c:246 ../src/unit-manager.c:54
 msgid "Degrees"
 msgstr "ààààà"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:258 ../src/unit-manager.c:44
+#: ../src/math-preferences.c:250 ../src/unit-manager.c:55
 msgid "Radians"
 msgstr "àààààà"
 
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:262 ../src/unit-manager.c:45
+#: ../src/math-preferences.c:254 ../src/unit-manager.c:56
 msgid "Gradians"
 msgstr "ààààààà"
 
 #. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234Ã10^99)
-#: ../src/math-preferences.c:272
+#: ../src/math-preferences.c:264
 msgid "Automatic"
 msgstr "àààààààà"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:276
+#: ../src/math-preferences.c:268
 msgid "Fixed"
 msgstr "àààà"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã10^3
-#: ../src/math-preferences.c:280
+#: ../src/math-preferences.c:272
 msgid "Scientific"
 msgstr "àààààààà"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:284
+#: ../src/math-preferences.c:276
 msgid "Engineering"
 msgstr "àààààààààà"
 
 #. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:295
+#: ../src/math-preferences.c:287
 #, 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
+#: ../src/math-window.c:172
 msgid "Unable to open help file"
 msgstr "àààà àààà àààààà àà àààààà"
 
 #. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:203
+#: ../src/math-window.c:204
 msgid "translator-credits"
 msgstr ""
 "ààààààà àààà àààààààà (jaswinderphulewala yahoo com) àààà\n"
@@ -1381,7 +1345,7 @@ msgstr ""
 "http://www.satluj.com/";
 
 #. The license this software is under (GPL2+)
-#: ../src/math-window.c:206
+#: ../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"
@@ -1411,901 +1375,924 @@ msgstr ""
 "àààààà ààààà,ààààà, àà à ààààà-àààà, àààààà ààà ààààà"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:223
+#: ../src/math-window.c:224
 msgid "Gcalctool"
 msgstr "àà-ààààààààà"
 
 #. Copyright notice in the about dialog
-#: ../src/math-window.c:227
+#: ../src/math-window.c:228
 msgid "Â 1986â2010 The Gcalctool authors"
 msgstr "Â àààà-àààà  Gcalctool àààà"
 
 #. Short description in the about dialog
-#: ../src/math-window.c:231
+#: ../src/math-window.c:232
 msgid "Calculator with financial and scientific modes."
 msgstr "ààààà ààà àààààààà ààààà àààà ààààààààà ààà"
 
 #. Calculator menu
-#: ../src/math-window.c:357
+#: ../src/math-window.c:381
 msgid "_Calculator"
 msgstr "ààààààààà(_C)"
 
 #. Mode menu
-#: ../src/math-window.c:359
+#: ../src/math-window.c:383
 msgid "_Mode"
 msgstr "ààà(_M)"
 
 #. Help menu label
-#: ../src/math-window.c:361
+#: ../src/math-window.c:385
 msgid "_Help"
 msgstr "àààà(_H)"
 
 #. Basic menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:387
 msgid "_Basic"
 msgstr "àààààà(_B)"
 
 #. Advanced menu label
-#: ../src/math-window.c:365
+#: ../src/math-window.c:389
 msgid "_Advanced"
 msgstr "àààààà(_A)"
 
 #. Financial menu label
-#: ../src/math-window.c:367
+#: ../src/math-window.c:391
 msgid "_Financial"
 msgstr "ààààà(_F)"
 
 #. Programming menu label
-#: ../src/math-window.c:369
+#: ../src/math-window.c:393
 msgid "_Programming"
 msgstr "àààààààààà(_P)"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:371
+#: ../src/math-window.c:395
 msgid "_Contents"
 msgstr "àààààà(_C)"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:122
+#: ../src/mp-binary.c:115
 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:135
+#: ../src/mp-binary.c:128
 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:148
+#: ../src/mp-binary.c:141
 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:163
+#: ../src/mp-binary.c:156
 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:194
+#: ../src/mp-binary.c:187
 msgid "Shift is only possible on integer values"
 msgstr "àààà ààà àààààà àà ààààà àààà àà"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:156
+#: ../src/mp.c:148
 msgid "Argument not defined for zero"
 msgstr "ààààà àà àààààààà àààà ààààà àà àààà"
 
-#: ../src/mp.c:307
+#: ../src/mp.c:299
 msgid "Overflow: the result couldn't be calculated"
 msgstr "àààààà: ààààà ààààà àààà àà àààà"
 
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:652 ../src/mp.c:684 ../src/mp.c:1618
+#: ../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:1289 ../src/mp.c:1326
+#: ../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:1691 ../src/mp.c:2006
+#: ../src/mp.c:1680 ../src/mp.c:1994
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "ààààààà ààà àà ààààà àà ààà àààà àààà àà"
 
-#: ../src/mp.c:1716
+#: ../src/mp.c:1704
 msgid "Reciprocal of zero is undefined"
 msgstr "ààààà àà ààà àààà àààà àà"
 
-#: ../src/mp.c:1801
+#: ../src/mp.c:1789
 msgid "Root must be non-zero"
 msgstr "ààà àààà-ààààà àààà àààààà àà"
 
-#: ../src/mp.c:1819
+#: ../src/mp.c:1807
 msgid "Negative root of zero is undefined"
 msgstr "ààààà àà ààààààà ààà àààà àààà"
 
-#: ../src/mp.c:1825
+#: ../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:1946
+#: ../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:1966
+#: ../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:318
+#: ../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:363
+#: ../src/mp-trigonometric.c:355
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "ààà àààà [-1, 1] ààààà àààààà àà àààà àààà"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/mp-trigonometric.c:380
+#: ../src/mp-trigonometric.c:372
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "ààà àààààà [-1, 1] ààààà àààààà àà àààà àààà"
 
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../src/mp-trigonometric.c:599
+#: ../src/mp-trigonometric.c:591
 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:623
+#: ../src/mp-trigonometric.c:615
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr "ààà ààààààààà ààààààà [-1, 1] ààààà àààààà àà àààà àààà"
 
-#: ../src/unit-manager.c:43
+#: ../src/unit-manager.c:54
 #, c-format
-#| msgid "Degrees"
 msgctxt "unit-format"
 msgid "%s degrees"
 msgstr "%s ààààààà"
 
-#: ../src/unit-manager.c:43
+#: ../src/unit-manager.c:54
 msgctxt "unit-symbols"
 msgid "degree,degrees,deg"
 msgstr "ààààà,ààààààà,deg"
 
-#: ../src/unit-manager.c:44
+#: ../src/unit-manager.c:55
 #, c-format
-#| msgid "Gradians"
 msgctxt "unit-format"
 msgid "%s radians"
 msgstr "%s àààààà"
 
-#: ../src/unit-manager.c:44
+#: ../src/unit-manager.c:55
 msgctxt "unit-symbols"
 msgid "radian,radians,rad"
 msgstr "àààààà,àààààà,rad"
 
-#: ../src/unit-manager.c:45
+#: ../src/unit-manager.c:56
 #, c-format
-#| msgid "Gradians"
 msgctxt "unit-format"
 msgid "%s gradians"
 msgstr "%s ààààààà"
 
-#: ../src/unit-manager.c:45
+#: ../src/unit-manager.c:56
 msgctxt "unit-symbols"
 msgid "gradian,gradians,grad"
 msgstr "àààààààà,àààààààà,grad"
 
-#: ../src/unit-manager.c:46
-#| msgid "Paste"
+#: ../src/unit-manager.c:57
 msgid "Parsecs"
 msgstr "Parsecs"
 
-#: ../src/unit-manager.c:46
+#: ../src/unit-manager.c:57
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
 msgid "%s pc"
 msgstr "%s pc"
 
-#: ../src/unit-manager.c:46
+#: ../src/unit-manager.c:57
 msgctxt "unit-symbols"
 msgid "parsec,parsecs,pc"
 msgstr "parsec,parsecs,pc"
 
-#: ../src/unit-manager.c:47
+#: ../src/unit-manager.c:58
 msgid "Light Years"
 msgstr "ààààààà ààà"
 
-#: ../src/unit-manager.c:47
+#: ../src/unit-manager.c:58
 #, c-format
 msgctxt "unit-format"
 msgid "%s ly"
 msgstr "%s ly"
 
-#: ../src/unit-manager.c:47
+#: ../src/unit-manager.c:58
 msgctxt "unit-symbols"
 msgid "lightyear,lightyears,ly"
 msgstr "àààààààààà,àààààààààà,ly"
 
-#: ../src/unit-manager.c:48
+#: ../src/unit-manager.c:59
 msgid "Astronomical Units"
 msgstr "àààààà àààà"
 
-#: ../src/unit-manager.c:48
+#: ../src/unit-manager.c:59
 #, c-format
 msgctxt "unit-format"
 msgid "%s au"
 msgstr "%s au"
 
-#: ../src/unit-manager.c:48
+#: ../src/unit-manager.c:59
 msgctxt "unit-symbols"
 msgid "au"
 msgstr "au"
 
-#: ../src/unit-manager.c:49
+#: ../src/unit-manager.c:60
 msgid "Nautical Miles"
 msgstr "àààààà ààà"
 
-#: ../src/unit-manager.c:49 ../src/unit-manager.c:61
+#: ../src/unit-manager.c:60
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%s nm"
 msgctxt "unit-format"
-msgid "%s nm"
-msgstr "%s nm"
+msgid "%s nmi"
+msgstr "%s nmi"
 
-#: ../src/unit-manager.c:49
+#: ../src/unit-manager.c:60
+#| msgctxt "unit-symbols"
+#| msgid "nm"
 msgctxt "unit-symbols"
-msgid "nm"
-msgstr "nm"
+msgid "nmi"
+msgstr "nmi"
 
-#: ../src/unit-manager.c:50
+#: ../src/unit-manager.c:61
 msgid "Miles"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:50
+#: ../src/unit-manager.c:61
 #, c-format
 msgctxt "unit-format"
 msgid "%s mi"
 msgstr "%s mi"
 
-#: ../src/unit-manager.c:50
+#: ../src/unit-manager.c:61
 msgctxt "unit-symbols"
 msgid "mile,miles,mi"
 msgstr "ààà,ààà,mi"
 
-#: ../src/unit-manager.c:51
+#: ../src/unit-manager.c:62
 msgid "Kilometers"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:51
+#: ../src/unit-manager.c:62
 #, c-format
 msgctxt "unit-format"
 msgid "%s km"
 msgstr "%s km"
 
-#: ../src/unit-manager.c:51
+#: ../src/unit-manager.c:62
 msgctxt "unit-symbols"
 msgid "kilometer,kilometers,km,kms"
 msgstr "àààààààà,àààààààà,km,kms"
 
-#: ../src/unit-manager.c:52
+#: ../src/unit-manager.c:63
 msgid "Cables"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:52
+#: ../src/unit-manager.c:63
 #, c-format
 msgctxt "unit-format"
 msgid "%s cb"
 msgstr "%s cb"
 
-#: ../src/unit-manager.c:52
+#: ../src/unit-manager.c:63
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
 msgstr "àààà,àààà,cb"
 
-#: ../src/unit-manager.c:53
+#: ../src/unit-manager.c:64
 msgid "Fathoms"
 msgstr "Fathoms"
 
-#: ../src/unit-manager.c:53
+#: ../src/unit-manager.c:64
 #, c-format
 msgctxt "unit-format"
 msgid "%s ftm"
 msgstr "%s ftm"
 
-#: ../src/unit-manager.c:53
+#: ../src/unit-manager.c:64
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
 msgstr "fathom,fathoms,ftm"
 
-#: ../src/unit-manager.c:54
+#: ../src/unit-manager.c:65
 msgid "Meters"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:54
+#: ../src/unit-manager.c:65
 #, c-format
 msgctxt "unit-format"
 msgid "%s m"
 msgstr "%s m"
 
-#: ../src/unit-manager.c:54
+#: ../src/unit-manager.c:65
 msgctxt "unit-symbols"
 msgid "meter,meters,m"
 msgstr "àààà,àààà,m"
 
-#: ../src/unit-manager.c:55
+#: ../src/unit-manager.c:66
 msgid "Yards"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:55
+#: ../src/unit-manager.c:66
 #, c-format
 msgctxt "unit-format"
 msgid "%s yd"
 msgstr "%s yd"
 
-#: ../src/unit-manager.c:55
+#: ../src/unit-manager.c:66
 msgctxt "unit-symbols"
 msgid "yard,yards,yd"
 msgstr "àààà,àààà,yd"
 
-#: ../src/unit-manager.c:56
+#: ../src/unit-manager.c:67
 msgid "Feet"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:56
+#: ../src/unit-manager.c:67
 #, c-format
 msgctxt "unit-format"
 msgid "%s ft"
 msgstr "%s ft"
 
-#: ../src/unit-manager.c:56
+#: ../src/unit-manager.c:67
 msgctxt "unit-symbols"
 msgid "foot,feet,ft"
 msgstr "àààà,àààà,ft"
 
-#: ../src/unit-manager.c:57
-#| msgid "Inverse"
+#: ../src/unit-manager.c:68
 msgid "Inches"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:57
+#: ../src/unit-manager.c:68
 #, c-format
-#| msgid "sin"
 msgctxt "unit-format"
 msgid "%s in"
 msgstr "%s in"
 
-#: ../src/unit-manager.c:57
+#: ../src/unit-manager.c:68
 msgctxt "unit-symbols"
 msgid "inch,inches,in"
 msgstr "ààà,ààà,in"
 
-#: ../src/unit-manager.c:58
-#| msgid "_Contents"
+#: ../src/unit-manager.c:69
 msgid "Centimeters"
 msgstr "ààààààààà"
 
-#: ../src/unit-manager.c:58
+#: ../src/unit-manager.c:69
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm"
 msgstr "%s cm"
 
-#: ../src/unit-manager.c:58
+#: ../src/unit-manager.c:69
 msgctxt "unit-symbols"
 msgid "centimeter,centimeters,cm,cms"
 msgstr "ààààààààà,ààààààààà,cm,cms"
 
-#: ../src/unit-manager.c:59
+#: ../src/unit-manager.c:70
 msgid "Millimeters"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:59
+#: ../src/unit-manager.c:70
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm"
 msgstr "%s mm"
 
-#: ../src/unit-manager.c:59
+#: ../src/unit-manager.c:70
 msgctxt "unit-symbols"
 msgid "millimeter,millimeters,mm"
 msgstr "àààààààà,àààààààà,mm"
 
-#: ../src/unit-manager.c:60
+#: ../src/unit-manager.c:71
 msgid "Micrometers"
 msgstr "àààààààààà"
 
-#: ../src/unit-manager.c:60
+#: ../src/unit-manager.c:71
 #, c-format
 msgctxt "unit-format"
 msgid "%s Îm"
 msgstr "%s Îm"
 
-#: ../src/unit-manager.c:60
+#: ../src/unit-manager.c:71
 msgctxt "unit-symbols"
 msgid "micrometer,micrometers,um"
 msgstr "àààààààààà,àààààààààà,um"
 
-#: ../src/unit-manager.c:61
+#: ../src/unit-manager.c:72
 msgid "Nanometers"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:61
+#: ../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"
 msgctxt "unit-symbols"
-msgid "nanometer,nanometers"
-msgstr "àààààààà,àààààààà"
+msgid "nanometer,nanometers,nm"
+msgstr "àààààààà,àààààààà,nm"
 
-#: ../src/unit-manager.c:62
+#: ../src/unit-manager.c:73
 msgid "Hectares"
 msgstr "ààààààà"
 
-#: ../src/unit-manager.c:62
+#: ../src/unit-manager.c:73
 #, c-format
 msgctxt "unit-format"
 msgid "%s ha"
 msgstr "%s ha"
 
-#: ../src/unit-manager.c:62
+#: ../src/unit-manager.c:73
 msgctxt "unit-symbols"
 msgid "hectare,hectares,ha"
 msgstr "ààààààà,ààààààà,ha"
 
-#: ../src/unit-manager.c:63
+#: ../src/unit-manager.c:74
 msgid "Acres"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:63
+#: ../src/unit-manager.c:74
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
 msgid "%s acres"
 msgstr "%s ààà"
 
-#: ../src/unit-manager.c:63
+#: ../src/unit-manager.c:74
 msgctxt "unit-symbols"
 msgid "acre,acres"
 msgstr "ààà,ààà"
 
-#: ../src/unit-manager.c:64
-#| msgid "Square root"
-msgid "Square Meter"
+#: ../src/unit-manager.c:75
+#| msgid "Square Meter"
+msgid "Square Meters"
 msgstr "ààà àààà"
 
-#: ../src/unit-manager.c:64
+#: ../src/unit-manager.c:75
 #, c-format
 msgctxt "unit-format"
 msgid "%s mÂ"
 msgstr "%s mÂ"
 
-#: ../src/unit-manager.c:64
+#: ../src/unit-manager.c:75
 msgctxt "unit-symbols"
 msgid "mÂ"
 msgstr "mÂ"
 
-#: ../src/unit-manager.c:65
-#| msgid "Square [Ctrl+2]"
-msgid "Square Centimeter"
+#: ../src/unit-manager.c:76
+#| msgid "Square Centimeter"
+msgid "Square Centimeters"
 msgstr "ààà ààààààààà"
 
-#: ../src/unit-manager.c:65
+#: ../src/unit-manager.c:76
 #, c-format
 msgctxt "unit-format"
 msgid "%s cmÂ"
 msgstr "%s cmÂ"
 
-#: ../src/unit-manager.c:65
+#: ../src/unit-manager.c:76
 msgctxt "unit-symbols"
 msgid "cmÂ"
 msgstr "cmÂ"
 
-#: ../src/unit-manager.c:66
-msgid "Square Millimeter"
+#: ../src/unit-manager.c:77
+#| msgid "Square Millimeter"
+msgid "Square Millimeters"
 msgstr "ààà àààààààà"
 
-#: ../src/unit-manager.c:66
+#: ../src/unit-manager.c:77
 #, c-format
 msgctxt "unit-format"
 msgid "%s mmÂ"
 msgstr "%s mmÂ"
 
-#: ../src/unit-manager.c:66
+#: ../src/unit-manager.c:77
 msgctxt "unit-symbols"
 msgid "mmÂ"
 msgstr "mmÂ"
 
-#: ../src/unit-manager.c:67
+#: ../src/unit-manager.c:78
 msgid "Cubic Meters"
 msgstr "àà àààà"
 
-#: ../src/unit-manager.c:67
+#: ../src/unit-manager.c:78
 #, c-format
 msgctxt "unit-format"
 msgid "%s mÂ"
 msgstr "%s mÂ"
 
-#: ../src/unit-manager.c:67
+#: ../src/unit-manager.c:78
 msgctxt "unit-symbols"
 msgid "mÂ"
 msgstr "mÂ"
 
-#: ../src/unit-manager.c:68
+#: ../src/unit-manager.c:79
 msgid "Gallons"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:68
+#: ../src/unit-manager.c:79
 #, c-format
 msgctxt "unit-format"
 msgid "%s gal"
 msgstr "%s gal"
 
-#: ../src/unit-manager.c:68
+#: ../src/unit-manager.c:79
 msgctxt "unit-symbols"
 msgid "gallon,gallons,gal"
 msgstr "àààà,àààà,gal"
 
-#: ../src/unit-manager.c:69
+#: ../src/unit-manager.c:80
 msgid "Litres"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:69
+#: ../src/unit-manager.c:80
 #, c-format
 msgctxt "unit-format"
 msgid "%s L"
 msgstr "%s L"
 
-#: ../src/unit-manager.c:69
+#: ../src/unit-manager.c:80
 msgctxt "unit-symbols"
 msgid "litre,litres,liter,liters,L"
 msgstr "àààà,àààà,àààà,àààà,L"
 
-#: ../src/unit-manager.c:70
+#: ../src/unit-manager.c:81
 msgid "Quarts"
 msgstr "ààààà"
 
-#: ../src/unit-manager.c:70
+#: ../src/unit-manager.c:81
 #, c-format
 msgctxt "unit-format"
 msgid "%s qt"
 msgstr "%s qt"
 
-#: ../src/unit-manager.c:70
+#: ../src/unit-manager.c:81
 msgctxt "unit-symbols"
 msgid "quart,quarts,qt"
 msgstr "ààààà,ààààà,qt"
 
-#: ../src/unit-manager.c:71
+#: ../src/unit-manager.c:82
 msgid "Pints"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:71
+#: ../src/unit-manager.c:82
 #, c-format
 msgctxt "unit-format"
 msgid "%s pt"
 msgstr "%s pt"
 
-#: ../src/unit-manager.c:71
+#: ../src/unit-manager.c:82
 msgctxt "unit-symbols"
 msgid "pint,pints,pt"
 msgstr "pint,pints,pt"
 
-#: ../src/unit-manager.c:72
+#: ../src/unit-manager.c:83
 msgid "Millilitres"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:72
+#: ../src/unit-manager.c:83
 #, c-format
 msgctxt "unit-format"
 msgid "%s mL"
 msgstr "%s mL"
 
-#: ../src/unit-manager.c:72
+#: ../src/unit-manager.c:83
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
 msgstr "àààààààà,àààààààà,àààààààà,àààààààà,mL,cmÂ"
 
-#: ../src/unit-manager.c:73
-msgid "Microlitre"
+#: ../src/unit-manager.c:84
+#| msgid "Microlitre"
+msgid "Microlitres"
 msgstr "àààààààààà"
 
-#: ../src/unit-manager.c:73
+#: ../src/unit-manager.c:84
 #, c-format
 msgctxt "unit-format"
 msgid "%s ÎL"
 msgstr "%s ÎL"
 
-#: ../src/unit-manager.c:73
+#: ../src/unit-manager.c:84
 msgctxt "unit-symbols"
 msgid "mmÂ,ÎL,uL"
 msgstr "mmÂ,ÎL,uL"
 
-#: ../src/unit-manager.c:74
+#: ../src/unit-manager.c:85
 msgid "Tonnes"
 msgstr "àà"
 
-#: ../src/unit-manager.c:74
+#: ../src/unit-manager.c:85
 #, c-format
 msgctxt "unit-format"
 msgid "%s T"
 msgstr "%s T"
 
-#: ../src/unit-manager.c:74
+#: ../src/unit-manager.c:85
 msgctxt "unit-symbols"
 msgid "tonne,tonnes"
 msgstr "àà,àà"
 
-#: ../src/unit-manager.c:75
+#: ../src/unit-manager.c:86
 msgid "Kilograms"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:75
+#: ../src/unit-manager.c:86
 #, c-format
 msgctxt "unit-format"
 msgid "%s kg"
 msgstr "%s kg"
 
-#: ../src/unit-manager.c:75
+#: ../src/unit-manager.c:86
 msgctxt "unit-symbols"
 msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
 msgstr "àààààààà,àààààààà,àààààààà,àààààààà,àààààààà,kg,kgs"
 
-#: ../src/unit-manager.c:76
-#| msgid "Round"
+#: ../src/unit-manager.c:87
 msgid "Pounds"
 msgstr "ààààà"
 
-#: ../src/unit-manager.c:76
+#: ../src/unit-manager.c:87
 #, c-format
 msgctxt "unit-format"
 msgid "%s lb"
 msgstr "%s lb"
 
-#: ../src/unit-manager.c:76
+#: ../src/unit-manager.c:87
 msgctxt "unit-symbols"
 msgid "pound,pounds,lb"
 msgstr "ààààà,ààààà,lb"
 
-#: ../src/unit-manager.c:77
+#: ../src/unit-manager.c:88
 msgid "Ounces"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:77
+#: ../src/unit-manager.c:88
 #, c-format
 msgctxt "unit-format"
 msgid "%s oz"
 msgstr "%s oz"
 
-#: ../src/unit-manager.c:77
+#: ../src/unit-manager.c:88
 msgctxt "unit-symbols"
 msgid "ounce,ounces,oz"
 msgstr "ààà,ààà,oz"
 
-#: ../src/unit-manager.c:78
-#| msgid "Gradians"
+#: ../src/unit-manager.c:89
 msgid "Grams"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:78
+#: ../src/unit-manager.c:89
 #, c-format
 msgctxt "unit-format"
 msgid "%s g"
 msgstr "%s g"
 
-#: ../src/unit-manager.c:78
+#: ../src/unit-manager.c:89
 msgctxt "unit-symbols"
 msgid "gram,grams,gramme,grammes,g"
 msgstr "àààà,àààà,àààà,àààà,g"
 
-#: ../src/unit-manager.c:79
-#| msgid "Clear"
+#: ../src/unit-manager.c:90
 msgid "Years"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:79
+#: ../src/unit-manager.c:90
 #, c-format
 msgctxt "unit-format"
 msgid "%s years"
 msgstr "%s ààà"
 
-#: ../src/unit-manager.c:79
+#: ../src/unit-manager.c:90
 msgctxt "unit-symbols"
 msgid "year,years"
 msgstr "ààà,ààà"
 
-#: ../src/unit-manager.c:80
+#: ../src/unit-manager.c:91
 msgid "Days"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:80
+#: ../src/unit-manager.c:91
 #, c-format
 msgctxt "unit-format"
 msgid "%s days"
 msgstr "%s ààà"
 
-#: ../src/unit-manager.c:80
+#: ../src/unit-manager.c:91
 msgctxt "unit-symbols"
 msgid "day,days"
 msgstr "ààà,ààà"
 
-#: ../src/unit-manager.c:81
+#: ../src/unit-manager.c:92
 msgid "Hours"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:81
+#: ../src/unit-manager.c:92
 #, c-format
 msgctxt "unit-format"
 msgid "%s hours"
 msgstr "%s àààà"
 
-#: ../src/unit-manager.c:81
+#: ../src/unit-manager.c:92
 msgctxt "unit-symbols"
 msgid "hour,hours"
 msgstr "àààà,àààà"
 
-#: ../src/unit-manager.c:82
+#: ../src/unit-manager.c:93
 msgid "Minutes"
 msgstr "àààà"
 
-#: ../src/unit-manager.c:82
+#: ../src/unit-manager.c:93
 #, c-format
 msgctxt "unit-format"
 msgid "%s minutes"
 msgstr "%s àààà"
 
-#: ../src/unit-manager.c:82
+#: ../src/unit-manager.c:93
 msgctxt "unit-symbols"
 msgid "minute,minutes"
 msgstr "àààà,àààà"
 
-#: ../src/unit-manager.c:83
-#| msgid "cos"
+#: ../src/unit-manager.c:94
 msgid "Seconds"
 msgstr "ààààà"
 
-#: ../src/unit-manager.c:83
+#: ../src/unit-manager.c:94
 #, c-format
 msgctxt "unit-format"
 msgid "%s s"
 msgstr "%s s"
 
-#: ../src/unit-manager.c:83
+#: ../src/unit-manager.c:94
 msgctxt "unit-symbols"
 msgid "second,seconds,s"
 msgstr "ààààà,ààààà,s"
 
-#: ../src/unit-manager.c:84
+#: ../src/unit-manager.c:95
 msgid "Milliseconds"
 msgstr "ààààààààà"
 
-#: ../src/unit-manager.c:84
+#: ../src/unit-manager.c:95
 #, c-format
 msgctxt "unit-format"
 msgid "%s ms"
 msgstr "%s ms"
 
-#: ../src/unit-manager.c:84
+#: ../src/unit-manager.c:95
 msgctxt "unit-symbols"
 msgid "millisecond,milliseconds,ms"
 msgstr "ààààààààà,ààààààààà,ms"
 
-#: ../src/unit-manager.c:85
+#: ../src/unit-manager.c:96
 msgid "Microseconds"
 msgstr "ààààààààààà"
 
-#: ../src/unit-manager.c:85
+#: ../src/unit-manager.c:96
 #, c-format
 msgctxt "unit-format"
 msgid "%s Îs"
 msgstr "%s Îs"
 
-#: ../src/unit-manager.c:85
+#: ../src/unit-manager.c:96
+#| msgctxt "unit-symbols"
+#| msgid "microsecond,microseconds,us"
 msgctxt "unit-symbols"
-msgid "microsecond,microseconds,us"
-msgstr "ààààààààààà,ààààààààààà,us"
+msgid "microsecond,microseconds,us,Îs"
+msgstr "ààààààààààà,ààààààààààà,us,Îs"
 
-#: ../src/unit-manager.c:86
+#: ../src/unit-manager.c:97
 msgid "Celcius"
 msgstr "ààààààà"
 
-#: ../src/unit-manager.c:86
+#: ../src/unit-manager.c:97
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËC"
 msgctxt "unit-format"
-msgid "%sËC"
-msgstr "%sËC"
+msgid "%s ËC"
+msgstr "%s ËC"
 
-#: ../src/unit-manager.c:86
+#: ../src/unit-manager.c:97
 msgctxt "unit-symbols"
 msgid "degC,ËC"
 msgstr "degC,ËC"
 
-#: ../src/unit-manager.c:87
+#: ../src/unit-manager.c:98
 msgid "Farenheit"
 msgstr "àààààààà"
 
-#: ../src/unit-manager.c:87
+#: ../src/unit-manager.c:98
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËF"
 msgctxt "unit-format"
-msgid "%sËF"
-msgstr "%sËF"
+msgid "%s ËF"
+msgstr "%s ËF"
 
-#: ../src/unit-manager.c:87
+#: ../src/unit-manager.c:98
 msgctxt "unit-symbols"
 msgid "degF,ËF"
 msgstr "degF,ËF"
 
-#: ../src/unit-manager.c:88
-#| msgid "Ceiling"
+#: ../src/unit-manager.c:99
 msgid "Kelvin"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:88
+#: ../src/unit-manager.c:99
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%s m"
 msgctxt "unit-format"
-msgid "%sËK"
-msgstr "%sËK"
+msgid "%s K"
+msgstr "%s K"
 
-#: ../src/unit-manager.c:88
+#: ../src/unit-manager.c:99
 msgctxt "unit-symbols"
-msgid "degK,ËK"
-msgstr "degK,ËK"
+msgid "K"
+msgstr "K"
 
-#: ../src/unit-manager.c:89
+#: ../src/unit-manager.c:100
 msgid "Rankine"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:89
+#: ../src/unit-manager.c:100
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËR"
 msgctxt "unit-format"
-msgid "%sËR"
-msgstr "%sËR"
+msgid "%s ËR"
+msgstr "%s ËR"
 
-#: ../src/unit-manager.c:89
+#: ../src/unit-manager.c:100
+#| msgctxt "unit-symbols"
+#| msgid "degR,ËR"
 msgctxt "unit-symbols"
-msgid "degR,ËR"
-msgstr "degR,ËR"
+msgid "degR,ËR,ËRa"
+msgstr "degR,ËR,ËRa"
 
-#: ../src/unit-manager.c:98
-#| msgid "Angle units"
+#: ../src/unit-manager.c:109
 msgid "Angle"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:99
+#: ../src/unit-manager.c:110
 msgid "Length"
 msgstr "ààààà"
 
-#: ../src/unit-manager.c:100
+#: ../src/unit-manager.c:111
 msgid "Area"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:101
-#| msgid "Value"
+#: ../src/unit-manager.c:112
 msgid "Volume"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:102
+#: ../src/unit-manager.c:113
 msgid "Weight"
 msgstr "ààà"
 
-#: ../src/unit-manager.c:103
+#: ../src/unit-manager.c:114
 msgid "Duration"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:104
+#: ../src/unit-manager.c:115
 msgid "Temperature"
 msgstr "àààààà"
 
-#: ../src/unit-manager.c:116
-#| msgid "Source currency"
+#: ../src/unit-manager.c:127
 msgid "Currency"
 msgstr "ààààà"
 
+#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
+#: ../src/unit-manager.c:137
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s s"
+msgid "%s%%s"
+msgstr "%s%%s"
+
+#~ msgctxt "unit-format"
+#~ msgid "%sËK"
+#~ msgstr "%sËK"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degK,ËK"
+#~ msgstr "degK,ËK"
+
 #~ msgid "Recall"
 #~ msgstr "Recall"
 
@@ -2850,9 +2837,6 @@ msgstr "ààààà"
 #~ msgid "Factorial of displayed value [!]"
 #~ msgstr "ààààà àà àààà àà ààààààààà [!]"
 
-#~ msgid "Frac"
-#~ msgstr "à-ààà"
-
 #~ msgid "Fractional portion of displayed value [:]"
 #~ msgstr "ààààà àààà àà àààààà àààà ààààà [:]"
 
@@ -3444,9 +3428,6 @@ msgstr "ààààà"
 #~ msgid "-a needs accuracy value"
 #~ msgstr "-a ààà ààààà àààà àà ààààà àà"
 
-#~ msgid "Error, operands must be integers"
-#~ msgstr "àààà, àààààà àààà ààà àààà àààààà àà"
-
 #~ msgid "Cleared display, prefix without an operator is not allowed"
 #~ msgstr "àààà àààà àààà,ààààààà ààà ààààà ààààà àààààà àààà"