[gcalctool] Updated Gujarati Translations

[Sweta Kothari <swkothar src gnome org>]

commit 48e9e69c2df4422fa5b961d5ed6cd05b9471b681
Author: Sweta Kothari <swkothar redhat com>
Date:   Tue Sep 20 11:02:13 2011 +0530

    Updated Gujarati Translations

 po/gu.po |  646 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 350 insertions(+), 296 deletions(-)
---
diff --git a/po/gu.po b/po/gu.po
index 0783df2..32cff81 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -3,17 +3,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcalctool&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-03-21 07:30+0000\n"
-"PO-Revision-Date: 2011-03-23 13:09+0530\n"
-"Last-Translator: Sweta Kothari <swkothar redhat com>\n"
-"Language-Team: Gujarati\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=gcalctool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-09 09:46+0000\n"
+"PO-Revision-Date: 2011-09-20 11:00+0000\n"
+"Last-Translator: \n"
+"Language-Team: gu_IN <kde-i18n-doc kde org>\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-DamnedLies-Scope: partial\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 
 #. The label on the memory button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
@@ -28,7 +29,6 @@ msgstr "="
 
 #. Accessible name for the absolute value button
 #: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
-#, fuzzy
 #| msgid "Absolute value"
 msgid "Absolute Value"
 msgstr "àààààà ààààà"
@@ -62,7 +62,7 @@ msgstr "àààà àààà [K]"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
-#: ../src/math-buttons.c:223
+#: ../src/math-buttons.c:224
 msgid "Memory"
 msgstr "ààààà"
 
@@ -110,7 +110,8 @@ msgstr "ààààà (_o):"
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
-msgstr "ààààà àààààà àààààààà ààààà ààà àà, ààààà ààààààà àààà àààààà ààààààà àààà ààààààà ààà àà. "
+msgstr ""
+"ààààà àààààà àààààààà ààààà ààà àà, ààààà ààààààà àààà àààààà ààààààà àààà ààààààà ààà àà. "
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:12
@@ -215,7 +216,7 @@ msgstr ""
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:247
+#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:248
 msgid "Compounding Term"
 msgstr "ààààààà àààà"
 
@@ -236,7 +237,7 @@ msgstr "àààà ààààà ààààà"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:253
+#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:254
 msgid "Future Value"
 msgstr "àààààààà ààààà"
 
@@ -257,7 +258,7 @@ msgstr "Gpm"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:274
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:275
 msgid "Gross Profit Margin"
 msgstr "ààà ààààà"
 
@@ -268,7 +269,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:265
+#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:266
 msgid "Periodic Interest Rate"
 msgstr "àààààà ààààà àà"
 
@@ -279,7 +280,7 @@ msgstr "àààààà ààààà àà (_R):"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:271
+#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:272
 msgid "Periodic Payment"
 msgstr "àààààà àààààà"
 
@@ -290,7 +291,7 @@ msgstr "Pmt"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:268
+#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:269
 msgid "Present Value"
 msgstr "ààààààà ààààà"
 
@@ -395,25 +396,24 @@ msgstr "ààààà (_a):"
 
 #. Accessible name for the insert character button
 #: ../data/buttons-programming.ui.h:14
-#| msgid "Ch_aracter:"
 msgid "Insert Character"
 msgstr "ààààà àààà ààà"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:226
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:227
 msgid "Insert Character Code"
 msgstr "ààààà ààà àààà ààà"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:241
+#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:242
 msgid "Shift Left"
 msgstr "Shift Left"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:244
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:245
 msgid "Shift Right"
 msgstr "Shift Right"
 
@@ -450,7 +450,7 @@ msgstr "8-ààà"
 #. Preferences dialog: Label for display format combo box
 #: ../data/preferences.ui.h:10
 msgid "Number _Format:"
-msgstr ""
+msgstr "ààààààà àààààà (_F)"
 
 #. Title of preferences dialog
 #: ../data/preferences.ui.h:11 ../src/math-preferences.c:231
@@ -459,10 +459,9 @@ msgstr "ààààààà"
 
 #. Preferences dialog: label for show thousands separator check button
 #: ../data/preferences.ui.h:13
-#, fuzzy
 #| msgid "Show thousands separator"
 msgid "Show _thousands separators"
-msgstr "àààààà àààààà àààààà"
+msgstr "àààààà àààààà àààààà (_t)"
 
 #. Preferences dialog: label for show trailing zeroes check button
 #: ../data/preferences.ui.h:15
@@ -483,7 +482,7 @@ msgstr ""
 
 # gcalctool/gtk.c:801 gcalctool/gtk.c:803 gcalctool.desktop.in.h:1
 #. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:514
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:546
 msgid "Calculator"
 msgstr "àààààààààààà"
 
@@ -495,10 +494,23 @@ msgstr "ààààààà, ààààààààà àààà àà
 msgid "Accuracy value"
 msgstr "àààààà ààààà"
 
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:2
+#| msgid "Tangent [w]"
+msgid "Angle units"
+msgstr "àààà àààà"
+
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:3
 msgid "Button mode"
 msgstr "ààà àààààà"
 
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:4
+msgid "Currency of the current calculation"
+msgstr "ààààà àààààààà ààà"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:5
+msgid "Currency to convert the current calculation into"
+msgstr ""
+
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
 #, fuzzy
 #| msgid ""
@@ -507,24 +519,23 @@ msgstr "ààà àààààà"
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
-msgstr "àààà ààà ààààààà àààà ààààà ààà ààààà àààààà àààààà àààààà àààààààà àààààà àààà àààà."
+msgstr ""
+"àààà ààà ààààààà àààà ààààà ààà ààààà àààààà àààààà àààààà àààààààà àààààà àààà àààà."
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "àààà ààà ààààààà ààààà ààààààà ààààà àààààààààà àààààà àà."
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:8
-#, fuzzy
 #| msgid "Numeric point"
 msgid "Number format"
-msgstr "àààààààà ààààà"
+msgstr "àààààààà àààààà"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:9
 msgid "Numeric Base"
 msgstr "ààààààààààà àààà"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:10
-#, fuzzy
 #| msgid "Show Thousands Separator"
 msgid "Show Thousands Separators"
 msgstr "àààààà àààààà àààààà"
@@ -533,12 +544,41 @@ msgstr "àààààà àààààà àààààà"
 msgid "Show Trailing Zeroes"
 msgstr "ààààààà àààààà àààààà"
 
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:12
+#| msgid "Currency"
+msgid "Source currency"
+msgstr "ààààààà ààà"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
+#| msgid "Tangent [w]"
+msgid "Source units"
+msgstr "ààààààà àààà"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
+#, fuzzy
+#| msgid "Tangent [w]"
+msgid "Target currency"
+msgstr "àààààààà [W]"
+
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
 #, fuzzy
 #| msgid "Tangent [w]"
 msgid "Target units"
 msgstr "àààààààà [W]"
 
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+msgid "The angle units to use"
+msgstr ""
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#| msgid "Button mode"
+msgid "The button mode"
+msgstr "ààà àààààà"
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
+msgid "The format to display numbers in"
+msgstr ""
+
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
 #, fuzzy
 #| msgid ""
@@ -548,7 +588,6 @@ msgid "The number of digits displayed after the numeric point"
 msgstr "ààààà ààààà ààà àààààà àààààà àààààà. à ààààà 0 àà 9 àà ààààààà à àààà àààà"
 
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
-#, fuzzy
 #| msgid "Numeric Base"
 msgid "The numeric base"
 msgstr "ààààààààààà àààà"
@@ -561,6 +600,14 @@ msgstr "ààààààààààà àààà"
 msgid "The size of the words used in bitwise operations"
 msgstr "ààààààà àààààààààà ààààààà àààààààà ààà. ààààà àààààà 16, 32 ààà 64 àà."
 
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+msgid "Units of the current calculation"
+msgstr ""
+
+#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+msgid "Units to convert the current calculation into"
+msgstr ""
+
 #: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
 msgid "Word size"
 msgstr "àààà ààà"
@@ -598,215 +645,220 @@ msgid "Canadian Dollar"
 msgstr "ààààààà àààà"
 
 #: ../src/currency-manager.c:38
-msgid "Swiss Franc"
+msgid "CFA Franc"
 msgstr ""
 
 #: ../src/currency-manager.c:39
-msgid "Chilean Peso"
+msgid "Swiss Franc"
 msgstr ""
 
 #: ../src/currency-manager.c:40
-msgid "Chinese Yuan"
+msgid "Chilean Peso"
 msgstr ""
 
 #: ../src/currency-manager.c:41
-msgid "Colombian Peso"
+msgid "Chinese Yuan"
 msgstr ""
 
 #: ../src/currency-manager.c:42
-msgid "Czech Koruna"
+msgid "Colombian Peso"
 msgstr ""
 
 #: ../src/currency-manager.c:43
-msgid "Danish Krone"
-msgstr ""
+msgid "Czech Koruna"
+msgstr "ààà àààààà"
 
 #: ../src/currency-manager.c:44
-msgid "Algerian Dinar"
-msgstr ""
+msgid "Danish Krone"
+msgstr "ààààà ààààà"
 
 #: ../src/currency-manager.c:45
-msgid "Estonian Kroon"
-msgstr ""
+msgid "Algerian Dinar"
+msgstr "ààààààààààà ààààà"
 
 #: ../src/currency-manager.c:46
-msgid "Euro"
-msgstr ""
+msgid "Estonian Kroon"
+msgstr "ààààààààà ààààà"
 
 #: ../src/currency-manager.c:47
-msgid "Pound Sterling"
-msgstr ""
+msgid "Euro"
+msgstr "àààà"
 
 #: ../src/currency-manager.c:48
+msgid "Pound Sterling"
+msgstr "àààààà ààààààààà"
+
+#: ../src/currency-manager.c:49
 msgid "Hong Kong Dollar"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:49
+#: ../src/currency-manager.c:50
 msgid "Croatian Kuna"
-msgstr ""
+msgstr "ààààààààà àààà"
 
-#: ../src/currency-manager.c:50
+#: ../src/currency-manager.c:51
 msgid "Hungarian Forint"
-msgstr ""
+msgstr "àààààààà ààààààà"
 
-#: ../src/currency-manager.c:51
+#: ../src/currency-manager.c:52
 msgid "Indonesian Rupiah"
-msgstr ""
+msgstr "ààààààààààà ààààà"
 
-#: ../src/currency-manager.c:52
+#: ../src/currency-manager.c:53
 msgid "Israeli New Shekel"
-msgstr ""
+msgstr "àààààààà àààà ààààà"
 
-#: ../src/currency-manager.c:53
+#: ../src/currency-manager.c:54
 msgid "Indian Rupee"
 msgstr "àààààà àààààà"
 
-#: ../src/currency-manager.c:54
+#: ../src/currency-manager.c:55
 msgid "Iranian Rial"
-msgstr ""
+msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:55
+#: ../src/currency-manager.c:56
 msgid "Icelandic Krona"
-msgstr ""
+msgstr "àààààààààà àààààà"
 
-#: ../src/currency-manager.c:56
+#: ../src/currency-manager.c:57
 msgid "Japanese Yen"
-msgstr ""
+msgstr "ààààààà ààà"
 
-#: ../src/currency-manager.c:57
+#: ../src/currency-manager.c:58
 msgid "South Korean Won"
-msgstr ""
+msgstr "àààààà àààààà ààààààà"
 
-#: ../src/currency-manager.c:58
+#: ../src/currency-manager.c:59
 msgid "Kuwaiti Dinar"
-msgstr ""
+msgstr "àààààà ààààà"
 
-#: ../src/currency-manager.c:59
+#: ../src/currency-manager.c:60
 msgid "Kazakhstani Tenge"
 msgstr ""
 
-#: ../src/currency-manager.c:60
+#: ../src/currency-manager.c:61
 msgid "Sri Lankan Rupee"
-msgstr ""
+msgstr "àààà àààà àààà"
 
-#: ../src/currency-manager.c:61
+#: ../src/currency-manager.c:62
 msgid "Lithuanian Litas"
-msgstr ""
+msgstr "àààààààà ààààà"
 
-#: ../src/currency-manager.c:62
+#: ../src/currency-manager.c:63
 msgid "Latvian Lats"
-msgstr ""
+msgstr "ààààààà ààààà"
 
-#: ../src/currency-manager.c:63
+#: ../src/currency-manager.c:64
 msgid "Libyan Dinar"
-msgstr ""
+msgstr "àààààà ààààà"
 
-#: ../src/currency-manager.c:64
+#: ../src/currency-manager.c:65
 msgid "Mauritian Rupee"
-msgstr ""
+msgstr "àààààààà àààààà"
 
-#: ../src/currency-manager.c:65
+#: ../src/currency-manager.c:66
 msgid "Mexican Peso"
-msgstr ""
+msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:66
+#: ../src/currency-manager.c:67
 msgid "Malaysian Ringgit"
 msgstr ""
 
-#: ../src/currency-manager.c:67
+#: ../src/currency-manager.c:68
 msgid "Norwegian Krone"
-msgstr ""
+msgstr "àààààààààà ààààà"
 
-#: ../src/currency-manager.c:68
+#: ../src/currency-manager.c:69
 msgid "Nepalese Rupee"
-msgstr ""
+msgstr "àààààà àààààà"
 
-#: ../src/currency-manager.c:69
+#: ../src/currency-manager.c:70
 msgid "New Zealand Dollar"
-msgstr ""
+msgstr "àààà ààààààà àààà"
 
-#: ../src/currency-manager.c:70
+#: ../src/currency-manager.c:71
 msgid "Omani Rial"
-msgstr ""
+msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:71
+#: ../src/currency-manager.c:72
 msgid "Peruvian Nuevo Sol"
-msgstr ""
+msgstr "àààààààà Nuevo ààà"
 
-#: ../src/currency-manager.c:72
+#: ../src/currency-manager.c:73
 msgid "Philippine Peso"
-msgstr ""
+msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:73
+#: ../src/currency-manager.c:74
 msgid "Pakistani Rupee"
 msgstr "àààààààààà àààààà"
 
-#: ../src/currency-manager.c:74
+#: ../src/currency-manager.c:75
 msgid "Polish Zloty"
-msgstr ""
+msgstr "ààààà àààààà "
 
-#: ../src/currency-manager.c:75
+#: ../src/currency-manager.c:76
 msgid "Qatari Riyal"
 msgstr ""
 
-#: ../src/currency-manager.c:76
+#: ../src/currency-manager.c:77
 msgid "New Romanian Leu"
 msgstr ""
 
-#: ../src/currency-manager.c:77
+#: ../src/currency-manager.c:78
 msgid "Russian Rouble"
-msgstr ""
+msgstr "ààààà ààà"
 
-#: ../src/currency-manager.c:78
+#: ../src/currency-manager.c:79
 msgid "Saudi Riyal"
-msgstr ""
+msgstr "ààààà ààààà"
 
-#: ../src/currency-manager.c:79
+#: ../src/currency-manager.c:80
 msgid "Swedish Krona"
-msgstr ""
+msgstr "ààààààà àààààà"
 
-#: ../src/currency-manager.c:80
+#: ../src/currency-manager.c:81
 msgid "Singapore Dollar"
 msgstr "àààààààà àààà"
 
-#: ../src/currency-manager.c:81
+#: ../src/currency-manager.c:82
 msgid "Thai Baht"
-msgstr ""
+msgstr "ààà ààààà"
 
-#: ../src/currency-manager.c:82
+#: ../src/currency-manager.c:83
 msgid "Tunisian Dinar"
 msgstr ""
 
-#: ../src/currency-manager.c:83
+#: ../src/currency-manager.c:84
 msgid "New Turkish Lira"
-msgstr ""
+msgstr "àààà àààààà àààà"
 
-#: ../src/currency-manager.c:84
+#: ../src/currency-manager.c:85
 msgid "T&T Dollar (TTD)"
 msgstr "T&T àààà (TTD)"
 
-#: ../src/currency-manager.c:85
+#: ../src/currency-manager.c:86
 msgid "US Dollar"
 msgstr "US àààà"
 
-#: ../src/currency-manager.c:86
+#: ../src/currency-manager.c:87
 msgid "Uruguayan Peso"
-msgstr ""
+msgstr "ààààààààà àààà"
 
-#: ../src/currency-manager.c:87
+#: ../src/currency-manager.c:88
 msgid "Venezuelan BolÃvar"
 msgstr ""
 
-#: ../src/currency-manager.c:88
+#: ../src/currency-manager.c:89
 msgid "South African Rand"
+msgstr "àààà ààààààà ààààà"
+
+#: ../src/financial.c:70
+msgid "Error: the number of periods must be positive"
 msgstr ""
 
 #. Description on how to use gcalctool displayed on command-line
 #: ../src/gcalctool.c:77
 #, c-format
-#| msgid ""
-#| "Usage:\n"
-#| "  %s - Perform mathematical calculations"
 msgid ""
 "Usage:\n"
 "  %s â Perform mathematical calculations"
@@ -857,10 +909,6 @@ msgstr ""
 #. Description on gcalctool application options displayed on command-line
 #: ../src/gcalctool.c:110
 #, c-format
-#| msgid ""
-#| "Application Options:\n"
-#| "  -u, --unittest                  Perform unittests\n"
-#| "  -s, --solve <equation>          Solve the given equation"
 msgid ""
 "Application Options:\n"
 "  -s, --solve <equation>          Solve the given equation"
@@ -881,319 +929,295 @@ msgid "Unknown argument '%s'"
 msgstr "àààààà àààà '%s'"
 
 #. Tooltip for the Pi button
-#: ../src/math-buttons.c:95
+#: ../src/math-buttons.c:96
 msgid "Pi [Ctrl+P]"
 msgstr "Pi [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:98
-#| msgid "Euler's Number (e)"
+#: ../src/math-buttons.c:99
 msgid "Eulerâs Number"
 msgstr "Euler àà àààà"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.c:103
+#: ../src/math-buttons.c:104
 msgid "Subscript mode [Alt]"
 msgstr ""
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.c:106
+#: ../src/math-buttons.c:107
 msgid "Superscript mode [Ctrl]"
 msgstr ""
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:109
+#: ../src/math-buttons.c:110
 msgid "Scientific exponent [Ctrl+E]"
 msgstr ""
 
 #. Tooltip for the add button
-#: ../src/math-buttons.c:112
+#: ../src/math-buttons.c:113
 msgid "Add [+]"
 msgstr "ààààà [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.c:115
+#: ../src/math-buttons.c:116
 msgid "Subtract [-]"
 msgstr "ààà ààà [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.c:118
+#: ../src/math-buttons.c:119
 msgid "Multiply [*]"
 msgstr "àààà [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.c:121
+#: ../src/math-buttons.c:122
 msgid "Divide [/]"
 msgstr "àààà [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:124
-#, fuzzy
+#: ../src/math-buttons.c:125
 #| msgid "Modulus Division [M]"
 msgid "Modulus divide"
-msgstr "àààààààà àààààà [M]"
+msgstr "àààààààà àààààà"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.c:127
-#| msgid "Edit Functions"
+#: ../src/math-buttons.c:128
 msgid "Additional Functions"
 msgstr "àààààààà àààààà"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.c:130
+#: ../src/math-buttons.c:131
 msgid "Exponent [^ or **]"
 msgstr ""
 
 #. Tooltip for the square button
-#: ../src/math-buttons.c:133
-#, fuzzy
+#: ../src/math-buttons.c:134
 #| msgid "Square [ ]"
 msgid "Square [Ctrl+2]"
-msgstr "àààà [ ]"
+msgstr "àààà [Ctrl+2]"
 
 #. Tooltip for the percentage button
-#: ../src/math-buttons.c:136
+#: ../src/math-buttons.c:137
 msgid "Percentage [%]"
 msgstr "ààà [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.c:139
+#: ../src/math-buttons.c:140
 msgid "Factorial [!]"
 msgstr ""
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.c:142
+#: ../src/math-buttons.c:143
 #, fuzzy
 #| msgid "Absolute value [u]"
 msgid "Absolute value [|]"
 msgstr "àààààà ààààà [u]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:145
+#: ../src/math-buttons.c:146
 msgid "Complex argument"
 msgstr "àààà àààà"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:148
+#: ../src/math-buttons.c:149
 msgid "Complex conjugate"
 msgstr ""
 
 #. Tooltip for the root button
-#: ../src/math-buttons.c:151
+#: ../src/math-buttons.c:152
 msgid "Root [Ctrl+R]"
 msgstr "ààà [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.c:154
+#: ../src/math-buttons.c:155
 #, fuzzy
 #| msgid "Square root [s]"
 msgid "Square root [Ctrl+R]"
 msgstr "ààààààà [s]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.c:157
+#: ../src/math-buttons.c:158
 msgid "Logarithm"
 msgstr "àààààà"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:160
-#| msgid "Natural logarithm [n]"
+#: ../src/math-buttons.c:161
 msgid "Natural Logarithm"
 msgstr "ààààààààà àààààà"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.c:163
-#| msgid "Sine [k]"
+#: ../src/math-buttons.c:164
 msgid "Sine"
 msgstr "àààà "
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.c:166
-#| msgid "Cosine [j]"
+#: ../src/math-buttons.c:167
 msgid "Cosine"
 msgstr "àààààà"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.c:169
-#| msgid "Tangent [w]"
+#: ../src/math-buttons.c:170
 msgid "Tangent"
 msgstr "àààààààà"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:172
-#| msgid "Hyperbolic Sine [k]"
+#: ../src/math-buttons.c:173
 msgid "Hyperbolic Sine"
 msgstr "àààààààààà àààà"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:175
-#| msgid "Hyperbolic Cosine [j]"
+#: ../src/math-buttons.c:176
 msgid "Hyperbolic Cosine"
 msgstr "àààààààààà àààààà"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:178
-#| msgid "Hyperbolic Tangent [w]"
+#: ../src/math-buttons.c:179
 msgid "Hyperbolic Tangent"
 msgstr "àààààààààà àààààààà"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.c:181
-#| msgid "Inverse Sine [K]"
+#: ../src/math-buttons.c:182
 msgid "Inverse [Ctrl+I]"
 msgstr "ààààà [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:184
+#: ../src/math-buttons.c:185
 msgid "Boolean AND"
 msgstr "àààààà AND"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:187
+#: ../src/math-buttons.c:188
 msgid "Boolean OR"
 msgstr "àààààà OR"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:190
+#: ../src/math-buttons.c:191
 msgid "Boolean Exclusive OR"
 msgstr ""
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:193
+#: ../src/math-buttons.c:194
 msgid "Boolean NOT"
 msgstr "àààààà NOT"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.c:196 ../src/math-buttons.c:1028
-#| msgid "Integer portion"
+#: ../src/math-buttons.c:197 ../src/math-buttons.c:1038
 msgid "Integer Component"
 msgstr "àààààààà ààà"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.c:199 ../src/math-buttons.c:1030
-#| msgid "Fractional portion"
+#: ../src/math-buttons.c:200 ../src/math-buttons.c:1040
 msgid "Fractional Component"
 msgstr "ààààààààà ààà"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.c:202
+#: ../src/math-buttons.c:203
 msgid "Real Component"
 msgstr ""
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:205
+#: ../src/math-buttons.c:206
 msgid "Imaginary Component"
 msgstr ""
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:208
+#: ../src/math-buttons.c:209
 #, fuzzy
 #| msgid "1's complement [z]"
 msgid "Ones' Complement"
 msgstr "1's complement [z]"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.c:211
+#: ../src/math-buttons.c:212
 #, fuzzy
 #| msgid "1's complement [z]"
 msgid "Two's Complement"
 msgstr "1's complement [z]"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.c:214
-#, fuzzy
+#: ../src/math-buttons.c:215
 #| msgid "Trunc"
 msgid "Truncate"
-msgstr "Trunc"
+msgstr "àààààà àààààà ààààà"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.c:217
+#: ../src/math-buttons.c:218
 #, fuzzy
 #| msgid "Start group of calculations [(]"
 msgid "Start Group [(]"
 msgstr "ààààààààà ààà ààà ààà [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.c:220
+#: ../src/math-buttons.c:221
 msgid "End Group [)]"
 msgstr ""
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.c:229
-#| msgid "Calculate result"
+#: ../src/math-buttons.c:230
 msgid "Calculate Result"
 msgstr "àààààà ààà"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.c:232
+#: ../src/math-buttons.c:233
 msgid "Factorize [Ctrl+F]"
 msgstr ""
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.c:235
-#| msgid "Clear displayed value [Escape]"
+#: ../src/math-buttons.c:236
 msgid "Clear Display [Escape]"
 msgstr "ààààààààà ààààà ààà ààà [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.c:238
+#: ../src/math-buttons.c:239
 msgid "Undo [Ctrl+Z]"
 msgstr ""
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:250
-#| msgid "Double-Declining Depreciation"
+#: ../src/math-buttons.c:251
 msgid "Double Declining Depreciation"
 msgstr "àààà ààààà ààààà"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.c:256
-#, fuzzy
+#: ../src/math-buttons.c:257
 #| msgid "Financial"
 msgid "Financial Term"
-msgstr "àààààà"
+msgstr "ààààààà àààààà"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:259
-#, fuzzy
+#: ../src/math-buttons.c:260
 #| msgid "Sum-Of-The-Years'-Digits Depreciation"
 msgid "Sum of the Years Digits Depreciation"
-msgstr "Sum-Of-The-Years'-Digits ààààà"
+msgstr "Sum Of The Years Digits ààààà"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:262
-#, fuzzy
+#: ../src/math-buttons.c:263
 #| msgid "Straight-Line Depreciation"
 msgid "Straight Line Depreciation"
 msgstr "àààà ààààààà ààààà"
 
 #. Number display mode combo: Binary, e.g. 10011010010â
-#: ../src/math-buttons.c:652
+#: ../src/math-buttons.c:653
 msgid "Binary"
 msgstr "àààààà"
 
 #. Number display mode combo: Octal, e.g. 2322â
-#: ../src/math-buttons.c:656
-#| msgid "_Oct"
+#: ../src/math-buttons.c:657
 msgid "Octal"
 msgstr "àààààààà"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:660
+#: ../src/math-buttons.c:661
 msgid "Decimal"
 msgstr "ààààà"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2ââ
-#: ../src/math-buttons.c:664
-#| msgid "Hexadecimal digit A [a]"
+#: ../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:938 ../src/math-buttons.c:982
+#: ../src/math-buttons.c:948 ../src/math-buttons.c:992
 #, c-format
-#| msgid "_1 place"
 msgid "_%d place"
 msgid_plural "_%d places"
 msgstr[0] "_%d ààààà"
@@ -1201,7 +1225,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:942 ../src/math-buttons.c:986
+#: ../src/math-buttons.c:952 ../src/math-buttons.c:996
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1209,95 +1233,101 @@ msgstr[0] "%d ààààà"
 msgstr[1] "%d àààààà"
 
 #. Tooltip for the round button
-#: ../src/math-buttons.c:1032
-#| msgid "Rand"
+#: ../src/math-buttons.c:1042
 msgid "Round"
 msgstr "ààà"
 
 #. Tooltip for the floor button
-#: ../src/math-buttons.c:1034
+#: ../src/math-buttons.c:1044
 msgid "Floor"
 msgstr ""
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1036
+#: ../src/math-buttons.c:1046
 msgid "Ceiling"
 msgstr ""
 
 #. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1038
+#: ../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:354
+#: ../src/math-converter.c:412
 msgid " in "
 msgstr ""
 
+#. Tooltip for swap conversion button
+#: ../src/math-converter.c:427
+msgid "Switch conversion units"
+msgstr ""
+
 #. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:453
+#: ../src/math-equation.c:458
 msgid "No undo history"
 msgstr "ààà àà àààààà àààààà ààà"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:478
-#| msgid "No undo history"
+#: ../src/math-equation.c:485
 msgid "No redo history"
 msgstr "ààà àà àààààà àààààà ààà"
 
-#: ../src/math-equation.c:867
+#: ../src/math-equation.c:943
 msgid "No sane value to store"
 msgstr "àààààààà àààà ààà ààààà ààà"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1132
+#: ../src/math-equation.c:1225
 msgid "Overflow. Try a bigger word size"
 msgstr "àààààà. ààààààà àààà àààà ààààà ààààààà ààà"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1137
+#: ../src/math-equation.c:1230
 #, c-format
-#| msgid "Unknown variable"
 msgid "Unknown variable '%s'"
 msgstr "àààààà àà '%s'"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1142
+#: ../src/math-equation.c:1235
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "ààààà '%s' ààààààààààà àààà ààà"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1147
-#| msgid "Unknown function"
+#: ../src/math-equation.c:1240
 msgid "Unknown conversion"
 msgstr "àààààà àààààààà"
 
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1156
+#: ../src/math-equation.c:1249
 msgid "Malformed expression"
 msgstr "ààààààà àààààà"
 
+# gcalctool/gtk.c:801 gcalctool/gtk.c:803 gcalctool.desktop.in.h:1
+#: ../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:1288
+#: ../src/math-equation.c:1394
 msgid "Need an integer to factorize"
 msgstr ""
 
 #. This message is displayed in the status bar when a bit
 #. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1355
-#, fuzzy
+#: ../src/math-equation.c:1469
 #| msgid "No sane value to do bitwise shift"
 msgid "No sane value to bitwise shift"
 msgstr "bitwise shift ààààà àààà ààà sane ààààà ààà"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1384
+#: ../src/math-equation.c:1500
 msgid "Displayed value not an integer"
 msgstr "àààààààà ààààà àààààààà ààà"
 
 #. Digits localized for the given language
-#: ../src/math-equation.c:1807
+#: ../src/math-equation.c:1925
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
@@ -1314,7 +1344,6 @@ msgstr "ààà"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
 #: ../src/math-preferences.c:250 ../src/unit-manager.c:55
-#| msgid "_Radians"
 msgid "Radians"
 msgstr "àààààà"
 
@@ -1330,10 +1359,9 @@ msgstr "àààààà"
 
 #. Number display mode combo: Fixed, e.g. 1234
 #: ../src/math-preferences.c:268
-#, fuzzy
 #| msgid "_Fix"
 msgid "Fixed"
-msgstr "àààààà (_F)"
+msgstr "àààààà"
 
 #. Number display mode combo: Scientific, e.g. 1.234Ã10^3
 #: ../src/math-preferences.c:272
@@ -1352,17 +1380,17 @@ msgid "Show %d decimal _places"
 msgstr ""
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:163
+#: ../src/math-window.c:172
 msgid "Unable to open help file"
 msgstr "ààà àààà àà àààààààà àààààà"
 
 #. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:195
+#: ../src/math-window.c:204
 msgid "translator-credits"
 msgstr "ààààà àààà <ankit644 yahoo com>, àààààààà àààààà <swkothar redhat com>"
 
 #. The license this software is under (GPL2+)
-#: ../src/math-window.c:198
+#: ../src/math-window.c:207
 msgid ""
 "Gcalctool is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1393,57 +1421,57 @@ msgstr ""
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
 #. Program name in the about dialog
-#: ../src/math-window.c:215
+#: ../src/math-window.c:224
 msgid "Gcalctool"
 msgstr "ààààà àààààààààààà"
 
 #. Copyright notice in the about dialog
-#: ../src/math-window.c:219
+#: ../src/math-window.c:228
 msgid "Â 1986â2010 The Gcalctool authors"
 msgstr "Â 1986â2010 The Gcalctool authors"
 
 #. Short description in the about dialog
-#: ../src/math-window.c:223
+#: ../src/math-window.c:232
 msgid "Calculator with financial and scientific modes."
 msgstr "àààààà ààà ààààààààà ààààààà àààààà àààààààààààà."
 
 #. Calculator menu
-#: ../src/math-window.c:349
+#: ../src/math-window.c:381
 msgid "_Calculator"
 msgstr "àààààààààààà (_C)"
 
 #. Mode menu
-#: ../src/math-window.c:351
+#: ../src/math-window.c:383
 msgid "_Mode"
 msgstr "àààààà (_M)"
 
 #. Help menu label
-#: ../src/math-window.c:353
+#: ../src/math-window.c:385
 msgid "_Help"
 msgstr "ààà (_H)"
 
 #. Basic menu label
-#: ../src/math-window.c:355
+#: ../src/math-window.c:387
 msgid "_Basic"
 msgstr "ààààààà (_B)"
 
 #. Advanced menu label
-#: ../src/math-window.c:357
+#: ../src/math-window.c:389
 msgid "_Advanced"
 msgstr "àààààà (_A)"
 
 #. Financial menu label
-#: ../src/math-window.c:359
+#: ../src/math-window.c:391
 msgid "_Financial"
 msgstr "àààààà (_F)"
 
 #. Programming menu label
-#: ../src/math-window.c:361
+#: ../src/math-window.c:393
 msgid "_Programming"
 msgstr "àààààààààààà (_P)"
 
 #. Help>Contents menu label
-#: ../src/math-window.c:363
+#: ../src/math-window.c:395
 msgid "_Contents"
 msgstr "àààààààà (_C)"
 
@@ -1475,50 +1503,50 @@ msgstr ""
 #. Translators: Error display when attempting to take argument of zero
 #: ../src/mp.c:148
 msgid "Argument not defined for zero"
-msgstr ""
+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:1610
+#: ../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:1281 ../src/mp.c:1318
+#: ../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:1683 ../src/mp.c:1998
+#: ../src/mp.c:1680 ../src/mp.c:1994
 msgid "The power of zero is undefined for a negative exponent"
 msgstr ""
 
-#: ../src/mp.c:1708
+#: ../src/mp.c:1704
 msgid "Reciprocal of zero is undefined"
 msgstr ""
 
-#: ../src/mp.c:1793
+#: ../src/mp.c:1789
 msgid "Root must be non-zero"
 msgstr ""
 
-#: ../src/mp.c:1811
+#: ../src/mp.c:1807
 msgid "Negative root of zero is undefined"
 msgstr ""
 
-#: ../src/mp.c:1817
+#: ../src/mp.c:1813
 msgid "nth root of negative number is undefined for even n"
 msgstr ""
 
 #. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1938
+#: ../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:1958
+#: ../src/mp.c:1954
 msgid "Modulus division is only defined for integers"
 msgstr ""
 
@@ -1549,7 +1577,6 @@ msgstr ""
 
 #: ../src/unit-manager.c:54
 #, c-format
-#| msgid "Degrees"
 msgctxt "unit-format"
 msgid "%s degrees"
 msgstr "%s ààà"
@@ -1560,11 +1587,11 @@ msgid "degree,degrees,deg"
 msgstr "ààà,ààà,deg"
 
 #: ../src/unit-manager.c:55
-#, fuzzy, c-format
+#, c-format
 #| msgid "Gradians"
 msgctxt "unit-format"
 msgid "%s radians"
-msgstr "ààà"
+msgstr "%s ààààààààààààà"
 
 #: ../src/unit-manager.c:55
 msgctxt "unit-symbols"
@@ -1572,11 +1599,11 @@ msgid "radian,radians,rad"
 msgstr "àààààà,àààààà,rad"
 
 #: ../src/unit-manager.c:56
-#, fuzzy, c-format
+#, c-format
 #| msgid "Gradians"
 msgctxt "unit-format"
 msgid "%s gradians"
-msgstr "ààà"
+msgstr "%s ààà"
 
 #: ../src/unit-manager.c:56
 msgctxt "unit-symbols"
@@ -1589,8 +1616,6 @@ msgstr "ààààààà"
 
 #: ../src/unit-manager.c:57
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
 msgid "%s pc"
 msgstr "%s pc"
@@ -1617,7 +1642,7 @@ msgstr "àààààààààà,àààààààààà, ly"
 
 #: ../src/unit-manager.c:59
 msgid "Astronomical Units"
-msgstr ""
+msgstr "ààààààààààààà àààà"
 
 #: ../src/unit-manager.c:59
 #, c-format
@@ -1632,18 +1657,22 @@ msgstr "au"
 
 #: ../src/unit-manager.c:60
 msgid "Nautical Miles"
-msgstr ""
+msgstr "àààààà àààààà"
 
-#: ../src/unit-manager.c:60 ../src/unit-manager.c:72
+#: ../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:60
+#| msgctxt "unit-symbols"
+#| msgid "nm"
 msgctxt "unit-symbols"
-msgid "nm"
-msgstr "nm"
+msgid "nmi"
+msgstr "nmi"
 
 #: ../src/unit-manager.c:61
 msgid "Miles"
@@ -1751,7 +1780,6 @@ msgid "foot,feet,ft"
 msgstr "ààà,ààà,ft"
 
 #: ../src/unit-manager.c:68
-#| msgid "Inverse Sine [K]"
 msgid "Inches"
 msgstr "ààà"
 
@@ -1767,7 +1795,6 @@ msgid "inch,inches,in"
 msgstr "ààà, ààà, in"
 
 #: ../src/unit-manager.c:69
-#| msgid "_Contents"
 msgid "Centimeters"
 msgstr "àààààààààà"
 
@@ -1817,9 +1844,17 @@ 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"
 msgctxt "unit-symbols"
-msgid "nanometer,nanometers"
-msgstr "àààààààà,àààààààà"
+msgid "nanometer,nanometers,nm"
+msgstr "àààààààà,àààààààà,nm"
 
 #: ../src/unit-manager.c:73
 msgid "Hectares"
@@ -1842,8 +1877,6 @@ msgstr "ààà"
 
 #: ../src/unit-manager.c:74
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
 msgid "%s acres"
 msgstr "%s ààà"
@@ -1854,8 +1887,8 @@ msgid "acre,acres"
 msgstr "ààà,ààà"
 
 #: ../src/unit-manager.c:75
-#| msgid "Square [ ]"
-msgid "Square Meter"
+#| msgid "Square Meter"
+msgid "Square Meters"
 msgstr "àààà àààà"
 
 #: ../src/unit-manager.c:75
@@ -1870,8 +1903,8 @@ msgid "mÂ"
 msgstr "mÂ"
 
 #: ../src/unit-manager.c:76
-#| msgid "Square [ ]"
-msgid "Square Centimeter"
+#| msgid "Square Centimeter"
+msgid "Square Centimeters"
 msgstr "àààà àààààààààà"
 
 #: ../src/unit-manager.c:76
@@ -1886,8 +1919,9 @@ msgid "cmÂ"
 msgstr "cmÂ"
 
 #: ../src/unit-manager.c:77
-msgid "Square Millimeter"
-msgstr ""
+#| msgid "Square Meter"
+msgid "Square Millimeters"
+msgstr "àààà àààààààà"
 
 #: ../src/unit-manager.c:77
 #, c-format
@@ -1902,7 +1936,7 @@ msgstr "mmÂ"
 
 #: ../src/unit-manager.c:78
 msgid "Cubic Meters"
-msgstr ""
+msgstr "àà àààà"
 
 #: ../src/unit-manager.c:78
 #, c-format
@@ -1991,7 +2025,8 @@ msgid "millilitre,millilitres,milliliter,milliliters,mL,cmÂ"
 msgstr "àààààààà,àààààààà,àààààààà,àààààààà,mL,cmÂ"
 
 #: ../src/unit-manager.c:84
-msgid "Microlitre"
+#| msgid "Microlitre"
+msgid "Microlitres"
 msgstr "ààààààààààà"
 
 #: ../src/unit-manager.c:84
@@ -2036,7 +2071,6 @@ msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
 msgstr "ààààààààà,ààààààààà,ààààààààà,ààààààààà,kg,kgs"
 
 #: ../src/unit-manager.c:87
-#| msgid "Rand"
 msgid "Pounds"
 msgstr "àààààà"
 
@@ -2067,7 +2101,6 @@ msgid "ounce,ounces,oz"
 msgstr "ààààà,ààààà,oz"
 
 #: ../src/unit-manager.c:89
-#| msgid "Gradians"
 msgid "Grams"
 msgstr "ààààà"
 
@@ -2183,8 +2216,11 @@ msgid "%s Îs"
 msgstr "%s Îs"
 
 #: ../src/unit-manager.c:96
+#, fuzzy
+#| msgctxt "unit-symbols"
+#| msgid "microsecond,microseconds,us"
 msgctxt "unit-symbols"
-msgid "microsecond,microseconds,us"
+msgid "microsecond,microseconds,us,Îs"
 msgstr "àààààààààààà,àààààààààààà,us"
 
 #: ../src/unit-manager.c:97
@@ -2192,9 +2228,11 @@ msgid "Celcius"
 msgstr "àààààààà"
 
 #: ../src/unit-manager.c:97
-#, c-format
+#, fuzzy, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËC"
 msgctxt "unit-format"
-msgid "%sËC"
+msgid "%s ËC"
 msgstr "%sËC"
 
 #: ../src/unit-manager.c:97
@@ -2207,9 +2245,11 @@ msgid "Farenheit"
 msgstr "ààààààààà"
 
 #: ../src/unit-manager.c:98
-#, c-format
+#, fuzzy, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËF"
 msgctxt "unit-format"
-msgid "%sËF"
+msgid "%s ËF"
 msgstr "%sËF"
 
 #: ../src/unit-manager.c:98
@@ -2222,29 +2262,36 @@ msgid "Kelvin"
 msgstr "ààààààà"
 
 #: ../src/unit-manager.c:99
-#, c-format
+#, fuzzy, c-format
+#| msgctxt "unit-format"
+#| msgid "%s m"
 msgctxt "unit-format"
-msgid "%sËK"
-msgstr "%sËK"
+msgid "%s K"
+msgstr "%s m"
 
 #: ../src/unit-manager.c:99
 msgctxt "unit-symbols"
-msgid "degK,ËK"
-msgstr "degK,ËK"
+msgid "K"
+msgstr "K"
 
 #: ../src/unit-manager.c:100
 msgid "Rankine"
-msgstr ""
+msgstr "ààààààà"
 
 #: ../src/unit-manager.c:100
-#, c-format
+#, fuzzy, c-format
+#| msgctxt "unit-format"
+#| msgid "%sËR"
 msgctxt "unit-format"
-msgid "%sËR"
+msgid "%s ËR"
 msgstr "%sËR"
 
 #: ../src/unit-manager.c:100
+#, fuzzy
+#| msgctxt "unit-symbols"
+#| msgid "degR,ËR"
 msgctxt "unit-symbols"
-msgid "degR,ËR"
+msgid "degR,ËR,ËRa"
 msgstr "degR,ËR"
 
 #: ../src/unit-manager.c:109
@@ -2285,3 +2332,10 @@ msgstr "ààà"
 msgid "%s%%s"
 msgstr "%s%%s"
 
+#~ msgctxt "unit-format"
+#~ msgid "%sËK"
+#~ msgstr "%sËK"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degK,ËK"
+#~ msgstr "degK,ËK"