[gcalctool] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 5789173b3475592ece54d2d9898ad6d56189f093
Author: Sira Nokyoongtong <gumaraa gmail com>
Date:   Sun May 16 17:23:22 2010 +0700

    Updated Thai translation.

 po/th.po | 1773 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 919 insertions(+), 854 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 09a53f1..e87de88 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,45 +1,135 @@
 # Thai gcaltool translation.
-# Copyright (C) 2005-2008 Free Software Foundation, Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcalctool package.
 #
 # Ithipan Methasate <tumm_xx hotmail com>, 2003.
 # Chanchai Junlouchai <taz opentle org>, 2004.
 # Paisa Seeluangsawat <paisa users sf net>, 2004.
 # Supranee Thirawatthanasuk <supranee opentle org>, 2004.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2008.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2008, 2010.
+# Sira Nokyoongtong <gumaraa gmail com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gcalctool&component=general\n"
-"POT-Creation-Date: 2010-03-31 22:38+0000\n"
-"PO-Revision-Date: 2010-04-15 16:02+0700\n"
-"Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
+"POT-Creation-Date: 2010-05-12 16:39+0000\n"
+"PO-Revision-Date: 2010-05-16 17:13+0700\n"
+"Last-Translator: Sira Nokyoongtong <gumaraa gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. The label on the memory recall button
+#: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
+#: ../data/buttons-programming.ui.h:2
+msgid "&#x2190; R"
+msgstr "&#x2190; R"
+
+#. The label on the memory store button
+#: ../data/buttons-advanced.ui.h:4 ../data/buttons-financial.ui.h:4
+#: ../data/buttons-programming.ui.h:4
+msgid "&#x2192; R"
+msgstr "&#x2192; R"
+
+#. Label on the solve button (clicking this solves the displayed calculation)
+#: ../data/buttons-advanced.ui.h:6 ../data/buttons-basic.ui.h:2
+#: ../data/buttons-financial.ui.h:8 ../data/buttons-programming.ui.h:6
+msgid "="
+msgstr "="
+
+#. Accessible name for the absolute value button
+#: ../data/buttons-advanced.ui.h:8 ../data/buttons-programming.ui.h:8
+msgid "Absolute Value"
+msgstr "��าสัม�ูร��"
+
+#. Label on the clear display button
+#: ../data/buttons-advanced.ui.h:10 ../data/buttons-basic.ui.h:4
+#: ../data/buttons-financial.ui.h:34 ../data/buttons-programming.ui.h:12
+msgid "Clear"
+msgstr "ล�า�"
+
+#. Accessible name for the exponentiation (x to the power of y) button
+#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:6
+#: ../data/buttons-financial.ui.h:46 ../data/buttons-programming.ui.h:14
+msgid "Exponent"
+msgstr "ย��ำลั�"
+
+#. Accessible name for the factorial button
+#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:16
+msgid "Factorial"
+msgstr "����อ�รียล"
+
+#. Accessible name for the factorize button
+#: ../data/buttons-advanced.ui.h:16 ../data/buttons-programming.ui.h:18
+msgid "Factorize"
+msgstr "�ย��ัว�ระ�อ�"
+
+#. Accessible name for the inverse button
+#: ../data/buttons-advanced.ui.h:18 ../data/buttons-programming.ui.h:24
+msgid "Inverse"
+msgstr "ส�ว��ลั�"
+
+#. Accessible name for the recall value button
+#: ../data/buttons-advanced.ui.h:20 ../data/buttons-financial.ui.h:76
+#: ../data/buttons-programming.ui.h:26
+msgid "Recall"
+msgstr "�รีย��ื�"
+
+#. Accessible name for the scientific exponent button
+#: ../data/buttons-advanced.ui.h:22
+msgid "Scientific Exponent"
+msgstr "�ล��ี��ำลั�วิ�ยาศาส�ร�"
+
+#. Accessible name for the store value button
+#: ../data/buttons-advanced.ui.h:24 ../data/buttons-financial.ui.h:80
+#: ../data/buttons-programming.ui.h:32
+msgid "Store"
+msgstr "����"
+
+#. Accessible name for the subscript mode button
+#: ../data/buttons-advanced.ui.h:26 ../data/buttons-programming.ui.h:34
+msgid "Subscript"
+msgstr "�ัวห�อย"
+
+#. Accessible name for the superscript mode button
+#: ../data/buttons-advanced.ui.h:28 ../data/buttons-programming.ui.h:36
+msgid "Superscript"
+msgstr "�ัวย�"
+
+#. Label on the undo button
+#. Label on the clear display button
+#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:8
+#: ../data/buttons-financial.ui.h:90
+msgid "Undo"
+msgstr "�รีย��ื�"
+
+#. The label on the currency button
+#: ../data/buttons-financial.ui.h:6
+msgid "&#xA4;$&#x20AC;"
+msgstr "&#x0E3F;$&#x20AC;"
+
 #. Payment Period Dialog: Button to calculate result
-#: ../data/financial.ui.h:2
+#: ../data/buttons-financial.ui.h:10
 msgid "C_alculate"
 msgstr "_�ำ�ว�"
 
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/financial.ui.h:4
+#: ../data/buttons-financial.ui.h:12
 msgid "C_ost:"
 msgstr "_รา�า�ุ�:"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/financial.ui.h:6
+#: ../data/buttons-financial.ui.h:14
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
 msgstr "�ำ�ว��ริมา��าร��อ��ำระห�ี����ละ�ว� ��ย�ำระ�มื�อสิ��สุ����ละรอ��วลา�ี��ำห��"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
-#: ../data/financial.ui.h:8
+#: ../data/buttons-financial.ui.h:16
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the Sum-of-the-Years'-Digits method. This method of depreciation "
@@ -53,14 +143,14 @@ msgstr ""
 "�ึ����ย���ิ�ะมีห��วย�����ี"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/financial.ui.h:10
+#: ../data/buttons-financial.ui.h:18
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
 msgstr "�ำ�ว���า�สื�อมรา�า�อ��รั�ย�สิ���ระยะ�วลา�ี��ำห�� ��ย���วิ�ียอ�ล�ล��วี�ู�"
 
 #. Future Value Dialog: Description of calculation
-#: ../data/financial.ui.h:12
+#: ../data/buttons-financial.ui.h:20
 msgid ""
 "Calculates the future value of an investment based on a series of equal "
 "payments at a periodic interest rate over the number of payment periods in "
@@ -70,7 +160,7 @@ msgstr ""
 "�����ำ�ว��ว��ี��ำห��"
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/financial.ui.h:14
+#: ../data/buttons-financial.ui.h:22
 msgid ""
 "Calculates the number of compounding periods necessary to increase an "
 "investment of present value to a future value, at a fixed interest rate per "
@@ -80,7 +170,7 @@ msgstr ""
 "�ี�อั�รา�อ���ี�ย���ี��ี��ำห��"
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/financial.ui.h:16
+#: ../data/buttons-financial.ui.h:24
 msgid ""
 "Calculates the number of payment periods that are necessary during the term "
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
@@ -90,7 +180,7 @@ msgstr ""
 "�ี�อั�รา�อ���ี�ย���ี�"
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/financial.ui.h:18
+#: ../data/buttons-financial.ui.h:26
 msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
@@ -99,7 +189,7 @@ msgstr ""
 "���ำ�ว��ว��าร������ี��ำห��"
 
 #. Present Value Dialog: Description of calculation
-#: ../data/financial.ui.h:20
+#: ../data/buttons-financial.ui.h:28
 msgid ""
 "Calculates the present value of an investment based on a series of equal "
 "payments discounted at a periodic interest rate over the number of payment "
@@ -109,14 +199,14 @@ msgstr ""
 "��ยหั��อ���ี�ยออ������ำ�ว��ว��ี��ำห��"
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/financial.ui.h:22
+#: ../data/buttons-financial.ui.h:30
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
 msgstr "�ำ�ว�รา�า�าย�อ�สิ���า ��ย�ิ��า�����ุ��ละอั�รา�ำ�รสุ��ิ�ี���อ��าร"
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/financial.ui.h:24
+#: ../data/buttons-financial.ui.h:32
 msgid ""
 "Calculates the straight-line depreciation of an asset for one period. The "
 "straight-line method of depreciation divides the depreciable cost evenly "
@@ -129,11 +219,12 @@ msgstr ""
 "�ึ����ย���ิ�ะมีห��วย�����ี"
 
 #. Title of Compounding Term dialog
-#: ../data/financial.ui.h:26
+#. Tooltip for the compounding term button
+#: ../data/buttons-financial.ui.h:36 ../src/math-buttons.c:249
 msgid "Compounding Term"
 msgstr "�ำ�ว��ว������"
 
-#: ../data/financial.ui.h:27
+#: ../data/buttons-financial.ui.h:37
 msgid ""
 "Converts between different currencies. Enter the amount and the currency you "
 "want to convert from on the upper row, and the currency you want to convert "
@@ -142,712 +233,260 @@ msgstr ""
 "��ล���ิ���ามส�ุล��ิ� �รุ�า��อ��ำ�ว���ิ��ละห��วยส�ุล��ิ�����า��ี��ุ���อ��าร��ล�����ว�� "
 "�ละห��วยส�ุล��ิ��ลาย�า�����วล�า� �ล�ว�ำ�ว���ิ���ส�ุล��ิ��ลาย�า����ะ�ส���ี���วล�า�"
 
-#: ../data/financial.ui.h:28
+#. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
+#: ../data/buttons-financial.ui.h:39
+msgid "Ctrm"
+msgstr "Ctrm"
+
+#: ../data/buttons-financial.ui.h:40
 msgid "Currency Conversion"
 msgstr "��ล�ห��วยส�ุล��ิ�"
 
+#. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
+#: ../data/buttons-financial.ui.h:42
+msgid "Ddb"
+msgstr "Ddb"
+
 #. Title of Double-Declining Depreciation dialog
-#: ../data/financial.ui.h:30
+#: ../data/buttons-financial.ui.h:44
 msgid "Double-Declining Depreciation"
 msgstr "��า�สื�อมรา�า���ยอ�ล�ล��วี�ู�"
 
 #. Title of Future Value dialog
-#: ../data/financial.ui.h:32
+#. Tooltip for the future value button
+#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:255
 msgid "Future Value"
 msgstr "มูล��า��อ�า��"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/financial.ui.h:34
+#: ../data/buttons-financial.ui.h:50
 msgid "Future _Value:"
 msgstr "มูล��า��_อ�า��:"
 
+#. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
+#: ../data/buttons-financial.ui.h:52
+msgid "Fv"
+msgstr "Fv"
+
+#. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
+#: ../data/buttons-financial.ui.h:54
+msgid "Gpm"
+msgstr "Gpm"
+
 #. Title of Gross Profit Margin dialog
-#: ../data/financial.ui.h:36
+#. Tooltip for the gross profit margin button
+#: ../data/buttons-financial.ui.h:56 ../src/math-buttons.c:276
 msgid "Gross Profit Margin"
 msgstr "อั�รา�ำ�รสุ��ิ"
 
 #. Title of Payment Period dialog
-#: ../data/financial.ui.h:38
+#: ../data/buttons-financial.ui.h:58
 msgid "Payment Period"
 msgstr "�ำ�ว��ว���อ�ส��"
 
 #. Title of Periodic Interest Rate dialog
-#: ../data/financial.ui.h:40
+#. Tooltip for the periodic interest rate button
+#: ../data/buttons-financial.ui.h:60 ../src/math-buttons.c:267
 msgid "Periodic Interest Rate"
 msgstr "อั�รา�อ���ี�ย��อ�ว�"
 
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/financial.ui.h:42
+#: ../data/buttons-financial.ui.h:62
 msgid "Periodic Interest _Rate:"
 msgstr "อั�รา_�อ���ี�ย��อ�ว�:"
 
 #. Title of Periodic Payment dialog
-#: ../data/financial.ui.h:44
+#. Tooltip for the periodic payment button
+#: ../data/buttons-financial.ui.h:64 ../src/math-buttons.c:273
 msgid "Periodic Payment"
 msgstr "��ิ���อ���อ�ว�"
 
+#. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
+#: ../data/buttons-financial.ui.h:66
+msgid "Pmt"
+msgstr "Pmt"
+
 #. Title of Present Value dialog
-#: ../data/financial.ui.h:46
+#. Tooltip for the present value button
+#: ../data/buttons-financial.ui.h:68 ../src/math-buttons.c:270
 msgid "Present Value"
 msgstr "มูล��า�ั��ุ�ั�"
 
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/financial.ui.h:48
+#: ../data/buttons-financial.ui.h:70
 msgid "Present _Value:"
 msgstr "มูล��า_�ั��ุ�ั�:"
 
+#. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
+#: ../data/buttons-financial.ui.h:72
+msgid "Pv"
+msgstr "Pv"
+
+#. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
+#: ../data/buttons-financial.ui.h:74
+msgid "Rate"
+msgstr "อั�รา"
+
+#. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
+#: ../data/buttons-financial.ui.h:78
+msgid "Sln"
+msgstr "Sln"
+
 #. Title of Straight-Line Depreciation dialog
-#: ../data/financial.ui.h:50
+#: ../data/buttons-financial.ui.h:82
 msgid "Straight-Line Depreciation"
 msgstr "��า�สื�อมรา�า����ส���ร�"
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
-#: ../data/financial.ui.h:52
+#: ../data/buttons-financial.ui.h:84
 msgid "Sum-of-the-Years'-Digits Depreciation"
 msgstr "��า�สื�อมรา�า����ลรวม�ำ�ว��ี"
 
+#. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
+#: ../data/buttons-financial.ui.h:86
+msgid "Syd"
+msgstr "Syd"
+
+#. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
+#: ../data/buttons-financial.ui.h:88
+msgid "Term"
+msgstr "Term"
+
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
-#: ../data/financial.ui.h:54
+#: ../data/buttons-financial.ui.h:92
 msgid "_Cost:"
 msgstr "_รา�า�ุ�:"
 
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/financial.ui.h:56
+#: ../data/buttons-financial.ui.h:94
 msgid "_Future Value:"
 msgstr "มูล��า��_อ�า��:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
-#: ../data/financial.ui.h:58
+#: ../data/buttons-financial.ui.h:96
 msgid "_Life:"
 msgstr "_อายุ����า�:"
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/financial.ui.h:60
+#: ../data/buttons-financial.ui.h:98
 msgid "_Margin:"
 msgstr "อั�รา_�ำ�ร:"
 
 #. Present Value Dialog: Label before number of periods input
-#: ../data/financial.ui.h:62
+#: ../data/buttons-financial.ui.h:100
 msgid "_Number of Periods:"
 msgstr "_�ำ�ว��ว�:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
-#: ../data/financial.ui.h:64
+#: ../data/buttons-financial.ui.h:102
 msgid "_Period:"
 msgstr "_ระยะ�วลา:"
 
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/financial.ui.h:66
+#: ../data/buttons-financial.ui.h:104
 msgid "_Periodic Payment:"
 msgstr "��ิ�_��อ���อ�ว�:"
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/financial.ui.h:68
+#: ../data/buttons-financial.ui.h:106
 msgid "_Principal:"
 msgstr "��ิ�_���:"
 
 #. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
-#: ../data/financial.ui.h:70
+#: ../data/buttons-financial.ui.h:108
 msgid "_Salvage:"
 msgstr "รา�า�า_�:"
 
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/financial.ui.h:72
+#: ../data/buttons-financial.ui.h:110
 msgid "_Term:"
 msgstr "_�ำ�ว��ว�:"
 
-#. The label on the memory recall button
-#: ../data/gcalctool.ui.h:2
-msgid "&#x2190; R"
-msgstr "&#x2190; R"
-
-#. The label on the memory store button
-#: ../data/gcalctool.ui.h:4
-msgid "&#x2192; R"
-msgstr "&#x2192; R"
-
-#. The label on the currency button
-#: ../data/gcalctool.ui.h:6
-msgid "&#xA4;$&#x20AC;"
-msgstr "&#x0E3F;$&#x20AC;"
-
-#. Right Shift Popup: Menu item to shift right by 10 bits
-#: ../data/gcalctool.ui.h:8
-msgid "10 places"
-msgstr "10 �ำ�ห���"
+#. Insert ASCII dialog: Label before character entry
+#: ../data/buttons-programming.ui.h:10
+msgid "Ch_aracter:"
+msgstr "�ัว_อั�ษร:"
 
-#. Right Shift Popup: Menu item to shift right by 11 bits
-#: ../data/gcalctool.ui.h:10
-msgid "11 places"
-msgstr "11 �ำ�ห���"
+#. Accessible name for the insert character button
+#: ../data/buttons-programming.ui.h:20
+msgid "Insert Character"
+msgstr "��ร��ัวอั�ษร"
 
-#. Right Shift Popup: Menu item to shift right by 12 bits
-#: ../data/gcalctool.ui.h:12
-msgid "12 places"
-msgstr "12 �ำ�ห���"
+#. Title of insert character code dialog
+#. Tooltip for the insert character code button
+#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:228
+msgid "Insert Character Code"
+msgstr "��ร�รหัส�ัวอั�ษร"
 
-#. Right Shift Popup: Menu item to shift right by 13 bits
-#: ../data/gcalctool.ui.h:14
-msgid "13 places"
-msgstr "13 �ำ�ห���"
+#. Accessible name for the shift left button
+#. Tooltip for the shift left button
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.c:243
+msgid "Shift Left"
+msgstr "�ลื�อ��ิ����า���าย"
 
-#. Right Shift Popup: Menu item to shift right by 14 bits
-#: ../data/gcalctool.ui.h:16
-msgid "14 places"
-msgstr "14 �ำ�ห���"
+#. Accessible name for the shift right button
+#. Tooltip for the shift right button
+#: ../data/buttons-programming.ui.h:30 ../src/math-buttons.c:246
+msgid "Shift Right"
+msgstr "�ลื�อ��ิ����า��วา"
 
-#. Right Shift Popup: Menu item to shift right by 15 bits
-#: ../data/gcalctool.ui.h:18
-msgid "15 places"
-msgstr "15 �ำ�ห���"
+#. Insert ASCII dialog: Button to insert selected character
+#: ../data/buttons-programming.ui.h:38
+msgid "_Insert"
+msgstr "�_�ร�"
 
 #. Word size combo: 16 bits
-#: ../data/gcalctool.ui.h:20
+#: ../data/preferences.ui.h:2
 msgid "16-bit"
 msgstr "16 �ิ�"
 
 #. Word size combo: 32 bits
-#: ../data/gcalctool.ui.h:22
+#: ../data/preferences.ui.h:4
 msgid "32-bit"
 msgstr "32 �ิ�"
 
 #. Word size combo: 64 bits
-#: ../data/gcalctool.ui.h:24
+#: ../data/preferences.ui.h:6
 msgid "64-bit"
 msgstr "64 �ิ�"
 
 #. Word size combo: 8 bits
-#: ../data/gcalctool.ui.h:26
+#: ../data/preferences.ui.h:8
 msgid "8-bit"
 msgstr "8 �ิ�"
 
-#. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/gcalctool.ui.h:28
-msgid "="
-msgstr "="
-
-#. Accessible name for the absolute value button
-#: ../data/gcalctool.ui.h:30
-msgid "Absolute Value"
-msgstr "��าสัม�ูร��"
-
-#. Tooltip for the absolute value button
-#: ../data/gcalctool.ui.h:32
-msgid "Absolute value [|]"
-msgstr "��าสัม�ูร�� [|]"
-
-#. Tooltip for the addition button
-#: ../data/gcalctool.ui.h:34
-msgid "Add [+]"
-msgstr "�ว� [+]"
-
-#. Tooltip for the answer variable button
-#: ../data/gcalctool.ui.h:36
-msgid "Answer variable"
-msgstr "�ัว��ร����ำ�อ�ล�าสุ�"
-
-#. Tooltip for the base 10 logarithm button
-#: ../data/gcalctool.ui.h:38
-msgid "Base 10 logarithm"
-msgstr "ลอ�าริ�ึม�า�สิ�"
-
-#. Accessible name for the base 16 button
-#: ../data/gcalctool.ui.h:40
-msgid "Base 16"
-msgstr "�า�สิ�ห�"
-
-#. Accessible name for the base 2 button
-#: ../data/gcalctool.ui.h:42
-msgid "Base 2"
-msgstr "�า�สอ�"
-
-#. Accessible name for the base 8 button
-#: ../data/gcalctool.ui.h:44
-msgid "Base 8"
-msgstr "�า����"
-
-#. Number display mode combo: Binary, e.g. 10011010010&#x2082;
-#: ../data/gcalctool.ui.h:46
-msgid "Binary"
-msgstr "�า�สอ�"
-
-#. Tooltip for the boolean AND button
-#: ../data/gcalctool.ui.h:48
-msgid "Boolean AND"
-msgstr "AND ����ูลี�"
-
-#. Tooltip for the boolean NOT button
-#: ../data/gcalctool.ui.h:50
-msgid "Boolean NOT"
-msgstr "NOT ����ูลี�"
-
-#. Tooltip for the boolean OR button
-#: ../data/gcalctool.ui.h:52
-msgid "Boolean OR"
-msgstr "OR ����ูลี�"
-
-#. Tooltip for the boolean exclusive OR button
-#: ../data/gcalctool.ui.h:54
-msgid "Boolean exclusive OR"
-msgstr "Exclusive OR ����ูลี�"
-
-#. Tooltip for the solve button
-#: ../data/gcalctool.ui.h:56
-msgid "Calculate result [=]"
-msgstr "�ำ�ว��ลลั��� [=]"
-
-#. Insert ASCII dialog: Label before character entry
-#: ../data/gcalctool.ui.h:58
-msgid "Ch_aracter:"
-msgstr "�ัว_อั�ษร:"
-
-#. Tooltop for the clear display button
-#: ../data/gcalctool.ui.h:60
-msgid "Clear display [Escape]"
-msgstr "ล�า���อ��ส���ล [Escape]"
-
-#. Label on the clear display button. Clr is short for Clear
-#: ../data/gcalctool.ui.h:62
-msgid "Clr"
-msgstr "Clr"
-
-#. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: ../data/gcalctool.ui.h:64
-msgid "Ctrm"
-msgstr "Ctrm"
-
-#. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/gcalctool.ui.h:66
-msgid "Ddb"
-msgstr "Ddb"
-
-#. Number display mode combo: Decimal, e.g. 1234
-#: ../data/gcalctool.ui.h:68
-msgid "Decimal"
-msgstr "�า�สิ�"
-
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../data/gcalctool.ui.h:70
-msgid "Degrees"
-msgstr "อ�ศา"
-
 #. Preferences dialog: Label for display format combo box
-#: ../data/gcalctool.ui.h:72
-msgid "Display _Format:"
-msgstr "รู��_���าร�ส���ล:"
-
-#. Tooltip for the division button
-#: ../data/gcalctool.ui.h:74
-msgid "Divide [/]"
-msgstr "หาร [/]"
-
-#. Tooltip for the end block button
-#: ../data/gcalctool.ui.h:76
-msgid "End block [)]"
-msgstr "���ล�อ� [)]"
-
-#. Number display mode combo: Engineering, e.g. 1.234k
-#: ../data/gcalctool.ui.h:78
-msgid "Engineering"
-msgstr "วิศว�รรม"
-
-#. Tooltip for the Euler's number button
-#: ../data/gcalctool.ui.h:80
-msgid "Euler's number"
-msgstr "��า���ี��อ�ออย�ลอร� (e)"
-
-#. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/gcalctool.ui.h:82
-msgid "Exponent"
-msgstr "ย��ำลั�"
-
-#. Tooltip for the exponentiation (x to the power of y) button
-#: ../data/gcalctool.ui.h:84
-msgid "Exponent [^ or **]"
-msgstr "ย��ำลั� [^ หรือ **]"
-
-#. Accessible name for the factorial button
-#: ../data/gcalctool.ui.h:86
-msgid "Factorial"
-msgstr "����อ�รียล"
-
-#. Tooltip for the factorial button
-#: ../data/gcalctool.ui.h:88
-msgid "Factorial [!]"
-msgstr "����อ�รียล [!]"
-
-#. Accessible name for the factorize button
-#: ../data/gcalctool.ui.h:90
-msgid "Factorize"
-msgstr "�ย��ัว�ระ�อ�"
-
-#. Tooltip for the factorize button
-#: ../data/gcalctool.ui.h:92
-msgid "Factorize into prime numbers (Ctrl+F)"
-msgstr "�ย��ัว�ระ�อ������ำ�ว����าะ (Ctrl+F)"
-
-#. Tooltip for the fractional portion button
-#: ../data/gcalctool.ui.h:94
-msgid "Fractional portion"
-msgstr "ส�ว��ศษ�ศ�ิยม"
-
-#. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: ../data/gcalctool.ui.h:96
-msgid "Fv"
-msgstr "Fv"
-
-#. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: ../data/gcalctool.ui.h:98
-msgid "Gpm"
-msgstr "Gpm"
-
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../data/gcalctool.ui.h:100
-msgid "Gradians"
-msgstr "��ร��ีย�"
-
-#. Number display mode combo: Hexadecimal, e.g. 4D2&#x2081;&#x2086;
-#: ../data/gcalctool.ui.h:102
-msgid "Hexadecimal"
-msgstr "�า�สิ�ห�"
-
-#. Title of insert ASCII dialog
-#: ../data/gcalctool.ui.h:104
-msgid "Insert ASCII Value"
-msgstr "��ร���า ASCII"
-
-#. Accessible name for the insert character button
-#: ../data/gcalctool.ui.h:106
-msgid "Insert Character"
-msgstr "��ร��ัวอั�ษร"
-
-#. Tooltip for the insert character button
-#: ../data/gcalctool.ui.h:108
-msgid "Insert character"
-msgstr "��ร��ัวอั�ษร"
+#: ../data/preferences.ui.h:10
+msgid "Number _Format:"
+msgstr "รู��_���ัว�ล�:"
 
-#. Tooltip for the integer portion button
-#: ../data/gcalctool.ui.h:110
-msgid "Integer portion"
-msgstr "ส�ว��ำ�ว����ม"
-
-#. Accessible name for the inverse button
-#: ../data/gcalctool.ui.h:112
-msgid "Inverse"
-msgstr "ส�ว��ลั�"
-
-#. Tooltip for the inverse button
-#: ../data/gcalctool.ui.h:114
-msgid "Inverse [Ctrl+I]"
-msgstr "ส�ว��ลั� [Ctrl+I]"
-
-#. Tooltip for the modulus division button
-#: ../data/gcalctool.ui.h:116
-msgid "Modulus divide"
-msgstr "หาร�อา�ศษ"
-
-#. Tooltip for the multiplication button
-#: ../data/gcalctool.ui.h:118
-msgid "Multiply [*]"
-msgstr "�ู� [*]"
-
-#. Tooltip for the natural logarithm button
-#: ../data/gcalctool.ui.h:120
-msgid "Natural logarithm"
-msgstr "ลอ�าริ�ึม�รรม�า�ิ"
-
-#. Tooltip for the numeric point button
-#: ../data/gcalctool.ui.h:122
-msgid "Numeric point [. or ,]"
-msgstr "�ุ��ศ�ิยม [. หรือ ,]"
-
-#. Number display mode combo: Octal, e.g. 2322&#x2088;
-#: ../data/gcalctool.ui.h:124
-msgid "Octal"
-msgstr "�า����"
-
-#. Tooltip for the ones' complement button
-#: ../data/gcalctool.ui.h:126
-msgid "Ones' complement"
-msgstr "ส�ว���ิม���มห�ึ��"
-
-#. Tooltip on the percentage button
-#: ../data/gcalctool.ui.h:129
-#, no-c-format
-msgid "Percentage [%]"
-msgstr "อั�ราร�อยละ [%]"
-
-#. Tooltip for the Pi button
-#: ../data/gcalctool.ui.h:131
-msgid "Pi [Ctrl+P]"
-msgstr "�าย [Ctrl+P]"
-
-#. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: ../data/gcalctool.ui.h:133
-msgid "Pmt"
-msgstr "Pmt"
-
-#: ../data/gcalctool.ui.h:134
+#. Title of preferences dialog
+#: ../data/preferences.ui.h:11 ../src/math-preferences.c:233
 msgid "Preferences"
 msgstr "�รั�����"
 
-#. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: ../data/gcalctool.ui.h:136
-msgid "Pv"
-msgstr "Pv"
-
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../data/gcalctool.ui.h:138
-msgid "Radians"
-msgstr "�ร��ีย�"
-
-#. Tooltip for the random number button
-#: ../data/gcalctool.ui.h:140
-msgid "Random number"
-msgstr "��าสุ�ม"
-
-#. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/gcalctool.ui.h:142
-msgid "Rate"
-msgstr "อั�รา"
-
-#. Accessible name for the recall value button
-#: ../data/gcalctool.ui.h:144
-msgid "Recall"
-msgstr "�รีย��ื�"
-
-#. Tooltip for the recall value button
-#: ../data/gcalctool.ui.h:146
-msgid "Recall value"
-msgstr "�รีย���า�ื�"
-
-#. Accessible description for the area in which results are displayed
-#: ../data/gcalctool.ui.h:148
-msgid "Result Region"
-msgstr "�ริ�ว��ส���ลลั���"
-
-#. Tooltip for the root button
-#: ../data/gcalctool.ui.h:150
-msgid "Root [Ctrl+S]"
-msgstr "รา� [Ctrl+S]"
-
-#. Number display mode combo: Scientific, e.g. 1.234&#xD7;10^3
-#: ../data/gcalctool.ui.h:152
-msgid "Scientific"
-msgstr "วิ�ยาศาส�ร�"
-
-#. Accessible name for the scientific exponent button
-#: ../data/gcalctool.ui.h:154
-msgid "Scientific Exponent"
-msgstr "�ล��ี��ำลั�วิ�ยาศาส�ร�"
-
-#. Tooltip for the scientific exponent button
-#: ../data/gcalctool.ui.h:156
-msgid "Scientific exponent [Ctrl+E]"
-msgstr "�ล��ี��ำลั�วิ�ยาศาส�ร� [Ctrl+E]"
-
-#. Accessible name for the shift left button
-#: ../data/gcalctool.ui.h:158
-msgid "Shift Left"
-msgstr "�ลื�อ��ิ����า���าย"
-
-#. Accessible name for the shift right button
-#: ../data/gcalctool.ui.h:160
-msgid "Shift Right"
-msgstr "�ลื�อ��ิ����า��วา"
-
-#. Tooltip for the shift left button
-#: ../data/gcalctool.ui.h:162
-msgid "Shift left [<]"
-msgstr "�ลื�อ��ิ����า���าย [<]"
-
-#. Tooltip for the shift right button
-#: ../data/gcalctool.ui.h:164
-msgid "Shift right [>]"
-msgstr "�ลื�อ��ิ����า��วา [>]"
-
 #. Preferences dialog: label for show thousands separator check button
-#: ../data/gcalctool.ui.h:166
+#: ../data/preferences.ui.h:13
 msgid "Show _thousands separators"
 msgstr "�ส��สั�ลั�ษ������หลั�_�ั�"
 
 #. Preferences dialog: label for show trailing zeroes check button
-#: ../data/gcalctool.ui.h:168
+#: ../data/preferences.ui.h:15
 msgid "Show trailing _zeroes"
 msgstr "�ส���ล�ศู_�ย���อ��าย"
 
-#. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/gcalctool.ui.h:170
-msgid "Sln"
-msgstr "Sln"
-
-#. Tooltip for the start block button
-#: ../data/gcalctool.ui.h:172
-msgid "Start block [(]"
-msgstr "�ริ�ม�ล�อ� [(]"
-
-#. Accessible name for the store value button
-#: ../data/gcalctool.ui.h:174
-msgid "Store"
-msgstr "����"
-
-#. Tooltip for the store value button
-#: ../data/gcalctool.ui.h:176
-msgid "Store value"
-msgstr "������า"
-
-#. Accessible name for the subscript mode button
-#: ../data/gcalctool.ui.h:178
-msgid "Subscript"
-msgstr "�ัวห�อย"
-
-#. Tooltip for the subscript mode button
-#: ../data/gcalctool.ui.h:180
-msgid "Subscript number mode [Alt+number]"
-msgstr "�หม��ล��ัวห�อย [Alt+�ัว�ล�]"
-
-#. Tooltip for the subtraction button
-#: ../data/gcalctool.ui.h:182
-msgid "Subtract [-]"
-msgstr "ล� [-]"
-
-#. Accessible name for the superscript mode button
-#: ../data/gcalctool.ui.h:184
-msgid "Superscript"
-msgstr "�ัวย�"
-
-#. Tooltip for the superscript mode button
-#: ../data/gcalctool.ui.h:186
-msgid "Superscript number mode [Ctrl+number]"
-msgstr "�หม��ล��ัวย� [Ctrl+�ัว�ล�]"
-
-#. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/gcalctool.ui.h:188
-msgid "Syd"
-msgstr "Syd"
-
-#. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: ../data/gcalctool.ui.h:190
-msgid "Term"
-msgstr "Term"
-
-#. Tooltip for the truncate button
-#: ../data/gcalctool.ui.h:192
-msgid "Truncate value"
-msgstr "�ั��อ���า"
-
-#. Tooltip for the two's complement button
-#: ../data/gcalctool.ui.h:194
-msgid "Two's complement"
-msgstr "ส�ว���ิม���มสอ�"
-
 #. Preferences dialog: label for word size combo box
-#: ../data/gcalctool.ui.h:196
+#: ../data/preferences.ui.h:17
 msgid "Word _size:"
 msgstr "_��า��วิร��:"
 
-#. Right Shift Popup: Menu item to shift right by 1 bit
-#: ../data/gcalctool.ui.h:198
-msgid "_1 place"
-msgstr "_1 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 2 bits
-#: ../data/gcalctool.ui.h:200
-msgid "_2 places"
-msgstr "_2 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 3 bits
-#: ../data/gcalctool.ui.h:202
-msgid "_3 places"
-msgstr "_3 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 4 bits
-#: ../data/gcalctool.ui.h:204
-msgid "_4 places"
-msgstr "_4 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 5 bits
-#: ../data/gcalctool.ui.h:206
-msgid "_5 places"
-msgstr "_5 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 6 bits
-#: ../data/gcalctool.ui.h:208
-msgid "_6 places"
-msgstr "_6 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 7 bits
-#: ../data/gcalctool.ui.h:210
-msgid "_7 places"
-msgstr "_7 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 8 bits
-#: ../data/gcalctool.ui.h:212
-msgid "_8 places"
-msgstr "_8 �ำ�ห���"
-
-#. Right Shift Popup: Menu item to shift right by 9 bits
-#: ../data/gcalctool.ui.h:214
-msgid "_9 places"
-msgstr "_9 �ำ�ห���"
-
-#. View|Advanced menu item
-#: ../data/gcalctool.ui.h:216
-msgid "_Advanced"
-msgstr "�ิ_�ศษ"
-
 #. Preferences dialog: Label for angle unit combo box
-#: ../data/gcalctool.ui.h:218
+#: ../data/preferences.ui.h:19
 msgid "_Angle units:"
 msgstr "ห��วยมุ_ม:"
 
-#. View|Basic menu item
-#: ../data/gcalctool.ui.h:220
-msgid "_Basic"
-msgstr "_�ื���า�"
-
-#. Calculator menu
-#: ../data/gcalctool.ui.h:222
-msgid "_Calculator"
-msgstr "�_�รื�อ��ิ��ล�"
-
-#. Help|Contents menu
-#: ../data/gcalctool.ui.h:224
-msgid "_Contents"
-msgstr "�_�ื�อหา"
-
-#. View|Financial menu item
-#: ../data/gcalctool.ui.h:226
-msgid "_Financial"
-msgstr "�าร�_�ิ�"
-
-#. Help menu
-#: ../data/gcalctool.ui.h:228
-msgid "_Help"
-msgstr "_วิ�ี���"
-
-#. Insert ASCII dialog: Button to insert selected character
-#: ../data/gcalctool.ui.h:230
-msgid "_Insert"
-msgstr "�_�ร�"
-
-#. View|Programming menu item
-#: ../data/gcalctool.ui.h:232
-msgid "_Programming"
-msgstr "�าร��ีย��_�ร��รม"
-
-#. View|Scientific menu item
-#: ../data/gcalctool.ui.h:234
-msgid "_Scientific"
-msgstr "_วิ�ยาศาส�ร�"
-
-#. View menu
-#: ../data/gcalctool.ui.h:236
-msgid "_View"
-msgstr "มุ_มมอ�"
-
-#. Translators: The window title when in basic mode
-#: ../data/gcalctool.desktop.in.h:1 ../src/gtk.c:96
+#. Title of main window
+#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:520
 msgid "Calculator"
 msgstr "��รื�อ��ิ��ล�"
 
@@ -899,28 +538,28 @@ msgstr "�ส���ล�ศู�ย���อ��าย"
 
 #: ../data/gcalctool.schemas.in.h:11
 msgid ""
-"The initial calculator mode. Valid values are \"BASIC\", \"FINANCIAL\", "
-"\"LOGICAL\", \"SCIENTIFIC\" and \"PROGRAMMING\""
+"The display format used in advanced mode. One of: \"ENG\" (engineering), "
+"\"FIX\" (fixed-point) and \"SCI\" (scientific)"
 msgstr ""
-"�หม���รื�อ��ิ��ล��ริ�ม��� ��า�ี�����������ือ \"BASIC\" (�ื���า�), \"FINANCIAL\" (�าร��ิ�), "
-"\"LOGICAL\" (�ิ�ศษ), \"SCIENTIFIC\" (วิ�ยาศาส�ร�) �ละ \"PROGRAMMING\" "
-"(�าร��ีย���ร��รม)"
+"รู�����าร�ส���ล���หม��ิ�ศษ ��า�ี�����������ือ \"ENG\" (วิศว�รรม), \"FIX\" "
+"(�ุ��ศ�ิยม�าย�ัว) �ละ \"SCI\" (วิ�ยาศาส�ร�)"
 
 #: ../data/gcalctool.schemas.in.h:12
 msgid ""
-"The initial display mode. Valid values are \"ENG\" (engineering), \"FIX"
-"\" (fixed-point) and \"SCI\" (scientific)"
+"The initial calculator mode. Valid values are \"BASIC\", \"FINANCIAL\", "
+"\"LOGICAL\", \"SCIENTIFIC\" and \"PROGRAMMING\""
 msgstr ""
-"�หม��าร�ส���ล�ริ�ม�ร� ��า�ี�����������ือ \"ENG\" (วิศว�รรม), \"FIX\" (�ุ��ศ�ิยม�าย�ัว) "
-"�ละ \"SCI\" (วิ�ยาศาส�ร�)"
+"�หม���รื�อ��ิ��ล��ริ�ม��� ��า�ี�����������ือ \"BASIC\" (�ื���า�), \"FINANCIAL\" (�าร��ิ�), "
+"\"LOGICAL\" (�ิ�ศษ), \"SCIENTIFIC\" (วิ�ยาศาส�ร�) �ละ \"PROGRAMMING"
+"\" (�าร��ีย���ร��รม)"
 
 #: ../data/gcalctool.schemas.in.h:13
 msgid ""
 "The initial trigonometric type. Valid values are \"DEG\" (degrees), \"GRAD"
 "\" (gradians) and \"RAD\" (radians)."
 msgstr ""
-"รู�����รี���มิ�ิ�ริ�ม�ร� ��า�ี�����������ือ \"DEG\" (อ�ศา), \"GRAD\" (��ร��ีย�) �ละ "
-"\"RAD\" (�ร��ีย�)"
+"รู�����รี���มิ�ิ�ริ�ม�ร� ��า�ี�����������ือ \"DEG\" (อ�ศา), \"GRAD\" (��ร��ีย�) �ละ \"RAD"
+"\" (�ร��ีย�)"
 
 #: ../data/gcalctool.schemas.in.h:14
 msgid "The initial x-coordinate for the window"
@@ -945,8 +584,8 @@ msgid "The number of pixels to place the window from the top of the screen."
 msgstr "�ิ�ั��ุ���ว�ั���ี��ะวา�ห��า��า� �ั��า��อ����อ�ห��า�อ"
 
 #: ../data/gcalctool.schemas.in.h:19
-msgid "The numeric base for input and display."
-msgstr "�า��ล�สำหรั��าร��อ���อมูล�ละ�ส���ล"
+msgid "The numeric base (used in programming mode)"
+msgstr "�า��ล� (สำหรั��หม��าร��ีย���ร��รม)"
 
 #: ../data/gcalctool.schemas.in.h:20
 msgid ""
@@ -962,83 +601,6 @@ msgstr "รู�����รี���มิ�ิ"
 msgid "Word size"
 msgstr "��า��วิร��"
 
-#. Description on how to use gcalctool displayed on command-line
-#: ../src/calctool.c:79
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s â?? Perform mathematical calculations"
-msgstr ""
-"วิ�ี���:\n"
-"  %s â?? à¹?à¸?รืà¹?อà¸?à¸?ำà¸?วà¸?à¸?าà¸?à¸?à¸?ิà¸?ศาสà¸?รà¹?"
-
-#. Description on gcalctool command-line help options displayed on command-line
-#: ../src/calctool.c:87
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -v, --version                   Show release version\n"
-"  -h, -?, --help                  Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"�ัว�ลือ�:\n"
-"  -v, --version                   �ส���ล�รุ��\n"
-"  -h, -?, --help                  �ส���ำอ�ิ�าย�ัว�ลือ���า��\n"
-"  --help-all                      �ส���ำอ�ิ�าย�อ��ัว�ลือ��ั��หม�\n"
-"  --help-gtk                      �ส���ัว�ลือ� GTK+"
-
-#. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/calctool.c:98
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"�ัว�ลือ� GTK+:\n"
-"  --class=CLASS                   �ลาส�อ���ร��รม�าม�ี������ย��ร��รม�ั��ารห��า��า�\n"
-"  --name=NAME                     �ื�อ�อ���ร��รม�าม�ี������ย��ร��รม�ั��ารห��า��า�\n"
-"  --screen=SCREEN                 ส�รี� X �ี��ะ���\n"
-"  --sync                          �ำ�ห��าร�รีย� X �������หยุ��อย (synchronous)\n"
-"  --gtk-module=MODULES            �หล�มอ�ูล GTK+ ��ิ�ม��ิม\n"
-"  --g-fatal-warnings              �ือว�า�ำ��ือ���า�� �ี���ิ��ึ�������วาม�ิ��ลา�ร�าย�ร�"
-
-#. Description on gcalctool application options displayed on command-line
-#: ../src/calctool.c:111
-#, c-format
-msgid ""
-"Application Options:\n"
-"  -u, --unittest                  Perform unit tests\n"
-"  -s, --solve <equation>          Solve the given equation"
-msgstr ""
-"�ัว�ลือ��อ���ร��รม:\n"
-"  -u, --unittest                  �รีย��าร��สอ�ห��วยย�อย\n"
-"  -s, --solve <equation>          หา�ลลั����อ��ิ�����ี��ำห��"
-
-#. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/calctool.c:148
-#, c-format
-msgid "Argument --solve requires an equation to solve"
-msgstr "อาร��ิว�ม��� --solve ��อ��าร�ิ�����ี��ะหา�ลลั�����วย"
-
-#. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/calctool.c:162
-#, c-format
-msgid "Unknown argument '%s'"
-msgstr "�ม�รู��ั�อาร��ิว�ม��� '%s'"
-
-#. Translators: Digits localized for the given language
-#: ../src/calctool.c:175
-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"
-
 #: ../src/currency.h:18
 msgid "Australian dollar"
 msgstr "�อลลาร� ออส��ร�ลีย"
@@ -1179,96 +741,503 @@ msgstr "�อลลาร� สหรั�"
 msgid "South African rand"
 msgstr "�ร��� �อ�ริ�า���"
 
-#: ../src/display.c:390
-msgid "No undo history"
-msgstr "�ม�มี�ระวั�ิ�ำสั���ี��ะ�รีย��ื�"
+#. Description on how to use gcalctool displayed on command-line
+#: ../src/gcalctool.c:77
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s â?? Perform mathematical calculations"
+msgstr ""
+"วิ�ี���:\n"
+"  %s â?? à¹?à¸?รืà¹?อà¸?à¸?ำà¸?วà¸?à¸?าà¸?à¸?à¸?ิà¸?ศาสà¸?รà¹?"
 
-#: ../src/display.c:405
-msgid "No redo steps"
-msgstr "�ม�มีราย�าร�ำสั���ี��ะ�ำ��ำ"
+#. Description on gcalctool command-line help options displayed on command-line
+#: ../src/gcalctool.c:85
+#, c-format
+msgid ""
+"Help Options:\n"
+"  -v, --version                   Show release version\n"
+"  -h, -?, --help                  Show help options\n"
+"  --help-all                      Show all help options\n"
+"  --help-gtk                      Show GTK+ options"
+msgstr ""
+"�ัว�ลือ�:\n"
+"  -v, --version                   �ส���ล�รุ��\n"
+"  -h, -?, --help                  �ส���ำอ�ิ�าย�ัว�ลือ���า��\n"
+"  --help-all                      �ส���ำอ�ิ�าย�อ��ัว�ลือ��ั��หม�\n"
+"  --help-gtk                      �ส���ัว�ลือ� GTK+"
 
-#. Translators: This message is displayed in the status bar when a bit
-#. shift operation is performed and the display does not contain a number
-#: ../src/display.c:936
-msgid "No sane value to bitwise shift"
-msgstr "�ม�มี��า�ี��������ห��ลื�อ��ิ�"
+#. Description on gcalctool command-line GTK+ options displayed on command-line
+#: ../src/gcalctool.c:96
+#, c-format
+msgid ""
+"GTK+ Options:\n"
+"  --class=CLASS                   Program class as used by the window "
+"manager\n"
+"  --name=NAME                     Program name as used by the window "
+"manager\n"
+"  --screen=SCREEN                 X screen to use\n"
+"  --sync                          Make X calls synchronous\n"
+"  --gtk-module=MODULES            Load additional GTK+ modules\n"
+"  --g-fatal-warnings              Make all warnings fatal"
+msgstr ""
+"�ัว�ลือ� GTK+:\n"
+"  --class=CLASS                   �ลาส�อ���ร��รม�าม�ี������ย��ร��รม�ั��ารห��า��า�\n"
+"  --name=NAME                     �ื�อ�อ���ร��รม�าม�ี������ย��ร��รม�ั��ารห��า��า�\n"
+"  --screen=SCREEN                 ส�รี� X �ี��ะ���\n"
+"  --sync                          �ำ�ห��าร�รีย� X �������หยุ��อย (synchronous)\n"
+"  --gtk-module=MODULES            �หล�มอ�ูล GTK+ ��ิ�ม��ิม\n"
+"  --g-fatal-warnings              �ือว�า�ำ��ือ���า�� �ี���ิ��ึ�������วาม�ิ��ลา�ร�าย�ร�"
 
-#. Translators: Error displayed when trying to factorize a non-integer value
-#: ../src/display.c:952
-msgid "Need an integer to factorize"
-msgstr "�าร�ย��ัว�ระ�อ��ำ����ั��ำ�ว����ม���า�ั��"
+#. Description on gcalctool application options displayed on command-line
+#: ../src/gcalctool.c:110
+#, c-format
+msgid ""
+"Application Options:\n"
+"  -u, --unittest                  Perform unit tests\n"
+"  -s, --solve <equation>          Solve the given equation"
+msgstr ""
+"�ัว�ลือ��อ���ร��รม:\n"
+"  -u, --unittest                  �รีย��าร��สอ�ห��วยย�อย\n"
+"  -s, --solve <equation>          หา�ลลั����อ��ิ�����ี��ำห��"
+
+#. Error printed to stderr when user uses --solve argument without an equation
+#: ../src/gcalctool.c:155
+#, c-format
+msgid "Argument --solve requires an equation to solve"
+msgstr "อาร��ิว�ม��� --solve ��อ��าร�ิ�����ี��ะหา�ลลั�����วย"
+
+#. Error printed to stderr when user provides an unknown command-line argument
+#: ../src/gcalctool.c:169
+#, c-format
+msgid "Unknown argument '%s'"
+msgstr "�ม�รู��ั�อาร��ิว�ม��� '%s'"
+
+#. Tooltip for the Pi button
+#: ../src/math-buttons.c:100
+msgid "Pi [Ctrl+P]"
+msgstr "�าย [Ctrl+P]"
+
+#. Tooltip for the Euler's Number button
+#: ../src/math-buttons.c:103
+msgid "Eulers Number"
+msgstr "��า���ี��อ�ออย�ลอร�"
+
+#. Tooltip for the subscript button
+#: ../src/math-buttons.c:108
+msgid "Subscript mode [Alt]"
+msgstr "�หม��ล��ัวห�อย [Alt]"
+
+#. Tooltip for the superscript button
+#: ../src/math-buttons.c:111
+msgid "Supercript mode [Ctrl]"
+msgstr "�หม��ล��ัวย� [Ctrl]"
+
+#. Tooltip for the scientific exponent button
+#: ../src/math-buttons.c:114
+msgid "Scientific exponent [Ctrl+E]"
+msgstr "�ล��ี��ำลั�วิ�ยาศาส�ร� [Ctrl+E]"
+
+#. Tooltip for the add button
+#: ../src/math-buttons.c:117
+msgid "Add [+]"
+msgstr "�ว� [+]"
+
+#. Tooltip for the subtract button
+#: ../src/math-buttons.c:120
+msgid "Subtract [-]"
+msgstr "ล� [-]"
+
+#. Tooltip for the multiply button
+#: ../src/math-buttons.c:123
+msgid "Multiply [*]"
+msgstr "�ู� [*]"
+
+#. Tooltip for the divide button
+#: ../src/math-buttons.c:126
+msgid "Divide [/]"
+msgstr "หาร [/]"
+
+#. Tooltip for the modulus divide button
+#: ../src/math-buttons.c:129
+msgid "Modulus divide"
+msgstr "หาร�อา�ศษ"
+
+#. Tooltip for the exponent button
+#: ../src/math-buttons.c:132
+msgid "Exponent [^ or **]"
+msgstr "ย��ำลั� [^ หรือ **]"
+
+#. Tooltip for the square button
+#: ../src/math-buttons.c:135
+msgid "Square [Ctrl+2]"
+msgstr "�ำลั�สอ� [Ctrl+2]"
+
+#. Tooltip for the percentage button
+#: ../src/math-buttons.c:138
+msgid "Percentage [%]"
+msgstr "อั�ราร�อยละ [%]"
+
+#. Tooltip for the factorial button
+#: ../src/math-buttons.c:141
+msgid "Factorial [!]"
+msgstr "����อ�รียล [!]"
+
+#. Tooltip for the absolute value button
+#: ../src/math-buttons.c:144
+msgid "Absolute value [|]"
+msgstr "��าสัม�ูร�� [|]"
+
+#. Tooltip for the complex conjugate button
+#: ../src/math-buttons.c:147
+msgid "Complex conjugate"
+msgstr "สั�ยุ��อ��ล���ิ���อ�"
+
+#. Tooltip for the root button
+#: ../src/math-buttons.c:150
+msgid "Root [Ctrl+R]"
+msgstr "รา� [Ctrl+R]"
+
+#. Tooltip for the square root button
+#: ../src/math-buttons.c:153
+msgid "Square root [Ctrl+R]"
+msgstr "รา��ี�สอ� [Ctrl+R]"
+
+#. Tooltip for the logarithm button
+#: ../src/math-buttons.c:156
+msgid "Logarithm"
+msgstr "ลอ�าริ�ึม"
+
+#. Tooltip for the natural logarithm button
+#: ../src/math-buttons.c:159
+msgid "Natural Logarithm"
+msgstr "ลอ�าริ�ึม�รรม�า�ิ"
+
+#. Tooltip for the sine button
+#: ../src/math-buttons.c:162
+msgid "Sine"
+msgstr "����"
+
+#. Tooltip for the cosine button
+#: ../src/math-buttons.c:165
+msgid "Cosine"
+msgstr "������"
+
+#. Tooltip for the tangent button
+#: ../src/math-buttons.c:168
+msgid "Tangent"
+msgstr "��������"
+
+#. Tooltip for the hyperbolic sine button
+#: ../src/math-buttons.c:171
+msgid "Hyperbolic Sine"
+msgstr "�����ฮ��อร���ลิ�"
+
+#. Tooltip for the hyperbolic cosine button
+#: ../src/math-buttons.c:174
+msgid "Hyperbolic Cosine"
+msgstr "�������ฮ��อร���ลิ�"
+
+#. Tooltip for the hyperbolic tangent button
+#: ../src/math-buttons.c:177
+msgid "Hyperbolic Tangent"
+msgstr "���������ฮ��อร���ลิ�"
+
+#. Tooltip for the inverse button
+#: ../src/math-buttons.c:180
+msgid "Inverse [Ctrl+I]"
+msgstr "ส�ว��ลั� [Ctrl+I]"
+
+#. Tooltip for the boolean AND button
+#: ../src/math-buttons.c:183
+msgid "Boolean AND"
+msgstr "AND ����ูลี�"
+
+#. Tooltip for the boolean OR button
+#: ../src/math-buttons.c:186
+msgid "Boolean OR"
+msgstr "OR ����ูลี�"
+
+#. Tooltip for the exclusive OR button
+#: ../src/math-buttons.c:189
+msgid "Boolean Exclusive OR"
+msgstr "Exclusive OR ����ูลี�"
+
+#. Tooltip for the boolean NOT button
+#: ../src/math-buttons.c:192
+msgid "Boolean NOT"
+msgstr "NOT ����ูลี�"
+
+#. Tooltip for the integer component button
+#: ../src/math-buttons.c:195
+msgid "Integer Component"
+msgstr "ส�ว��ำ�ว����ม"
+
+#. Tooltip for the fractional component button
+#: ../src/math-buttons.c:198
+msgid "Fractional Component"
+msgstr "ส�ว��ศษ�ศ�ิยม"
+
+#. Tooltip for the real component button
+#: ../src/math-buttons.c:201
+msgid "Real Component"
+msgstr "ส�ว��ริ�"
+
+#. Tooltip for the imaginary component button
+#: ../src/math-buttons.c:204
+msgid "Imaginary Component"
+msgstr "ส�ว��ิ��ภา�"
+
+#. Tooltip for the ones complement button
+#: ../src/math-buttons.c:207
+msgid "Ones Complement"
+msgstr "ส�ว���ิม���มห�ึ��"
+
+#. Tooltip for the twos complement button
+#: ../src/math-buttons.c:210
+msgid "Twos Complement"
+msgstr "ส�ว���ิม���มสอ�"
+
+#. Tooltip for the truncate button
+#: ../src/math-buttons.c:213
+msgid "Truncate"
+msgstr "�ั��อ���า"
+
+#. Tooltip for the start group button
+#: ../src/math-buttons.c:216
+msgid "Start Group [(]"
+msgstr "�ริ�ม�ลุ�ม�ำ�ว� [(]"
+
+#. Tooltip for the end group button
+#: ../src/math-buttons.c:219
+msgid "End Group [)]"
+msgstr "���ลุ�ม�ำ�ว� [)]"
+
+#. Tooltip for the assign variable button
+#: ../src/math-buttons.c:222
+msgid "Assign Variable"
+msgstr "�ห���า�ั��ัว��ร"
+
+#. Tooltip for the insert variable button
+#: ../src/math-buttons.c:225
+msgid "Insert Variable"
+msgstr "��ร��ัว��ร"
+
+#. Tooltip for the solve button
+#: ../src/math-buttons.c:231
+msgid "Calculate Result"
+msgstr "�ำ�ว��ลลั���"
+
+#. Tooltip for the factor button
+#: ../src/math-buttons.c:234
+msgid "Factorize [Ctrl+F]"
+msgstr "�ย��ัว�ระ�อ� [Ctrl+F]"
+
+#. Tooltip for the clear button
+#: ../src/math-buttons.c:237
+msgid "Clear Display [Escape]"
+msgstr "ล�า���อ��ส���ล [Escape]"
+
+#. Tooltip for the undo button
+#: ../src/math-buttons.c:240
+msgid "Undo [Ctrl+Z]"
+msgstr "�รีย��ื� [Ctrl+Z]"
+
+#. Tooltip for the double declining depreciation button
+#: ../src/math-buttons.c:252
+msgid "Double Declining Depreciation"
+msgstr "��า�สื�อมรา�า���ยอ�ล�ล��วี�ู�"
+
+#. Tooltip for the financial term button
+#: ../src/math-buttons.c:258
+msgid "Financial Term"
+msgstr "��อม�าร��ิ�"
+
+#. Tooltip for the sum of the years digits depreciation button
+#: ../src/math-buttons.c:261
+msgid "Sum of the Years Digits Depreciation"
+msgstr "��า�สื�อมรา�า����ลรวม�ำ�ว��ี"
+
+#. Tooltip for the straight line depreciation button
+#: ../src/math-buttons.c:264
+msgid "Straight Line Depreciation"
+msgstr "��า�สื�อมรา�า����ส���ร�"
+
+#. Tooltip for the currency button
+#: ../src/math-buttons.c:279
+msgid "Currency Converter"
+msgstr "��ล�ห��วยส�ุล��ิ�"
+
+#. Advanced buttons: Angle unit combo box: Use degrees for trigonometric calculations
+#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
+#: ../src/math-buttons.c:770 ../src/math-preferences.c:249
+msgid "Degrees"
+msgstr "อ�ศา"
+
+#. Advanced buttons: Angle unit combo box: Use radians for trigonometric calculations
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: ../src/math-buttons.c:774 ../src/math-preferences.c:253
+msgid "Radians"
+msgstr "�ร��ีย�"
+
+#. Advanced buttons: Angle unit combo box: Use gradians for trigonometric calculations
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: ../src/math-buttons.c:778 ../src/math-preferences.c:257
+msgid "Gradians"
+msgstr "��ร��ีย�"
+
+#. Number display mode combo: Binary, e.g. 10011010010â??
+#: ../src/math-buttons.c:812
+msgid "Binary"
+msgstr "�า�สอ�"
+
+#. Number display mode combo: Octal, e.g. 2322â??
+#: ../src/math-buttons.c:816
+msgid "Octal"
+msgstr "�า����"
+
+#. Number display mode combo: Decimal, e.g. 1234
+#: ../src/math-buttons.c:820
+msgid "Decimal"
+msgstr "�า�สิ�"
+
+#. Number display mode combo: Hexadecimal, e.g. 4D2â??â??
+#: ../src/math-buttons.c:824
+msgid "Hexadecimal"
+msgstr "�า�สิ�ห�"
+
+#. Text shown in store menu when no variables defined
+#. Text shown in recall menu when no variables defined
+#: ../src/math-buttons.c:1100 ../src/math-buttons.c:1145
+msgid "No variables defined"
+msgstr "�ม�����ำห���ัว��ร�ว�"
+
+#. Left Shift Popup: Menu item to shift left by n places (n < 10)
+#. Right Shift Popup: Menu item to shift right by n places (n < 10)
+#: ../src/math-buttons.c:1187 ../src/math-buttons.c:1230
+#, c-format
+msgid "_%d place"
+msgid_plural "_%d places"
+msgstr[0] "_%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:1191 ../src/math-buttons.c:1234
+#, c-format
+msgid "%d place"
+msgid_plural "%d places"
+msgstr[0] "%d �ำ�ห���"
+
+#. Translators: Title of the error dialog when prompting to download currency rates
+#: ../src/math-buttons.c:1422
+msgid ""
+"You don't have any recent currency rates. Should some be downloaded now?"
+msgstr "�ุ�ยั��ม�มี��อมูลอั�รา�ล���ลี�ย�ส�ุล��ิ�ล�าสุ��ลย �ะ�าว���หล��อ��ี��ลยหรือ�ม�?"
+
+#. Translators: Title of the error dialog when unable to download currency rates
+#: ../src/math-buttons.c:1432
+msgid ""
+"Currency rates could not be downloaded. You may receive inaccurate results, "
+"or you may not receive any results at all."
+msgstr ""
+"�ม�สามาร��าว���หล�อั�รา�ล���ลี�ย�ส�ุล��ิ���� �ุ�อา����รั��ลลั����ี��ลา���ลื�อ� "
+"หรืออา��ม����รั��ลลั������ �ลย"
 
-#: ../src/display.c:978
+#. Error shown when trying to undo with no undo history
+#: ../src/math-equation.c:467
+msgid "No undo history"
+msgstr "�ม�มี�ระวั�ิ�ำสั���ี��ะ�รีย��ื�"
+
+#. Error shown when trying to redo with no redo history
+#: ../src/math-equation.c:492
+msgid "No redo history"
+msgstr "�ม�มี�ระวั�ิ�ำสั���ี��ะ�ำ��ำ"
+
+#: ../src/math-equation.c:860
 msgid "No sane value to store"
 msgstr "�ม�มี��า�ี��������ห�����"
 
-#. Translators: Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/display.c:1099
+#. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
+#: ../src/math-equation.c:1130
 msgid "Overflow. Try a bigger word size"
 msgstr "��าล�� �รุ�าลอ������า��วิร���ี��ห���ว�า�ี�"
 
-#. Translators: Error displayed to user when they an unknown variable is entered
-#: ../src/display.c:1104
+#. Error displayed to user when they an unknown variable is entered
+#: ../src/math-equation.c:1135
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "�ม�รู��ั��ัว��ร '%s'"
 
-#. Translators: Error displayed to user when an unknown function is entered
-#: ../src/display.c:1110
+#. Error displayed to user when an unknown function is entered
+#: ../src/math-equation.c:1140
 #, c-format
 msgid "Function '%s' is not defined"
 msgstr "�ม�รู��ั��ั����ั� '%s'"
 
-#. Translators: Error displayed to user when an conversion with unknown units is attempted
-#: ../src/display.c:1116
-#, c-format
+#. Error displayed to user when an conversion with unknown units is attempted
+#: ../src/math-equation.c:1145
 msgid "Unknown conversion"
 msgstr "�ม�มี��อมูลสำหรั���ล�ห��วย"
 
-#. Translators: Error displayed to user when they enter an invalid calculation
-#: ../src/display.c:1125
+#. Error displayed to user when they enter an invalid calculation
+#: ../src/math-equation.c:1154
 msgid "Malformed expression"
 msgstr "รู�����ิ�����ม��ู���อ�"
 
-#. Translators: The window title when in advanced mode
-#: ../src/gtk.c:98
-msgid "Calculator â?? Advanced"
-msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ิà¹?ศษ"
-
-#. Translators: The window title when in financial mode
-#: ../src/gtk.c:100
-msgid "Calculator â?? Financial"
-msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ารà¹?à¸?ิà¸?"
-
-#. Translators: The window title when in scientific mode
-#: ../src/gtk.c:102
-msgid "Calculator â?? Scientific"
-msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? วิà¸?ยาศาสà¸?รà¹?"
-
-#. Translators: The window title when in programming mode
-#: ../src/gtk.c:104
-msgid "Calculator â?? Programming"
-msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ารà¹?à¸?ียà¸?à¹?à¸?รà¹?à¸?รม"
-
-#. Translators: Title of the error dialog when unable to load the UI files
-#: ../src/gtk.c:235
-msgid "Error loading user interface"
-msgstr "��ิ���อ�ิ��ลา���ะ��ิ����มส�ว��ิ���อ�ู����"
-
-#. Translators: Description in UI error dialog when unable to load the UI files. %s is replaced with the error message provided by GTK+
-#: ../src/gtk.c:238
+#. Error displayed when trying to factorize a non-integer value
+#: ../src/math-equation.c:1177
+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:1254
+msgid "No sane value to bitwise shift"
+msgstr "�ม�มี��า�ี��������ห��ลื�อ��ิ�"
+
+#. Message displayed when cannot toggle bit in display
+#: ../src/math-equation.c:1283
+msgid "Displayed value not an integer"
+msgstr "��า�ี��ส��อยู��ม�����ำ�ว����ม"
+
+#. Digits localized for the given language
+#: ../src/math-equation.c:1647
+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:239
+msgid "_Close"
+msgstr "�ิ_�"
+
+#. Number display mode combo: Fixed, e.g. 1234
+#: ../src/math-preferences.c:267
+msgid "Fixed"
+msgstr "�ศ�ิยม�าย�ัว"
+
+#. Number display mode combo: Scientific, e.g. 1.234Ã?10^3
+#: ../src/math-preferences.c:271
+msgid "Scientific"
+msgstr "วิ�ยาศาส�ร�"
+
+#. Number display mode combo: Engineering, e.g. 1.234k
+#: ../src/math-preferences.c:275
+msgid "Engineering"
+msgstr "วิศว�รรม"
+
+#. Label used in preferences dialog.  The %d is replaced by a spinbutton
+#: ../src/math-preferences.c:286
 #, c-format
-msgid ""
-"A required file is missing or damaged. Please check your installation.\n"
-"\n"
-"%s"
-msgstr ""
-"มี���ม�ี��ำ������อ����สู�หายหรือ�สียหาย �รุ�า�รว�สอ��าร�ิ��ั����ร��รม\n"
-"\n"
-"%s"
+msgid "Show %d decimal _places"
+msgstr "�ส���ุ��ศ�ิยม %d _�ำ�ห���"
+
+#. Translators: Error message displayed when unable to launch help browser
+#: ../src/math-window.c:170
+msgid "Unable to open help file"
+msgstr "�ม�สามาร���ิ����ม��อมูลวิ�ี���"
 
-#. Translators: The translator credits. Please translate this with your name(s).
-#: ../src/gtk.c:557
+#. The translator credits. Please translate this with your name(s).
+#: ../src/math-window.c:201
 msgid "translator-credits"
 msgstr ""
 "Ithipan Methasate\n"
@@ -1280,8 +1249,8 @@ msgstr ""
 "��า�อมี�วลา��ร�มา��วย�ั���ล\n"
 "http://gnome-th.sf.net";
 
-#. Translators: The license this software is under (GPL2+)
-#: ../src/gtk.c:560
+#. The license this software is under (GPL2+)
+#: ../src/math-window.c:204
 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"
@@ -1310,50 +1279,85 @@ msgstr ""
 "��า�ุ��ม����รั� �รุ�า�ิ���อ���ี� Free Software Foundation, Inc., \n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#. Translators: Program name in the about dialog
-#: ../src/gtk.c:576
+#. Program name in the about dialog
+#: ../src/math-window.c:221
 msgid "Gcalctool"
 msgstr "Gcalctool"
 
-#. Translators: Copyright notice in the about dialog
-#: ../src/gtk.c:579
+#. Copyright notice in the about dialog
+#: ../src/math-window.c:225
 msgid "© 1986â??2008 The Gcalctool authors"
 msgstr "© 1986â??2008 The Gcalctool authors"
 
-#. Translators: Short description in the about dialog
-#: ../src/gtk.c:582
+#. Short description in the about dialog
+#: ../src/math-window.c:229
 msgid "Calculator with financial and scientific modes."
 msgstr "��รื�อ��ิ��ล� �ร�อม��วย�หม��าร��ิ��ละวิ�ยาศาส�ร�"
 
-#. Translators: Error message displayed when unable to launch help browser
-#: ../src/gtk.c:636
-msgid "Unable to open help file"
-msgstr "�ม�สามาร���ิ����ม��อมูลวิ�ี���"
+#. Calculator menu
+#: ../src/math-window.c:354
+msgid "_Calculator"
+msgstr "�_�รื�อ��ิ��ล�"
 
-#. Translators: Title of the error dialog when prompting to download currency rates
-#: ../src/gtk.c:1010
-msgid ""
-"You don't have any recent currency rates. Should some be downloaded now?"
-msgstr "�ุ�ยั��ม�มี��อมูลอั�รา�ล���ลี�ย�ส�ุล��ิ�ล�าสุ��ลย �ะ�าว���หล��อ��ี��ลยหรือ�ม�?"
+#. Mode menu
+#: ../src/math-window.c:356
+msgid "_Mode"
+msgstr "�ห_ม�"
 
-#. Translators: Title of the error dialog when unable to download currency rates
-#: ../src/gtk.c:1020
-msgid ""
-"Currency rates could not be downloaded. You may receive inaccurate results, "
-"or you may not receive any results at all."
-msgstr ""
-"�ม�สามาร��าว���หล�อั�รา�ล���ลี�ย�ส�ุล��ิ���� �ุ�อา����รั��ลลั����ี��ลา���ลื�อ� "
-"หรืออา��ม����รั��ลลั������ �ลย"
+#. Help menu label
+#: ../src/math-window.c:358
+msgid "_Help"
+msgstr "_วิ�ี���"
+
+#. Basic menu label
+#: ../src/math-window.c:360
+msgid "_Basic"
+msgstr "_�ื���า�"
 
-#: ../src/gtk.c:1543
-msgid "Paste"
-msgstr "��ะ"
+#. Advanced menu label
+#: ../src/math-window.c:362
+msgid "_Advanced"
+msgstr "�ิ_�ศษ"
 
-#. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/gtk.c:1773
-#, c-format
-msgid "Show %d decimal _places"
-msgstr "�ส���ุ��ศ�ิยม %d _�ำ�ห���"
+#. Financial menu label
+#: ../src/math-window.c:364
+msgid "_Financial"
+msgstr "�าร�_�ิ�"
+
+#. Programming menu label
+#: ../src/math-window.c:366
+msgid "_Programming"
+msgstr "�าร��ีย��_�ร��รม"
+
+#. Help>Contents menu label
+#: ../src/math-window.c:368
+msgid "_Contents"
+msgstr "�_�ื�อหา"
+
+#. Translators: Error displayed when boolean AND attempted on non-integer values
+#: ../src/mp-binary.c:103
+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:116
+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:129
+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:144
+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:174
+msgid "Shift is only possible on integer values"
+msgstr "�าร�ลื�อ��ิ��ำ����ั��ำ�ว����ม���า�ั��"
 
 #. Translators: Error displayed attempted to divide by zero
 #: ../src/mp.c:529 ../src/mp.c:562 ../src/mp.c:1487
@@ -1409,31 +1413,6 @@ msgstr "����อ�รียลมี�ิยาม�ว�สำหร
 msgid "Modulus division is only defined for integers"
 msgstr "�ารหาร�อา�ศษมี�ิยาม�ว�สำหรั��ำ�ว����ม���า�ั��"
 
-#. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:103
-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:116
-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:129
-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:144
-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:174
-msgid "Shift is only possible on integer values"
-msgstr "�าร�ลื�อ��ิ��ำ����ั��ำ�ว����ม���า�ั��"
-
 #. Translators: Error displayed when tangent value is undefined
 #: ../src/mp-trigonometric.c:278
 msgid ""
@@ -1461,6 +1440,143 @@ msgstr "�������ฮ��อร���ลิ����ั��
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr "���������ฮ��อร���ลิ����ั��ม�มี�ิยามสำหรั���า�ี�อยู��อ���ว� [-1, 1]"
 
+#~| msgid "B"
+#~ msgid "BS"
+#~ msgstr "BS"
+
+#~ msgid "Backspace"
+#~ msgstr "����ส���"
+
+#~| msgid "Degrees"
+#~ msgid "Delete"
+#~ msgstr "ล�"
+
+#~ msgid "10 places"
+#~ msgstr "10 �ำ�ห���"
+
+#~ msgid "11 places"
+#~ msgstr "11 �ำ�ห���"
+
+#~ msgid "12 places"
+#~ msgstr "12 �ำ�ห���"
+
+#~ msgid "13 places"
+#~ msgstr "13 �ำ�ห���"
+
+#~ msgid "14 places"
+#~ msgstr "14 �ำ�ห���"
+
+#~ msgid "15 places"
+#~ msgstr "15 �ำ�ห���"
+
+#~ msgid "Base 16"
+#~ msgstr "�า�สิ�ห�"
+
+#~ msgid "Base 2"
+#~ msgstr "�า�สอ�"
+
+#~ msgid "Base 8"
+#~ msgstr "�า����"
+
+#~ msgid "Calculate result [=]"
+#~ msgstr "�ำ�ว��ลลั��� [=]"
+
+#~ msgid "Clr"
+#~ msgstr "Clr"
+
+#~ msgid "Display _Format:"
+#~ msgstr "รู��_���าร�ส���ล:"
+
+#~ msgid "Factorize into prime numbers (Ctrl+F)"
+#~ msgstr "�ย��ัว�ระ�อ������ำ�ว����าะ (Ctrl+F)"
+
+#~ msgid "Insert ASCII Value"
+#~ msgstr "��ร���า ASCII"
+
+#~ msgid "Insert character"
+#~ msgstr "��ร��ัวอั�ษร"
+
+#~ msgid "Numeric point [. or ,]"
+#~ msgstr "�ุ��ศ�ิยม [. หรือ ,]"
+
+#~ msgid "Random number"
+#~ msgstr "��าสุ�ม"
+
+#~ msgid "Recall value"
+#~ msgstr "�รีย���า�ื�"
+
+#~ msgid "Result Region"
+#~ msgstr "�ริ�ว��ส���ลลั���"
+
+#~ msgid "Shift left [<]"
+#~ msgstr "�ลื�อ��ิ����า���าย [<]"
+
+#~ msgid "Shift right [>]"
+#~ msgstr "�ลื�อ��ิ����า��วา [>]"
+
+#~ msgid "Store value"
+#~ msgstr "������า"
+
+#~ msgid "_2 places"
+#~ msgstr "_2 �ำ�ห���"
+
+#~ msgid "_3 places"
+#~ msgstr "_3 �ำ�ห���"
+
+#~ msgid "_4 places"
+#~ msgstr "_4 �ำ�ห���"
+
+#~ msgid "_5 places"
+#~ msgstr "_5 �ำ�ห���"
+
+#~ msgid "_6 places"
+#~ msgstr "_6 �ำ�ห���"
+
+#~ msgid "_7 places"
+#~ msgstr "_7 �ำ�ห���"
+
+#~ msgid "_8 places"
+#~ msgstr "_8 �ำ�ห���"
+
+#~ msgid "_9 places"
+#~ msgstr "_9 �ำ�ห���"
+
+#~ msgid "_Scientific"
+#~ msgstr "_วิ�ยาศาส�ร�"
+
+#~ msgid "_View"
+#~ msgstr "มุ_มมอ�"
+
+#~ msgid "No redo steps"
+#~ msgstr "�ม�มีราย�าร�ำสั���ี��ะ�ำ��ำ"
+
+#~ msgid "Calculator â?? Advanced"
+#~ msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ิà¹?ศษ"
+
+#~ msgid "Calculator â?? Financial"
+#~ msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ารà¹?à¸?ิà¸?"
+
+#~ msgid "Calculator â?? Scientific"
+#~ msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? วิà¸?ยาศาสà¸?รà¹?"
+
+#~ msgid "Calculator â?? Programming"
+#~ msgstr "à¹?à¸?รืà¹?อà¸?à¸?ิà¸?à¹?ลà¸? â?? à¸?ารà¹?à¸?ียà¸?à¹?à¸?รà¹?à¸?รม"
+
+#~ msgid "Error loading user interface"
+#~ msgstr "��ิ���อ�ิ��ลา���ะ��ิ����มส�ว��ิ���อ�ู����"
+
+#~ msgid ""
+#~ "A required file is missing or damaged. Please check your installation.\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "มี���ม�ี��ำ������อ����สู�หายหรือ�สียหาย �รุ�า�รว�สอ��าร�ิ��ั����ร��รม\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Paste"
+#~ msgstr "��ะ"
+
 #~ msgid ""
 #~ "%1$s version %2$s\n"
 #~ "\n"
@@ -1531,9 +1647,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Sine [k]"
 #~ msgstr "���� [k]"
 
-#~ msgid "Hyperbolic Sine [k]"
-#~ msgstr "�����ฮ��อร���ลิ� [k]"
-
 #~ msgid "Hyperbolic Inverse Sine [K]"
 #~ msgstr "�������ั��ฮ��อร���ลิ� [K]"
 
@@ -1555,9 +1668,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Inverse Cosine [J]"
 #~ msgstr "���������ั� [J]"
 
-#~ msgid "Hyperbolic Cosine [j]"
-#~ msgstr "�������ฮ��อร���ลิ� [j]"
-
 #~ msgid "Hyperbolic Inverse Cosine [J]"
 #~ msgstr "���������ั��ฮ��อร���ลิ� [J]"
 
@@ -1579,9 +1689,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Inverse Tangent [W]"
 #~ msgstr "�����������ั� [W]"
 
-#~ msgid "Hyperbolic Tangent [w]"
-#~ msgstr "���������ฮ��อร���ลิ� [w]"
-
 #~ msgid "Hyperbolic Inverse Tangent [W]"
 #~ msgstr "�����������ั��ฮ��อร���ลิ� [W]"
 
@@ -1821,12 +1928,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Advanced"
 #~ msgstr "�หม��ิ�ศษ"
 
-#~ msgid "B"
-#~ msgstr "B"
-
-#~ msgid "Backspace"
-#~ msgstr "����ส���"
-
 #~ msgid "Basic"
 #~ msgstr "�หม��ื���า�"
 
@@ -1851,18 +1952,12 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "CE"
 #~ msgstr "CE"
 
-#~ msgid "Calculate result"
-#~ msgstr "�ล�าร�ำ�ว�"
-
 #~ msgid "Change Sign [C]"
 #~ msgstr "สลั���รื�อ�หมาย [C]"
 
 #~ msgid "Change sign"
 #~ msgstr "สลั���รื�อ�หมาย"
 
-#~ msgid "Clear"
-#~ msgstr "ล�า�"
-
 #~ msgid "Clear displayed value and any partial calculation [Shift Delete]"
 #~ msgstr "ล���า�ี��ส���ละ�าร�ำ�ว��ี���า�อยู� [Shift Delete]"
 
@@ -2151,15 +2246,9 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Square"
 #~ msgstr "�ำลั�สอ�"
 
-#~ msgid "Square [ ]"
-#~ msgstr "�ำลั�สอ� [ ]"
-
 #~ msgid "Square root"
 #~ msgstr "รา��ี�สอ�"
 
-#~ msgid "Square root [s]"
-#~ msgstr "รา��ี�สอ� [s]"
-
 #~ msgid "Start group of calculations [(]"
 #~ msgstr "�ริ�ม�ลุ�ม�าร�ำ�ว� [(]"
 
@@ -2187,9 +2276,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Sum-of-the years'-digits depreciation [y]"
 #~ msgstr "��า�สื�อมรา�า����ลรวม�ำ�ว��ี [y]"
 
-#~ msgid "Undo"
-#~ msgstr "�รีย��ื�"
-
 #~ msgid "User-defined functions [F]"
 #~ msgstr "�ั����ั��ี��ำห����ย�ู���� [F]"
 
@@ -2235,9 +2321,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "_Edit"
 #~ msgstr "�_����"
 
-#~ msgid "_Fix"
-#~ msgstr "��_�ิ"
-
 #~ msgid "_Insert ASCII value..."
 #~ msgstr "�_ส���า ASCII..."
 
@@ -2612,9 +2695,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "%s: invalid bitcalc choice [%s]\n"
 #~ msgstr "%s: �ม�มี�ัว�ลือ��าร�ำ�ว��ิ� [%s]\n"
 
-#~ msgid "1 place"
-#~ msgstr "1 �ำ�ห���"
-
 #~ msgid "2 places"
 #~ msgstr "2 �ำ�ห���"
 
@@ -2830,9 +2910,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Advanced mode"
 #~ msgstr "�หม��ื���า�"
 
-#~ msgid "Financial mode"
-#~ msgstr "�หม��าร��ิ�"
-
 #~ msgid "BASIC"
 #~ msgstr "�ื���า�"
 
@@ -2845,9 +2922,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Integer portion of displayed value"
 #~ msgstr "ส�ว��ำ�ว����ม�อ���า�ี��ส��"
 
-#~ msgid "Store displayed value in memory register"
-#~ msgstr "������า�ี��ส����ห��วย�วาม�ำรี�ิส��อร�"
-
 #~ msgid "Fractional portion of displayed value"
 #~ msgstr "ส�ว��ศษ�อ���า�ี��ส��"
 
@@ -2881,15 +2955,6 @@ msgstr "���������ฮ��อร���ลิ����ั
 #~ msgid "Random number in the range 0.0 to 1.0"
 #~ msgstr "��าสุ�ม����ว� 0.0 �ึ� 1.0"
 
-#~ msgid "Cosine"
-#~ msgstr "���าย��"
-
-#~ msgid "Sine"
-#~ msgstr "����"
-
-#~ msgid "Tangent"
-#~ msgstr "��������"
-
 #~ msgid "/_Calculator"
 #~ msgstr "/�_�รื�อ��ิ��ล�"