[gnome-calculator] Update Chinese (Taiwan) translation

[Translations User D-L <translations src gnome org>]

commit 23a81c49eb5901cdc7d58f5346cdad06a6a96d90
Author: Freddy Cheng <freddy4212 gmail com>
Date:   Tue Oct 18 13:20:05 2022 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 2424 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1345 insertions(+), 1079 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3d857fe7..0e1877cd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,40 +5,46 @@
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 # Pin-hsien Li <pspeter9931 gmail com>, 2011.
 # byStarTW <pan93412 gmail com>, 2017, 2019.
+# Freddy <freddy4212 gmail com>, 2022.
+# Freddy Cheng <freddy4212 gmail com>, 2022.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gcaltool 6.1.5\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/";
 "issues\n"
-"POT-Creation-Date: 2020-02-07 13:17+0000\n"
-"PO-Revision-Date: 2020-02-20 14:39+0800\n"
-"Last-Translator: pan93412 <pan93412 gmail com>\n"
-"Language-Team: Chinese <zh-l10n linux org tw>\n"
+"POT-Creation-Date: 2022-05-06 20:18+0000\n"
+"PO-Revision-Date: 2022-05-28 03:39+0800\n"
+"Last-Translator: Freddy Cheng <freddy4212 gmail com>\n"
+"Language-Team: Chinese - Taiwan <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\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"
-"X-Generator: Poedit 2.3\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Gtranslator 41.0\n"
 
+#. Program name in the about dialog
 #: data/org.gnome.Calculator.appdata.xml.in:7
-msgid "GNOME Calculator"
-msgstr "GNOME 計算機"
+#: data/org.gnome.Calculator.desktop.in:3 src/gnome-calculator.vala:81
+#: src/gnome-calculator.vala:324 src/ui/math-window.ui:107
+msgid "Calculator"
+msgstr "計算機"
 
 #: data/org.gnome.Calculator.appdata.xml.in:8
 #: data/org.gnome.Calculator.desktop.in:4
 msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "進行數字、科學或金融的計算"
+msgstr "進行數字、科學或財務計算"
 
 #: data/org.gnome.Calculator.appdata.xml.in:10
 msgid ""
-"GNOME Calculator is an application that solves mathematical equations. "
-"Though it at first appears to be a simple calculator with only basic "
-"arithmetic operations, you can switch into Advanced, Financial, or "
-"Programming mode to find a surprising set of capabilities."
+"Calculator is an application that solves mathematical equations. Though it "
+"at first appears to be a simple calculator with only basic arithmetic "
+"operations, you can switch into Advanced, Financial, or Programming mode to "
+"find a surprising set of capabilities."
 msgstr ""
-"GNOME 計算機是用來解決數學等式的應用程式。它一開始只顯示具備基礎數學運算功能"
-"的簡單計算機，您可以切換為進階、金融或程式設計模式以符合您的需求。"
+"計算機是用來解決數學算式的應用程式。看似只能進行基本的運算，一旦切換至進階模"
+"式、財務模式或程式設計模式，就會被它強大的功能所震撼。"
 
 #: data/org.gnome.Calculator.appdata.xml.in:16
 msgid ""
@@ -47,8 +53,8 @@ msgid ""
 "complex numbers, random number generation, prime factorization and unit "
 "conversions."
 msgstr ""
-"進階計算機支援許多運算方式，包含：對數、階乘、三角函數和雙曲函數、模數除法、"
-"複數、產生數數、分解質因數和單位轉換。"
+"進階模式支援許多運算方式，包含：對數、階乘、三角函數和雙曲函數、模數除法、複"
+"數、隨機數生成、質因數分解和單位轉換。"
 
 #: data/org.gnome.Calculator.appdata.xml.in:22
 msgid ""
@@ -56,8 +62,8 @@ msgid ""
 "rate, present and future value, double declining and straight line "
 "depreciation, and many others."
 msgstr ""
-"金融模式支援多種運算，包含定期利率、現在和未來值、雙倍餘額遞減和直線折舊，以"
-"及其他許多方式。"
+"財務模式支援多種運算，包含定期利率、現值和終值、雙倍餘額遞減法和直線法折舊等"
+"運算方式。"
 
 #: data/org.gnome.Calculator.appdata.xml.in:27
 msgid ""
@@ -65,43 +71,23 @@ msgid ""
 "decimal, and hexadecimal), boolean algebra, one’s and two’s complementation, "
 "character to character code conversion, and more."
 msgstr ""
-"程式設計模式支援許多常用基礎的換算 (二進位、八進位、十進位和十六進位)，布林代"
-"數，一與二的補數、字元對字元代碼轉換等等。"
-
-#: data/org.gnome.Calculator.appdata.xml.in:36
-msgid "GNOME Calculator in Basic Mode"
-msgstr "GNOME 計算機基本模式"
-
-#: data/org.gnome.Calculator.appdata.xml.in:40
-msgid "GNOME Calculator in Advanced Mode"
-msgstr "GNOME 計算機進階模式"
-
-#: data/org.gnome.Calculator.appdata.xml.in:44
-msgid "GNOME Calculator in Financial Mode"
-msgstr "GNOME 計算機金融模式"
+"程式設計模式支援許多常用的基礎換算（二進位、八進位、十進位和十六進位）、布林"
+"代數、一補數與二補數、字元碼轉換等等。"
 
-#: data/org.gnome.Calculator.appdata.xml.in:48
-msgid "GNOME Calculator in Programming Mode"
-msgstr "GNOME 計算機程式設計模式"
-
-#: data/org.gnome.Calculator.appdata.xml.in:60
+#: data/org.gnome.Calculator.appdata.xml.in:66
 msgid "The GNOME Project"
 msgstr "GNOME 專案"
 
-#. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/gnome-calculator.vala:81
-#: src/gnome-calculator.vala:335 src/math-window.ui:75
-msgid "Calculator"
-msgstr "計算機"
-
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Calculator.desktop.in:6
 msgid "calculation;arithmetic;scientific;financial;"
-msgstr "calculation;arithmetic;scientific;financial;科學;金融;計算;"
+msgstr ""
+"calculation;arithmetic;scientific;financial;科學;金融;財務;計算;計算機;數字;"
+"數學;算數;算術;程式設計;單位轉換;轉換;"
 
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
-msgstr "準確度數值"
+msgstr "精確度數值"
 
 #: data/org.gnome.calculator.gschema.xml:26
 msgid "The number of digits displayed after the numeric point"
@@ -109,39 +95,41 @@ msgstr "小數點後要顯示的位數"
 
 #: data/org.gnome.calculator.gschema.xml:31
 msgid "Word size"
-msgstr "文字大小"
+msgstr "字組長度"
 
 #: data/org.gnome.calculator.gschema.xml:32
 msgid "The size of the words used in bitwise operations"
-msgstr "在逐位元運算中使用的字詞大小"
+msgstr "在位元運算使用的字組大小"
 
 #: data/org.gnome.calculator.gschema.xml:37
+#, fuzzy
 msgid "Numeric Base"
-msgstr "數字基底"
+msgstr "數基"
 
 #: data/org.gnome.calculator.gschema.xml:38
+#, fuzzy
 msgid "The numeric base"
 msgstr "數字基底"
 
 #: data/org.gnome.calculator.gschema.xml:42
 msgid "Show Thousands Separators"
-msgstr "顯示千位分隔符號"
+msgstr "顯示千分位符號"
 
 #: data/org.gnome.calculator.gschema.xml:43
 msgid "Indicates whether thousands separators are shown in large numbers."
-msgstr "表示在大數字上是否顯示千位數分隔字元。"
+msgstr "表示在大數字上是否顯示千分位符號。"
 
 #: data/org.gnome.calculator.gschema.xml:47
 msgid "Show Trailing Zeroes"
-msgstr "顯示小數點後的 0"
+msgstr "顯示末端的 0"
 
 #: data/org.gnome.calculator.gschema.xml:48
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
-msgstr "表示在顯示的數值中小數點後的 0 是否要顯示。"
+msgstr "表示在顯示的數值中是否要顯示小數點後的 0。"
 
-#: data/org.gnome.calculator.gschema.xml:52
+#: data/org.gnome.calculator.gschema.xml:52 src/ui/math-window.ui:56
 msgid "Number format"
 msgstr "數字格式"
 
@@ -159,19 +147,21 @@ msgstr "要使用的角度單位"
 
 #: data/org.gnome.calculator.gschema.xml:62
 msgid "Currency update interval"
-msgstr "幣值更新週期"
+msgstr "匯率更新週期"
 
 #: data/org.gnome.calculator.gschema.xml:63
-msgid "How often the currency exchange rates should be updated"
-msgstr "多久更新幣值匯率一次"
+msgid ""
+"How often the currency exchange rates should be updated. A value of 0 means "
+"the currency exchange rates won't be fetched from the network at all."
+msgstr "匯率更新的頻率。數值為 0 表示永不從網路更新匯率。"
 
 #: data/org.gnome.calculator.gschema.xml:67
 msgid "Button mode"
-msgstr "按鈕模式"
+msgstr "模式按鈕"
 
 #: data/org.gnome.calculator.gschema.xml:68
 msgid "The button mode"
-msgstr "按鈕的模式"
+msgstr "模式的按鈕"
 
 #: data/org.gnome.calculator.gschema.xml:72
 msgid "Source currency"
@@ -179,7 +169,7 @@ msgstr "來源貨幣"
 
 #: data/org.gnome.calculator.gschema.xml:73
 msgid "Currency of the current calculation"
-msgstr "目前計算的貨幣"
+msgstr "目前的貨幣"
 
 #: data/org.gnome.calculator.gschema.xml:77
 msgid "Target currency"
@@ -187,15 +177,15 @@ msgstr "目標貨幣"
 
 #: data/org.gnome.calculator.gschema.xml:78
 msgid "Currency to convert the current calculation into"
-msgstr "要將目前計算結果換算為貨幣"
+msgstr "要換算的貨幣"
 
 #: data/org.gnome.calculator.gschema.xml:82
 msgid "Source units"
-msgstr "原始單位"
+msgstr "來源單位"
 
 #: data/org.gnome.calculator.gschema.xml:83
 msgid "Units of the current calculation"
-msgstr "目前計算的單位"
+msgstr "目前的單位"
 
 #: data/org.gnome.calculator.gschema.xml:87
 msgid "Target units"
@@ -203,15 +193,17 @@ msgstr "目標單位"
 
 #: data/org.gnome.calculator.gschema.xml:88
 msgid "Units to convert the current calculation into"
-msgstr "要將目前計算結果換算為單位"
+msgstr "要轉換的單位"
 
 #: data/org.gnome.calculator.gschema.xml:92
+#, fuzzy
 msgid "Internal precision"
 msgstr "內部精度"
 
 #: data/org.gnome.calculator.gschema.xml:93
+#, fuzzy
 msgid "The internal precision used with the MPFR library"
-msgstr "使用 MPFR 程式庫的內部精度"
+msgstr "MPFR 函式庫使用的內部精度"
 
 #: data/org.gnome.calculator.gschema.xml:97
 msgid "Window position"
@@ -219,250 +211,258 @@ msgstr "視窗位置"
 
 #: data/org.gnome.calculator.gschema.xml:98
 msgid "Window position (x and y) of the last closed window."
-msgstr "最後開關視窗的視窗位置 (x 與 y)"
+msgstr "最後開關視窗的視窗位置（x 與 y）。"
 
-#: lib/currency.vala:31
+#: lib/currency.vala:55
 msgid "UAE Dirham"
-msgstr "阿聯迪爾汗"
+msgstr "阿聯迪拉姆"
 
-#: lib/currency.vala:32
+#: lib/currency.vala:56
 msgid "Australian Dollar"
-msgstr "澳元"
+msgstr "澳洲元"
+
+#: lib/currency.vala:57
+msgid "Bangladeshi Taka"
+msgstr "孟加拉塔卡"
 
-#: lib/currency.vala:33
+#: lib/currency.vala:58
 msgid "Bulgarian Lev"
 msgstr "保加利亞列弗"
 
-#: lib/currency.vala:34
+#: lib/currency.vala:59
 msgid "Bahraini Dinar"
 msgstr "巴林第納爾"
 
-#: lib/currency.vala:35
+#: lib/currency.vala:60
 msgid "Brunei Dollar"
 msgstr "汶萊元"
 
-#: lib/currency.vala:36
+#: lib/currency.vala:61
 msgid "Brazilian Real"
-msgstr "巴西雷阿爾"
+msgstr "巴西雷亞爾"
 
-#: lib/currency.vala:37
+#: lib/currency.vala:62
 msgid "Botswana Pula"
 msgstr "波札那普拉"
 
-#: lib/currency.vala:38
+#: lib/currency.vala:63
 msgid "Canadian Dollar"
 msgstr "加拿大元"
 
-#: lib/currency.vala:39
+#: lib/currency.vala:64
 msgid "CFA Franc"
 msgstr "非洲法郎"
 
-#: lib/currency.vala:40
+#: lib/currency.vala:65
 msgid "Swiss Franc"
 msgstr "瑞士法郎"
 
-#: lib/currency.vala:41
+#: lib/currency.vala:66
 msgid "Chilean Peso"
-msgstr "智利比索"
+msgstr "智利披索"
 
-#: lib/currency.vala:42
+#: lib/currency.vala:67
 msgid "Chinese Yuan"
 msgstr "人民幣"
 
-#: lib/currency.vala:43
+#: lib/currency.vala:68
 msgid "Colombian Peso"
-msgstr "哥倫比亞比索"
+msgstr "哥倫比亞披索"
 
-#: lib/currency.vala:44
+#: lib/currency.vala:69
 msgid "Czech Koruna"
 msgstr "捷克克朗"
 
-#: lib/currency.vala:45
+#: lib/currency.vala:70
 msgid "Danish Krone"
 msgstr "丹麥克朗"
 
-#: lib/currency.vala:46
+#: lib/currency.vala:71
 msgid "Algerian Dinar"
 msgstr "阿爾及利亞第納爾"
 
-#: lib/currency.vala:47
+#: lib/currency.vala:72
 msgid "Estonian Kroon"
 msgstr "愛沙尼亞克朗"
 
-#: lib/currency.vala:48
+#: lib/currency.vala:73
 msgid "Euro"
 msgstr "歐元"
 
-#: lib/currency.vala:49
+#: lib/currency.vala:74
 msgid "British Pound Sterling"
 msgstr "英鎊"
 
-#: lib/currency.vala:50
+#: lib/currency.vala:75
 msgid "Hong Kong Dollar"
 msgstr "港幣"
 
-#: lib/currency.vala:51
+#: lib/currency.vala:76
 msgid "Croatian Kuna"
-msgstr "克羅埃西亞庫那"
+msgstr "克羅埃西亞庫納"
 
-#: lib/currency.vala:52
+#: lib/currency.vala:77
 msgid "Hungarian Forint"
 msgstr "匈牙利福林"
 
-#: lib/currency.vala:53
+#: lib/currency.vala:78
 msgid "Indonesian Rupiah"
-msgstr "印尼盾"
+msgstr "印度尼西亞盧比"
 
-#: lib/currency.vala:54
+#: lib/currency.vala:79
 msgid "Israeli New Shekel"
 msgstr "以色列新謝克爾"
 
-#: lib/currency.vala:55
+#: lib/currency.vala:80
 msgid "Indian Rupee"
 msgstr "印度盧比"
 
-#: lib/currency.vala:56
+#: lib/currency.vala:81
 msgid "Iranian Rial"
-msgstr "伊朗雷阿爾"
+msgstr "伊朗里亞爾"
 
-#: lib/currency.vala:57
+#: lib/currency.vala:82
 msgid "Icelandic Krona"
 msgstr "冰島克朗"
 
-#: lib/currency.vala:58
+#: lib/currency.vala:83
 msgid "Japanese Yen"
-msgstr "日元"
+msgstr "日圓"
 
-#: lib/currency.vala:59
+#: lib/currency.vala:84
 msgid "South Korean Won"
-msgstr "南韓圜"
+msgstr "韓圓"
 
-#: lib/currency.vala:60
+#: lib/currency.vala:85
 msgid "Kuwaiti Dinar"
 msgstr "科威特第納爾"
 
-#: lib/currency.vala:61
+#: lib/currency.vala:86
 msgid "Kazakhstani Tenge"
 msgstr "哈薩克堅戈"
 
-#: lib/currency.vala:62
+#: lib/currency.vala:87
 msgid "Sri Lankan Rupee"
 msgstr "斯里蘭卡盧比"
 
-#: lib/currency.vala:63
+#: lib/currency.vala:88
 msgid "Libyan Dinar"
 msgstr "利比亞第納爾"
 
-#: lib/currency.vala:64
+#: lib/currency.vala:89
 msgid "Mauritian Rupee"
 msgstr "模里西斯盧比"
 
-#: lib/currency.vala:65
+#: lib/currency.vala:90
 msgid "Mexican Peso"
 msgstr "墨西哥披索"
 
-#: lib/currency.vala:66
+#: lib/currency.vala:91
 msgid "Malaysian Ringgit"
-msgstr "馬來西亞林吉特"
+msgstr "馬來西亞令吉"
 
-#: lib/currency.vala:67
+#: lib/currency.vala:92
 msgid "Norwegian Krone"
 msgstr "挪威克朗"
 
-#: lib/currency.vala:68
+#: lib/currency.vala:93
 msgid "Nepalese Rupee"
 msgstr "尼泊爾盧比"
 
-#: lib/currency.vala:69
+#: lib/currency.vala:94
 msgid "New Zealand Dollar"
 msgstr "紐西蘭元"
 
-#: lib/currency.vala:70
+#: lib/currency.vala:95
 msgid "Omani Rial"
-msgstr "阿曼雷阿爾"
+msgstr "阿曼里亞爾"
 
-#: lib/currency.vala:71
+#: lib/currency.vala:96
 msgid "Peruvian Nuevo Sol"
 msgstr "秘魯新索爾"
 
-#: lib/currency.vala:72
+#: lib/currency.vala:97
 msgid "Philippine Peso"
-msgstr "菲律賓比索"
+msgstr "菲律賓披索"
 
-#: lib/currency.vala:73
+#: lib/currency.vala:98
 msgid "Pakistani Rupee"
 msgstr "巴基斯坦盧比"
 
-#: lib/currency.vala:74
+#: lib/currency.vala:99
 msgid "Polish Zloty"
 msgstr "波蘭茲羅提"
 
-#: lib/currency.vala:75
+#: lib/currency.vala:100
 msgid "Qatari Riyal"
 msgstr "卡達里亞爾"
 
-#: lib/currency.vala:76
+#: lib/currency.vala:101
 msgid "New Romanian Leu"
-msgstr "新羅馬尼亞列伊"
+msgstr "羅馬尼亞列伊"
 
-#: lib/currency.vala:77
+#: lib/currency.vala:102
 msgid "Russian Rouble"
 msgstr "俄羅斯盧布"
 
-#: lib/currency.vala:78
+#: lib/currency.vala:103
 msgid "Saudi Riyal"
-msgstr "沙特里亞爾"
+msgstr "沙烏地里亞爾"
 
-#: lib/currency.vala:79
+#: lib/currency.vala:104
+msgid "Serbian Dinar"
+msgstr "阿爾及利亞第納爾"
+
+#: lib/currency.vala:105
 msgid "Swedish Krona"
 msgstr "瑞典克朗"
 
-#: lib/currency.vala:80
+#: lib/currency.vala:106
 msgid "Singapore Dollar"
-msgstr "新加坡幣"
+msgstr "新加坡元"
 
-#: lib/currency.vala:81
+#: lib/currency.vala:107
 msgid "Thai Baht"
 msgstr "泰銖"
 
-#: lib/currency.vala:82
+#: lib/currency.vala:108
 msgid "Tunisian Dinar"
 msgstr "突尼西亞第納爾"
 
-#: lib/currency.vala:83
+#: lib/currency.vala:109
 msgid "Turkish Lira"
 msgstr "土耳其里拉"
 
-#: lib/currency.vala:84
+#: lib/currency.vala:110
 msgid "T&T Dollar (TTD)"
 msgstr "千里達及托巴哥元 (TTD)"
 
-#: lib/currency.vala:85
+#: lib/currency.vala:111
 msgid "US Dollar"
 msgstr "美元"
 
-#: lib/currency.vala:86
+#: lib/currency.vala:112
 msgid "Uruguayan Peso"
 msgstr "烏拉圭披索"
 
-#: lib/currency.vala:87
+#: lib/currency.vala:113
 msgid "Venezuelan Bolívar"
-msgstr "委內瑞拉波利瓦爾"
+msgstr "委內瑞拉玻利瓦"
 
-#: lib/currency.vala:88
+#: lib/currency.vala:114
 msgid "South African Rand"
-msgstr "南非蘭特"
+msgstr "南非鍰"
 
 #. Translators: conversion keyword, used e.g. 1 EUR in USD, 1 EUR to USD
-#: lib/equation-lexer.vala:719 src/math-converter.vala:251
+#: lib/equation-lexer.vala:734 src/math-converter.vala:231
 msgid "in"
-msgstr "於"
+msgstr "轉換為"
 
-#: lib/equation-lexer.vala:719
+#: lib/equation-lexer.vala:734
 msgid "to"
-msgstr "至"
+msgstr "轉換為"
 
-#: lib/equation-parser.vala:735 lib/number.vala:428
+#: lib/equation-parser.vala:735 lib/number.vala:434
 msgid "The zeroth root of a number is undefined"
 msgstr "數字的零次方根沒有定義"
 
@@ -471,1505 +471,1756 @@ msgid "Error: the number of periods must be positive"
 msgstr "錯誤：週期數必須為正"
 
 #. Digits localized for the given language
-#: lib/math-equation.vala:172
+#: lib/math-equation.vala:176
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
 #. Error shown when trying to undo with no undo history
-#: lib/math-equation.vala:522
+#: lib/math-equation.vala:543
 msgid "No undo history"
-msgstr "沒有復原紀錄"
+msgstr "沒有還原紀錄"
 
 #. Error shown when trying to redo with no redo history
-#: lib/math-equation.vala:543
+#: lib/math-equation.vala:564
 msgid "No redo history"
-msgstr "沒有取消復原紀錄"
+msgstr "沒有重做紀錄"
 
-#: lib/math-equation.vala:774
+#: lib/math-equation.vala:795
 msgid "No sane value to store"
 msgstr "沒有正常數值可以儲存"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: lib/math-equation.vala:1038
+#: lib/math-equation.vala:1056
 msgid "Overflow. Try a bigger word size"
-msgstr "溢位。請嘗試更大的字詞大小"
+msgstr "溢位；請嘗試更大的字組大小"
 
 #. Error displayed to user when they an unknown variable is entered
-#: lib/math-equation.vala:1043
+#: lib/math-equation.vala:1061
 #, c-format
 msgid "Unknown variable “%s”"
 msgstr "不明的變數「%s」"
 
 #. Error displayed to user when an unknown function is entered
-#: lib/math-equation.vala:1050
+#: lib/math-equation.vala:1068
 #, c-format
 msgid "Function “%s” is not defined"
 msgstr "尚未定義函數「%s」"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: lib/math-equation.vala:1057
+#: lib/math-equation.vala:1075
 msgid "Unknown conversion"
 msgstr "不明的換算"
 
 #. should always be run
-#: lib/math-equation.vala:1067
+#: lib/math-equation.vala:1085
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: lib/math-equation.vala:1072 lib/math-equation.vala:1077
+#: lib/math-equation.vala:1090 lib/math-equation.vala:1095
 msgid "Malformed expression"
 msgstr "算式錯誤"
 
-#: lib/math-equation.vala:1088
+#: lib/math-equation.vala:1106
 msgid "Calculating"
-msgstr "計算中"
+msgstr "正在計算"
 
 #. Error displayed when trying to factorize a non-integer value
-#: lib/math-equation.vala:1281
+#: lib/math-equation.vala:1299
 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
-#: lib/math-equation.vala:1345
+#: lib/math-equation.vala:1363
 msgid "No sane value to bitwise shift"
 msgstr "沒有正常數值可以進行移位"
 
 #. Message displayed when cannot toggle bit in display
-#: lib/math-equation.vala:1367
+#: lib/math-equation.vala:1385
 msgid "Displayed value not an integer"
 msgstr "顯示的數值不是整數值"
 
 #. Translators: Error displayed when underflow error occured
-#: lib/number.vala:195
+#: lib/number.vala:201
 msgid "Underflow error"
 msgstr "不足位錯誤"
 
 #. Translators: Error displayed when overflow error occured
-#: lib/number.vala:200
+#: lib/number.vala:206
 msgid "Overflow error"
 msgstr "溢位錯誤"
 
 #. Translators: Error display when attempting to take argument of zero
-#: lib/number.vala:250
+#: lib/number.vala:256
 msgid "Argument not defined for zero"
 msgstr "引數不能用於 0"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
-#: lib/number.vala:366 lib/number.vala:396
+#: lib/number.vala:372 lib/number.vala:402
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "負數的 0 次方並無意義"
 
 #. Translators: Error displayed when attempted to raise 0 to power of zero
-#: lib/number.vala:374 lib/number.vala:404
+#: lib/number.vala:380 lib/number.vala:410
 msgid "Zero raised to zero is undefined"
 msgstr "對 0 求冪並無意義"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: lib/number.vala:458 lib/number.vala:489
+#: lib/number.vala:464 lib/number.vala:495
 msgid "Logarithm of zero is undefined"
 msgstr "0 的對數並無意義"
 
 #. Translators: Error displayed when attempted take the factorial of a negative or complex number
-#: lib/number.vala:511
+#: lib/number.vala:517
 msgid "Factorial is only defined for non-negative real numbers"
 msgstr "階乘只能用於自然數"
 
 #. Translators: Error displayed attempted to divide by zero
-#: lib/number.vala:571
+#: lib/number.vala:577
 msgid "Division by zero is undefined"
 msgstr "除以 0 並無意義"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: lib/number.vala:592
+#: lib/number.vala:598
 msgid "Modulus division is only defined for integers"
 msgstr "餘數除法只能用於整數值"
 
 #. Translators: Error displayed when tangent value is undefined
-#: lib/number.vala:665
+#: lib/number.vala:671
 msgid ""
 "Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
 msgstr "正切對於角度 (n+1/2)*π (90°、270°…) 並無意義"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: lib/number.vala:684
+#: lib/number.vala:690
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "反正弦不能用於超過 [-1, 1] 的數值"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: lib/number.vala:701
+#: lib/number.vala:707
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "反餘弦不能用於超過 [-1, 1] 的數值"
 
 #. Translators: Error displayed when trying to calculate undefined atan(i) or atan (-i)
-#: lib/number.vala:719
+#: lib/number.vala:725
 #, fuzzy
 #| msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgid "Arctangent function is undefined for values i and -i"
 msgstr "反餘弦不能用於超過 [-1, 1] 的數值"
 
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: lib/number.vala:769
+#: lib/number.vala:775
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr "反雙曲餘弦不能用於小於 1 的數值"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: lib/number.vala:785
+#: lib/number.vala:791
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr "反雙曲正切不能用於超過 [-1, 1] 的數值"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: lib/number.vala:801
+#: lib/number.vala:807
 msgid "Boolean AND is only defined for positive integers"
 msgstr "布林 AND 只能用於正整數"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: lib/number.vala:813
+#: lib/number.vala:819
 msgid "Boolean OR is only defined for positive integers"
 msgstr "布林 OR 只能用於正整數"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: lib/number.vala:825
+#: lib/number.vala:831
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "布林 XOR 只能用於正整數"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: lib/number.vala:837
+#: lib/number.vala:843
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "布林 NOT 只能用於正整數"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: lib/number.vala:860
+#: lib/number.vala:866
 msgid "Shift is only possible on integer values"
 msgstr "位移只能用在整數值"
 
-#: lib/serializer.vala:342
+#: lib/serializer.vala:345
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "溢位：結果無法計算"
 
 #: lib/unit.vala:29
 msgid "Angle"
-msgstr "角"
+msgstr "角度"
 
 #: lib/unit.vala:30
 msgid "Length"
 msgstr "長度"
 
 #: lib/unit.vala:31
-msgid "Area"
-msgstr "區域"
+msgid "Speed"
+msgstr "速度"
 
 #: lib/unit.vala:32
-msgid "Volume"
-msgstr "體積"
+msgid "Area"
+msgstr "面積"
 
 #: lib/unit.vala:33
+msgid "Volume"
+msgstr "容積"
+
+#: lib/unit.vala:34
 msgid "Mass"
 msgstr "質量"
 
-#: lib/unit.vala:34
+#: lib/unit.vala:35
 msgid "Duration"
 msgstr "時間"
 
-#: lib/unit.vala:35
+#: lib/unit.vala:36
+msgid "Frequency"
+msgstr "頻率"
+
+#: lib/unit.vala:37
 msgid "Temperature"
 msgstr "溫度"
 
-#: lib/unit.vala:36
+#: lib/unit.vala:38
 msgid "Digital Storage"
-msgstr "數位儲存區"
+msgstr "資訊量"
 
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: lib/unit.vala:39 src/math-preferences.vala:147
+#: lib/unit.vala:41 src/math-preferences.vala:110
 msgid "Degrees"
 msgstr "度"
 
-#: lib/unit.vala:39
+#: lib/unit.vala:41
 #, c-format
 msgctxt "unit-format"
 msgid "%s degrees"
-msgstr "%s 度"
+msgstr "%s degrees"
 
-#: lib/unit.vala:39
+#: lib/unit.vala:41
 msgctxt "unit-symbols"
 msgid "degree,degrees,deg"
 msgstr "degree,degrees,deg,度"
 
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: lib/unit.vala:40 src/math-preferences.vala:151
+#: lib/unit.vala:42 src/math-preferences.vala:112
 msgid "Radians"
 msgstr "弧度"
 
-#: lib/unit.vala:40
+#: lib/unit.vala:42
 #, c-format
 msgctxt "unit-format"
 msgid "%s radians"
-msgstr "%s 弧度"
+msgstr "%s radians"
 
-#: lib/unit.vala:40
+#: lib/unit.vala:42
 msgctxt "unit-symbols"
 msgid "radian,radians,rad"
 msgstr "radian,radians,rad,弧度"
 
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: lib/unit.vala:41 src/math-preferences.vala:155
+#: lib/unit.vala:43 src/math-preferences.vala:114
 msgid "Gradians"
 msgstr "梯度"
 
-#: lib/unit.vala:41
+#: lib/unit.vala:43
 #, c-format
 msgctxt "unit-format"
 msgid "%s gradians"
-msgstr "%s 梯度"
+msgstr "%s gradians"
 
-#: lib/unit.vala:41
+#: lib/unit.vala:43
 msgctxt "unit-symbols"
 msgid "gradian,gradians,grad"
 msgstr "gradian,gradians,grad,梯度"
 
-#: lib/unit.vala:42
+#: lib/unit.vala:44
 msgid "Parsecs"
 msgstr "秒差距"
 
-#: lib/unit.vala:42
+#: lib/unit.vala:44
 #, c-format
 msgctxt "unit-format"
 msgid "%s pc"
 msgstr "%s pc"
 
-#: lib/unit.vala:42
+#: lib/unit.vala:44
 msgctxt "unit-symbols"
 msgid "parsec,parsecs,pc"
 msgstr "parsec,parsecs,pc,秒差距"
 
-#: lib/unit.vala:43
+#: lib/unit.vala:45
 msgid "Light Years"
 msgstr "光年"
 
-#: lib/unit.vala:43
+#: lib/unit.vala:45
 #, c-format
 msgctxt "unit-format"
 msgid "%s ly"
 msgstr "%s ly"
 
-#: lib/unit.vala:43
+#: lib/unit.vala:45
 msgctxt "unit-symbols"
 msgid "lightyear,lightyears,ly"
 msgstr "lightyear,lightyears,ly,光年"
 
-#: lib/unit.vala:44
+#: lib/unit.vala:46
 msgid "Astronomical Units"
 msgstr "天文單位"
 
-#: lib/unit.vala:44
+#: lib/unit.vala:46
 #, c-format
 msgctxt "unit-format"
 msgid "%s au"
 msgstr "%s au"
 
-#: lib/unit.vala:44
+#: lib/unit.vala:46
 msgctxt "unit-symbols"
 msgid "au"
 msgstr "au,天文單位"
 
-#: lib/unit.vala:45
-#, fuzzy
-#| msgid "Area Units"
+#: lib/unit.vala:47
 msgid "Rack Units"
-msgstr "區域單位"
+msgstr "機架單位"
 
-#: lib/unit.vala:45
+#: lib/unit.vala:47
 #, c-format
-#| msgid "%s"
 msgctxt "unit-format"
 msgid "%sU"
 msgstr "%sU"
 
-#: lib/unit.vala:45
+#: lib/unit.vala:47
 msgctxt "unit-symbols"
 msgid "U"
-msgstr "U"
+msgstr "U,機架單位"
 
-#: lib/unit.vala:46
+#: lib/unit.vala:48
 msgid "Nautical Miles"
-msgstr "海浬"
+msgstr "海里"
 
-#: lib/unit.vala:46
+#: lib/unit.vala:48
 #, c-format
 msgctxt "unit-format"
 msgid "%s nmi"
 msgstr "%s nmi"
 
-#: lib/unit.vala:46
+#: lib/unit.vala:48
 msgctxt "unit-symbols"
 msgid "nmi"
-msgstr "nmi,海哩"
+msgstr "nmi,海里"
 
-#: lib/unit.vala:47
+#: lib/unit.vala:49
 msgid "Miles"
 msgstr "英里"
 
-#: lib/unit.vala:47
+#: lib/unit.vala:49
 #, c-format
 msgctxt "unit-format"
 msgid "%s mi"
 msgstr "%s mi"
 
-#: lib/unit.vala:47
+#: lib/unit.vala:49
 msgctxt "unit-symbols"
 msgid "mile,miles,mi"
 msgstr "mile,miles,mi,英里"
 
-#: lib/unit.vala:48
+#: lib/unit.vala:50
 msgid "Kilometers"
 msgstr "公里"
 
-#: lib/unit.vala:48
+#: lib/unit.vala:50
 #, c-format
 msgctxt "unit-format"
 msgid "%s km"
 msgstr "%s km"
 
-#: lib/unit.vala:48
+#: lib/unit.vala:50
 msgctxt "unit-symbols"
 msgid "kilometer,kilometers,km,kms"
 msgstr "kilometer,kilometers,km,kms,公里"
 
-#: lib/unit.vala:49
+#: lib/unit.vala:51
 msgid "Cables"
 msgstr "鏈"
 
-#: lib/unit.vala:49
+#: lib/unit.vala:51
 #, c-format
 msgctxt "unit-format"
 msgid "%s cb"
 msgstr "%s cb"
 
-#: lib/unit.vala:49
+#: lib/unit.vala:51
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
 msgstr "cable,cables,cb,鏈"
 
-#: lib/unit.vala:50
+#: lib/unit.vala:52
 msgid "Fathoms"
-msgstr "英噚"
+msgstr "英尋"
 
-#: lib/unit.vala:50
+#: lib/unit.vala:52
 #, c-format
 msgctxt "unit-format"
 msgid "%s ftm"
 msgstr "%s ftm"
 
-#: lib/unit.vala:50
+#: lib/unit.vala:52
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
-msgstr "fathom,fathoms,ftm,英噚"
+msgstr "fathom,fathoms,ftm,英尋"
 
-#: lib/unit.vala:51
+#: lib/unit.vala:53
 msgid "Meters"
 msgstr "公尺"
 
-#: lib/unit.vala:51
+#: lib/unit.vala:53
 #, c-format
 msgctxt "unit-format"
 msgid "%s m"
 msgstr "%s m"
 
-#: lib/unit.vala:51
+#: lib/unit.vala:53
 msgctxt "unit-symbols"
 msgid "meter,meters,m"
 msgstr "meter,meters,m,米,公尺"
 
-#: lib/unit.vala:52
+#: lib/unit.vala:54
 msgid "Yards"
 msgstr "碼"
 
-#: lib/unit.vala:52
+#: lib/unit.vala:54
 #, c-format
 msgctxt "unit-format"
 msgid "%s yd"
 msgstr "%s yd"
 
-#: lib/unit.vala:52
+#: lib/unit.vala:54
 msgctxt "unit-symbols"
 msgid "yard,yards,yd"
 msgstr "yard,yards,yd,碼"
 
-#: lib/unit.vala:53
+#: lib/unit.vala:55
 msgid "Feet"
 msgstr "英尺"
 
-#: lib/unit.vala:53
+#: lib/unit.vala:55
 #, c-format
 msgctxt "unit-format"
 msgid "%s ft"
 msgstr "%s ft"
 
-#: lib/unit.vala:53
+#: lib/unit.vala:55
 msgctxt "unit-symbols"
 msgid "foot,feet,ft"
 msgstr "foot,feet,ft,英尺"
 
-#: lib/unit.vala:54
+#: lib/unit.vala:56
 msgid "Inches"
-msgstr "英吋"
+msgstr "英寸"
 
-#: lib/unit.vala:54
+#: lib/unit.vala:56
 #, c-format
 msgctxt "unit-format"
 msgid "%s in"
 msgstr "%s in"
 
-#: lib/unit.vala:54
+#: lib/unit.vala:56
 msgctxt "unit-symbols"
 msgid "inch,inches,in"
-msgstr "inch,inches,in,英吋"
+msgstr "inch,inches,in,英寸"
 
-#: lib/unit.vala:55
+#: lib/unit.vala:57
 msgid "Centimeters"
 msgstr "公分"
 
-#: lib/unit.vala:55
+#: lib/unit.vala:57
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm"
 msgstr "%s cm"
 
-#: lib/unit.vala:55
+#: lib/unit.vala:57
 msgctxt "unit-symbols"
 msgid "centimeter,centimeters,cm,cms"
 msgstr "centimeter,centimeters,cm,cms,公分"
 
-#: lib/unit.vala:56
+#: lib/unit.vala:58
 msgid "Millimeters"
-msgstr "毫米"
+msgstr "公釐"
 
-#: lib/unit.vala:56
+#: lib/unit.vala:58
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm"
 msgstr "%s mm"
 
-#: lib/unit.vala:56
+#: lib/unit.vala:58
 msgctxt "unit-symbols"
 msgid "millimeter,millimeters,mm"
-msgstr "millimeter,millimeters,mm,毫米"
+msgstr "millimeter,millimeters,mm,毫米,公釐"
 
-#: lib/unit.vala:57
+#: lib/unit.vala:59
 msgid "Micrometers"
 msgstr "微米"
 
-#: lib/unit.vala:57
+#: lib/unit.vala:59
 #, c-format
 msgctxt "unit-format"
 msgid "%s μm"
 msgstr "%s μm"
 
-#: lib/unit.vala:57
+#: lib/unit.vala:59
 msgctxt "unit-symbols"
 msgid "micrometer,micrometers,um"
 msgstr "micrometer,micrometers,um,微米"
 
-#: lib/unit.vala:58
+#: lib/unit.vala:60
 msgid "Nanometers"
 msgstr "奈米"
 
-#: lib/unit.vala:58
+#: lib/unit.vala:60
 #, c-format
 msgctxt "unit-format"
 msgid "%s nm"
 msgstr "%s nm"
 
-#: lib/unit.vala:58
+#: lib/unit.vala:60
 msgctxt "unit-symbols"
 msgid "nanometer,nanometers,nm"
 msgstr "nanometer,nanometers,nm,奈米"
 
-#: lib/unit.vala:59
+#: lib/unit.vala:61
 msgid "Desktop Publishing Point"
-msgstr "桌面出版點"
+msgstr "點（印刷）"
 
-#: lib/unit.vala:59 lib/unit.vala:70
+#: lib/unit.vala:61 lib/unit.vala:77
 #, c-format
 msgctxt "unit-format"
 msgid "%s pt"
 msgstr "%s pt"
 
-#: lib/unit.vala:59
+#: lib/unit.vala:61
 msgctxt "unit-symbols"
 msgid "point,pt,points,pts"
 msgstr "point,pt,points,pts,點"
 
-#: lib/unit.vala:60
-msgid "Hectares"
-msgstr "公頃"
+#: lib/unit.vala:62
+msgid "Kilometers per hour"
+msgstr "公里每小時"
 
-#: lib/unit.vala:60
+#: lib/unit.vala:62
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%s km/h"
 msgctxt "unit-format"
-msgid "%s ha"
-msgstr "%s ha"
+msgid "%s km/h"
+msgstr "%s km/h"
 
-#: lib/unit.vala:60
+#: lib/unit.vala:62
 msgctxt "unit-symbols"
-msgid "hectare,hectares,ha"
-msgstr "hectare,hectares,ha,公頃"
+msgid "kilometers per hour,kmph,kmh,kph"
+msgstr "kilometers per hour,kmph,kmh,kph,公里每小時"
 
-#: lib/unit.vala:61
-msgid "Acres"
-msgstr "英畝"
+#: lib/unit.vala:63
+msgid "Miles per hour"
+msgstr "英里每小時"
 
-#: lib/unit.vala:61
+#: lib/unit.vala:63
 #, c-format
+#| msgctxt "unit-format"
+#| msgid "%s miles/h"
 msgctxt "unit-format"
-msgid "%s acres"
-msgstr "%s acres"
+msgid "%s miles/h"
+msgstr "%s miles/h"
 
-#: lib/unit.vala:61
+#: lib/unit.vala:63
 msgctxt "unit-symbols"
-msgid "acre,acres"
-msgstr "acre,acres,英畝"
+msgid "milesph,miles per hour,mi/h,miph,mph"
+msgstr "milesph,miles per hour,mi/h,miph,mph,英里每小時"
 
-#: lib/unit.vala:62
-msgid "Square Foot"
-msgstr "平方根"
+#: lib/unit.vala:64
+msgid "Meters per second"
+msgstr "公尺每秒"
 
-#: lib/unit.vala:62
+#: lib/unit.vala:64
 #, c-format
 #| msgctxt "unit-format"
-#| msgid "%s ft"
+#| msgid "%s m/s"
 msgctxt "unit-format"
-msgid "%s ft²"
-msgstr "%s ft²"
+msgid "%s m/s"
+msgstr "%s m/s"
 
-#: lib/unit.vala:62
+#: lib/unit.vala:64
+msgctxt "unit-symbols"
+msgid "meters per second,mps"
+msgstr "meters per second,mps,公尺每秒"
+
+#: lib/unit.vala:65
+msgid "Feet per second"
+msgstr "英尺每秒"
+
+#: lib/unit.vala:65
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s feet/s"
+msgctxt "unit-format"
+msgid "%s feet/s"
+msgstr "%s feet/s"
+
+#: lib/unit.vala:65
+msgctxt "unit-symbols"
+msgid "fps,feet per second,feetps"
+msgstr "fps,feet per second,feetps,英尺每秒"
+
+#: lib/unit.vala:66
+msgid "Knots"
+msgstr "節"
+
+#: lib/unit.vala:66
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s kt"
+msgctxt "unit-format"
+msgid "%s kt"
+msgstr "%s kt"
+
+#: lib/unit.vala:66
+msgctxt "unit-symbols"
+msgid "kt,kn,nd,knot,knots"
+msgstr "kt,kn,nd,knot,knots,節"
+
+#: lib/unit.vala:67
+msgid "Hectares"
+msgstr "公頃"
+
+#: lib/unit.vala:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: lib/unit.vala:67
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "hectare,hectares,ha,公頃"
+
+#: lib/unit.vala:68
+msgid "Acres"
+msgstr "英畝"
+
+#: lib/unit.vala:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s acres"
+
+#: lib/unit.vala:68
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "acre,acres,英畝"
+
+#: lib/unit.vala:69
+msgid "Square Foot"
+msgstr "平方英尺"
+
+#: lib/unit.vala:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s ft²"
+msgstr "%s ft²"
+
+#: lib/unit.vala:69
 msgctxt "unit-symbols"
 msgid "ft²"
-msgstr "ft²"
+msgstr "ft²,平方英尺"
 
-#: lib/unit.vala:63
+#: lib/unit.vala:70
 msgid "Square Meters"
 msgstr "平方公尺"
 
-#: lib/unit.vala:63
+#: lib/unit.vala:70
 #, c-format
 msgctxt "unit-format"
 msgid "%s m²"
 msgstr "%s m²"
 
-#: lib/unit.vala:63
+#: lib/unit.vala:70
 msgctxt "unit-symbols"
 msgid "m²"
 msgstr "m²,平方公尺"
 
-#: lib/unit.vala:64
+#: lib/unit.vala:71
 msgid "Square Centimeters"
 msgstr "平方公分"
 
-#: lib/unit.vala:64
+#: lib/unit.vala:71
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm²"
 msgstr "%s cm²"
 
-#: lib/unit.vala:64
+#: lib/unit.vala:71
 msgctxt "unit-symbols"
 msgid "cm²"
 msgstr "cm²,平方公分"
 
-#: lib/unit.vala:65
+#: lib/unit.vala:72
 msgid "Square Millimeters"
-msgstr "平方毫米"
+msgstr "平方公釐"
 
-#: lib/unit.vala:65
+#: lib/unit.vala:72
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm²"
 msgstr "%s mm²"
 
-#: lib/unit.vala:65
+#: lib/unit.vala:72
 msgctxt "unit-symbols"
 msgid "mm²"
-msgstr "mm²,平方毫米"
+msgstr "mm²,平方公釐"
 
-#: lib/unit.vala:66
+#: lib/unit.vala:73
 msgid "Cubic Meters"
 msgstr "立方公尺"
 
-#: lib/unit.vala:66
+#: lib/unit.vala:73
 #, c-format
 msgctxt "unit-format"
 msgid "%s m³"
 msgstr "%s m³"
 
-#: lib/unit.vala:66
+#: lib/unit.vala:73
 msgctxt "unit-symbols"
 msgid "m³"
 msgstr "m³,立方公尺"
 
-#: lib/unit.vala:67
+#: lib/unit.vala:74
 msgid "US Gallons"
-msgstr "美式加侖"
+msgstr "加侖（美制）"
 
-#: lib/unit.vala:67
+#: lib/unit.vala:74
 #, c-format
 msgctxt "unit-format"
 msgid "%s gal"
 msgstr "%s gal"
 
-#: lib/unit.vala:67
+#: lib/unit.vala:74
 msgctxt "unit-symbols"
 msgid "gallon,gallons,gal"
 msgstr "gallon,gallons,gal,加侖"
 
-#: lib/unit.vala:68
+#: lib/unit.vala:75
 msgid "Liters"
 msgstr "公升"
 
-#: lib/unit.vala:68
+#: lib/unit.vala:75
 #, c-format
 msgctxt "unit-format"
 msgid "%s L"
 msgstr "%s L"
 
-#: lib/unit.vala:68
+#: lib/unit.vala:75
 msgctxt "unit-symbols"
 msgid "litre,litres,liter,liters,L"
 msgstr "litre,litres,liter,liters,L,公升"
 
-#: lib/unit.vala:69
+#: lib/unit.vala:76
 msgid "US Quarts"
-msgstr "美式夸脫"
+msgstr "夸脫（美制）"
 
-#: lib/unit.vala:69
+#: lib/unit.vala:76
 #, c-format
 msgctxt "unit-format"
 msgid "%s qt"
 msgstr "%s qt"
 
-#: lib/unit.vala:69
+#: lib/unit.vala:76
 msgctxt "unit-symbols"
 msgid "quart,quarts,qt"
 msgstr "quart,quarts,qt,夸脫"
 
-#: lib/unit.vala:70
+#: lib/unit.vala:77
 msgid "US Pints"
-msgstr "美式品脫"
+msgstr "品脫（美制）"
 
-#: lib/unit.vala:70
+#: lib/unit.vala:77
 msgctxt "unit-symbols"
 msgid "pint,pints,pt"
 msgstr "pint,pints,pt,品脫"
 
-#: lib/unit.vala:71
+#: lib/unit.vala:78
+msgid "Metric Cups"
+msgstr "量杯"
+
+#: lib/unit.vala:78
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s cup"
+msgctxt "unit-format"
+msgid "%s cup"
+msgstr "%s cup"
+
+#: lib/unit.vala:78
+msgctxt "unit-symbols"
+msgid "cup,cups,cp"
+msgstr "cup,cups,cp,量杯"
+
+#: lib/unit.vala:79
 msgid "Milliliters"
 msgstr "毫升"
 
-#: lib/unit.vala:71
+#: lib/unit.vala:79
 #, c-format
 msgctxt "unit-format"
 msgid "%s mL"
 msgstr "%s mL"
 
-#: lib/unit.vala:71
+#: lib/unit.vala:79
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
 msgstr "millilitre,millilitres,milliliter,milliliters,mL,cm³,毫升"
 
-#: lib/unit.vala:72
+#: lib/unit.vala:80
 msgid "Microliters"
 msgstr "微升"
 
-#: lib/unit.vala:72
+#: lib/unit.vala:80
 #, c-format
 msgctxt "unit-format"
 msgid "%s μL"
 msgstr "%s μL"
 
-#: lib/unit.vala:72
+#: lib/unit.vala:80
 msgctxt "unit-symbols"
 msgid "mm³,μL,uL"
 msgstr "mm³,μL,uL,微升"
 
-#: lib/unit.vala:73
+#: lib/unit.vala:81
 msgid "Tonnes"
 msgstr "公噸"
 
-#: lib/unit.vala:73
+#: lib/unit.vala:81
 #, c-format
 msgctxt "unit-format"
 msgid "%s T"
 msgstr "%s T"
 
-#: lib/unit.vala:73
+#: lib/unit.vala:81
 msgctxt "unit-symbols"
 msgid "tonne,tonnes"
 msgstr "tonne,tonnes,公噸"
 
-#: lib/unit.vala:74
+#: lib/unit.vala:82
 msgid "Kilograms"
 msgstr "公斤"
 
-#: lib/unit.vala:74
+#: lib/unit.vala:82
 #, c-format
 msgctxt "unit-format"
 msgid "%s kg"
 msgstr "%s kg"
 
-#: lib/unit.vala:74
+#: lib/unit.vala:82
 msgctxt "unit-symbols"
 msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
 msgstr "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs,公斤"
 
-#: lib/unit.vala:75
+#: lib/unit.vala:83
 msgid "Pounds"
 msgstr "磅"
 
-#: lib/unit.vala:75
+#: lib/unit.vala:83
 #, c-format
 msgctxt "unit-format"
 msgid "%s lb"
 msgstr "%s lb"
 
-#: lib/unit.vala:75
+#: lib/unit.vala:83
+#| msgctxt "unit-symbols"
+#| msgid "pound,pounds,lb"
 msgctxt "unit-symbols"
-msgid "pound,pounds,lb"
-msgstr "pound,pounds,lb,磅"
+msgid "pound,pounds,lb,lbs"
+msgstr "pound,pounds,lb,lbs,磅"
 
-#: lib/unit.vala:76
+#: lib/unit.vala:84
 msgid "Ounces"
 msgstr "盎司"
 
-#: lib/unit.vala:76
+#: lib/unit.vala:84
 #, c-format
 msgctxt "unit-format"
 msgid "%s oz"
 msgstr "%s oz"
 
-#: lib/unit.vala:76
+#: lib/unit.vala:84
 msgctxt "unit-symbols"
 msgid "ounce,ounces,oz"
 msgstr "ounce,ounces,oz,盎司"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:85
 msgid "Grams"
 msgstr "公克"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:85
 #, c-format
 msgctxt "unit-format"
 msgid "%s g"
 msgstr "%s g"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:85
 msgctxt "unit-symbols"
 msgid "gram,grams,gramme,grammes,g"
 msgstr "gram,grams,gramme,grammes,g,公克"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:86
 msgid "Stone"
-msgstr "Stone"
+msgstr "英石"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:86
 #, c-format
 msgctxt "unit-format"
 msgid "%s st"
 msgstr "%s st"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:86
 msgctxt "unit-symbols"
 msgid "stone,st,stones"
-msgstr "stone,st,stones"
+msgstr "stone,st,stones,英石"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:87
+msgid "Centuries"
+msgstr "世紀"
+
+#: lib/unit.vala:87
+#, c-format
+msgctxt "unit-format"
+msgid "%s centuries"
+msgstr "%s centuries"
+
+#: lib/unit.vala:87
+msgctxt "unit-symbols"
+msgid "century,centuries"
+msgstr "century,centuries,世紀"
+
+#: lib/unit.vala:88
+msgid "Decades"
+msgstr "年代"
+
+#: lib/unit.vala:88
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s decades"
+msgctxt "unit-format"
+msgid "%s decades"
+msgstr "%s decades"
+
+#: lib/unit.vala:88
+msgctxt "unit-symbols"
+msgid "decade,decades"
+msgstr "decade,decades,年代"
+
+#: lib/unit.vala:89
 msgid "Years"
 msgstr "年"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:89
 #, c-format
 msgctxt "unit-format"
 msgid "%s years"
-msgstr "%s 年"
+msgstr "%s years"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:89
 msgctxt "unit-symbols"
 msgid "year,years"
 msgstr "year,years,年"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:90
+msgid "Months"
+msgstr "月"
+
+#: lib/unit.vala:90
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s months"
+msgctxt "unit-format"
+msgid "%s months"
+msgstr "%s months"
+
+#: lib/unit.vala:90
+msgctxt "unit-symbols"
+msgid "month,months"
+msgstr "month,months,月"
+
+#: lib/unit.vala:91
+msgid "Weeks"
+msgstr "星期"
+
+#: lib/unit.vala:91
+#, c-format
+msgctxt "unit-format"
+msgid "%s weeks"
+msgstr "%s weeks"
+
+#: lib/unit.vala:91
+msgctxt "unit-symbols"
+msgid "week,weeks"
+msgstr "week,weeks,星期"
+
+#: lib/unit.vala:92
 msgid "Days"
-msgstr "天"
+msgstr "日"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:92
 #, c-format
 msgctxt "unit-format"
 msgid "%s days"
-msgstr "%s 天"
+msgstr "%s days"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:92
 msgctxt "unit-symbols"
 msgid "day,days"
-msgstr "day,days,天"
+msgstr "day,days,天,日"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:93
 msgid "Hours"
 msgstr "小時"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:93
 #, c-format
 msgctxt "unit-format"
 msgid "%s hours"
-msgstr "%s 小時"
+msgstr "%s hours"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:93
 msgctxt "unit-symbols"
 msgid "hour,hours"
 msgstr "hour,hours,小時"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:94
 msgid "Minutes"
 msgstr "分鐘"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:94
 #, c-format
 msgctxt "unit-format"
 msgid "%s minutes"
-msgstr "%s 分鐘"
+msgstr "%s minutes"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:94
 msgctxt "unit-symbols"
 msgid "minute,minutes"
 msgstr "minute,minutes,分鐘"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:95
 msgid "Seconds"
-msgstr "秒鐘"
+msgstr "秒"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:95
 #, c-format
 msgctxt "unit-format"
 msgid "%s s"
 msgstr "%s s"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:95
 msgctxt "unit-symbols"
 msgid "second,seconds,s"
-msgstr "second,seconds,s,秒鐘"
+msgstr "second,seconds,s,秒鐘,秒"
 
-#: lib/unit.vala:84
+#: lib/unit.vala:96
 msgid "Milliseconds"
 msgstr "亳秒"
 
-#: lib/unit.vala:84
+#: lib/unit.vala:96
 #, c-format
 msgctxt "unit-format"
 msgid "%s ms"
 msgstr "%s ms"
 
-#: lib/unit.vala:84
+#: lib/unit.vala:96
 msgctxt "unit-symbols"
 msgid "millisecond,milliseconds,ms"
 msgstr "millisecond,milliseconds,ms,毫秒"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:97
 msgid "Microseconds"
 msgstr "微秒"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:97
 #, c-format
 msgctxt "unit-format"
 msgid "%s μs"
 msgstr "%s μs"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:97
 msgctxt "unit-symbols"
 msgid "microsecond,microseconds,us,μs"
 msgstr "microsecond,microseconds,us,μs,微秒"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:98
 msgid "Celsius"
-msgstr "攝氏"
+msgstr "攝氏溫標"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:98
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚C"
-msgstr "%s˚C"
+msgstr "%s ˚C"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:98
 msgctxt "unit-symbols"
 msgid "degC,˚C,C,c,Celsius,celsius"
-msgstr "degC,˚C,C,c,Celsius,celsius,攝氏"
+msgstr "degC,˚C,C,c,Celsius,celsius,攝氏,攝氏溫標"
 
-#: lib/unit.vala:87
+#: lib/unit.vala:99
 msgid "Fahrenheit"
-msgstr "華氏"
+msgstr "華氏溫標"
 
-#: lib/unit.vala:87
+#: lib/unit.vala:99
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚F"
-msgstr "%s˚F"
+msgstr "%s ˚F"
 
-#: lib/unit.vala:87
+#: lib/unit.vala:99
 msgctxt "unit-symbols"
 msgid "degF,˚F,F,f,Fahrenheit,fahrenheit"
-msgstr "degF,˚F,F,f,Fahrenheit,fahrenheit,華氏"
+msgstr "degF,˚F,F,f,Fahrenheit,fahrenheit,華氏,華氏溫標"
 
-#: lib/unit.vala:88
+#: lib/unit.vala:100
 msgid "Kelvin"
-msgstr "絕對溫度"
+msgstr "克耳文溫標"
 
-#: lib/unit.vala:88
+#: lib/unit.vala:100
 #, c-format
 msgctxt "unit-format"
 msgid "%s K"
 msgstr "%s K"
 
-#: lib/unit.vala:88
+#: lib/unit.vala:100
 msgctxt "unit-symbols"
 msgid "k,K,Kelvin,kelvin"
-msgstr "k,K,Kelvin,kelvin,克耳文"
+msgstr "k,K,Kelvin,kelvin,克耳文,克耳文溫標"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:101
 msgid "Rankine"
-msgstr "蘭金"
+msgstr "蘭金溫標"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:101
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚R"
 msgstr "%s˚R"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:101
 msgctxt "unit-symbols"
 msgid "degR,˚R,˚Ra,r,R,Rankine,rankine"
-msgstr "degR,˚R,˚Ra,r,R,Rankine,rankine,蘭氏度"
+msgstr "degR,˚R,˚Ra,r,R,Rankine,rankine,蘭氏度,蘭金溫標"
 
 #. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte 
= 1024 bytes
-#: lib/unit.vala:91
+#: lib/unit.vala:103
 msgid "Bits"
 msgstr "位元"
 
-#: lib/unit.vala:91
+#: lib/unit.vala:103
 #, c-format
 msgctxt "unit-format"
 msgid "%s b"
 msgstr "%s b"
 
-#: lib/unit.vala:91
+#: lib/unit.vala:103
 msgctxt "unit-symbols"
 msgid "bit,bits,b"
 msgstr "bit,bits,b,位元"
 
-#: lib/unit.vala:92
+#: lib/unit.vala:104
 msgid "Bytes"
 msgstr "位元組"
 
-#: lib/unit.vala:92
+#: lib/unit.vala:104
 #, c-format
 msgctxt "unit-format"
 msgid "%s B"
 msgstr "%s B"
 
-#: lib/unit.vala:92
+#: lib/unit.vala:104
 msgctxt "unit-symbols"
 msgid "byte,bytes,B"
 msgstr "byte,bytes,B,位元組"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:105
 msgid "Nibbles"
-msgstr "Nibbles"
+msgstr "半位元組"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:105
 #, c-format
 msgctxt "unit-format"
 msgid "%s nibble"
 msgstr "%s nibble"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:105
 msgctxt "unit-symbols"
 msgid "nibble,nibbles"
-msgstr "nibble,nibbles"
+msgstr "nibble,nibbles,半位元組"
 
 #. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
-#: lib/unit.vala:95
+#: lib/unit.vala:107
 msgid "Kilobits"
 msgstr "千位元"
 
-#: lib/unit.vala:95
+#: lib/unit.vala:107
 #, c-format
 msgctxt "unit-format"
 msgid "%s kb"
 msgstr "%s kb"
 
-#: lib/unit.vala:95
+#: lib/unit.vala:107
 msgctxt "unit-symbols"
 msgid "kilobit,kilobits,kb,Kb"
-msgstr "kilobit,kilobits,kb,Kb"
+msgstr "kilobit,kilobits,kb,Kb,千位元"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:108
 msgid "Kilobytes"
 msgstr "千位元組"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:108
 #, c-format
 msgctxt "unit-format"
 msgid "%s kB"
 msgstr "%s kB"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:108
 msgctxt "unit-symbols"
 msgid "kilobyte,kilobytes,kB,KB"
-msgstr "kilobyte,kilobytes,kB,KB"
+msgstr "kilobyte,kilobytes,kB,KB,千位元組"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:109
 msgid "Kibibits"
 msgstr "Kibibits"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:109
 #, c-format
 msgctxt "unit-format"
 msgid "%s Kib"
 msgstr "%s Kib"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:109
 msgctxt "unit-symbols"
 msgid "kibibit,kibibits,Kib"
 msgstr "kibibit,kibibits,Kib"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:110
 msgid "Kibibytes"
 msgstr "Kibibytes"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:110
 #, c-format
 msgctxt "unit-format"
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:110
 msgctxt "unit-symbols"
 msgid "kibibyte,kibibytes,KiB"
 msgstr "kibibyte,kibibytes,KiB"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:111
 msgid "Megabits"
 msgstr "百萬位元"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:111
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mb"
 msgstr "%s Mb"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:111
 msgctxt "unit-symbols"
 msgid "megabit,megabits,Mb"
-msgstr "megabit,megabits,Mb"
+msgstr "megabit,megabits,Mb,百萬位元"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:112
 msgid "Megabytes"
 msgstr "百萬位元組"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:112
 #, c-format
 msgctxt "unit-format"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:112
 msgctxt "unit-symbols"
 msgid "megabyte,megabytes,MB"
-msgstr "megabyte,megabytes,MB"
+msgstr "megabyte,megabytes,MB,百萬位元組"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:113
 msgid "Mebibits"
 msgstr "Mebibits"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:113
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mib"
 msgstr "%s Mib"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:113
 msgctxt "unit-symbols"
 msgid "mebibit,mebibits,Mib"
 msgstr "mebibit,mebibits,Mib"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:114
 msgid "Mebibytes"
 msgstr "Mebibytes"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:114
 #, c-format
 msgctxt "unit-format"
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:114
 msgctxt "unit-symbols"
 msgid "mebibyte,mebibytes,MiB"
 msgstr "mebibyte,mebibytes,MiB"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:115
 msgid "Gigabits"
 msgstr "吉位元"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:115
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gb"
 msgstr "%s Gb"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:115
 msgctxt "unit-symbols"
 msgid "gigabit,gigabits,Gb"
-msgstr "gigabit,gigabits,Gb"
+msgstr "gigabit,gigabits,Gb,吉位元"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:116
 msgid "Gigabytes"
 msgstr "吉位元組"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:116
 #, c-format
 msgctxt "unit-format"
 msgid "%s GB"
 msgstr "%s GB"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:116
 msgctxt "unit-symbols"
 msgid "gigabyte,gigabytes,GB"
-msgstr "gigabyte,gigabytes,GB"
+msgstr "gigabyte,gigabytes,GB,吉位元組"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:117
 msgid "Gibibits"
 msgstr "Gibibits"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:117
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gib"
 msgstr "%s Gib"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:117
 msgctxt "unit-symbols"
 msgid "gibibit,gibibits,Gib"
 msgstr "gibibit,gibibits,Gib"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:118
 msgid "Gibibytes"
 msgstr "Gibibytes"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:118
 #, c-format
 msgctxt "unit-format"
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:118
 msgctxt "unit-symbols"
 msgid "gibibyte,gibibytes,GiB"
 msgstr "gibibyte,gibibytes,GiB"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:119
 msgid "Terabits"
 msgstr "兆位元"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:119
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tb"
 msgstr "%s Tb"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:119
 msgctxt "unit-symbols"
 msgid "terabit,terabits,Tb"
-msgstr "terabit,terabits,Tb"
+msgstr "terabit,terabits,Tb,兆位元"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:120
 msgid "Terabytes"
 msgstr "兆位元組"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:120
 #, c-format
 msgctxt "unit-format"
 msgid "%s TB"
 msgstr "%s TB"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:120
 msgctxt "unit-symbols"
 msgid "terabyte,terabytes,TB"
-msgstr "terabyte,terabytes,TB"
+msgstr "terabyte,terabytes,TB,兆位元組"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:121
 msgid "Tebibits"
 msgstr "Tebibits"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:121
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tib"
 msgstr "%s Tib"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:121
 msgctxt "unit-symbols"
 msgid "tebibit,tebibits,Tib"
 msgstr "tebibit,tebibits,Tib"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:122
 msgid "Tebibytes"
 msgstr "Tebibytes"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:122
 #, c-format
 msgctxt "unit-format"
 msgid "%s TiB"
 msgstr "%s TiB"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:122
 msgctxt "unit-symbols"
 msgid "tebibyte,tebibytes,TiB"
 msgstr "tebibyte,tebibytes,TiB"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:123
 msgid "Petabits"
 msgstr "拍位元"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:123
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pb"
 msgstr "%s Pb"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:123
 msgctxt "unit-symbols"
 msgid "petabit,petabits,Pb"
-msgstr "petabit,petabits,Pb"
+msgstr "petabit,petabits,Pb,拍位元"
 
-#: lib/unit.vala:112
+#: lib/unit.vala:124
 msgid "Petabytes"
 msgstr "拍位元組"
 
-#: lib/unit.vala:112
+#: lib/unit.vala:124
 #, c-format
 msgctxt "unit-format"
 msgid "%s PB"
 msgstr "%s PB"
 
-#: lib/unit.vala:112
+#: lib/unit.vala:124
 msgctxt "unit-symbols"
 msgid "petabyte,petabytes,PB"
-msgstr "petabyte,petabytes,PB"
+msgstr "petabyte,petabytes,PB,拍位元組"
 
-#: lib/unit.vala:113
+#: lib/unit.vala:125
 msgid "Pebibits"
 msgstr "Pebibits"
 
-#: lib/unit.vala:113
+#: lib/unit.vala:125
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pib"
 msgstr "%s Pib"
 
-#: lib/unit.vala:113
+#: lib/unit.vala:125
 msgctxt "unit-symbols"
 msgid "pebibit,pebibits,Pib"
 msgstr "pebibit,pebibits,Pib"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:126
 msgid "Pebibytes"
 msgstr "Pebibytes"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:126
 #, c-format
 msgctxt "unit-format"
 msgid "%s PiB"
 msgstr "%s PiB"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:126
 msgctxt "unit-symbols"
 msgid "pebibyte,pebibytes,PiB"
 msgstr "pebibyte,pebibytes,PiB"
 
-#: lib/unit.vala:115
+#: lib/unit.vala:127
 msgid "Exabits"
-msgstr "Exabits"
+msgstr "艾位元"
 
-#: lib/unit.vala:115 lib/unit.vala:119
+#: lib/unit.vala:127 lib/unit.vala:131
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eb"
 msgstr "%s Eb"
 
-#: lib/unit.vala:115
+#: lib/unit.vala:127
 msgctxt "unit-symbols"
 msgid "exabit,exabits,Eb"
-msgstr "exabit,exabits,Eb"
+msgstr "exabit,exabits,Eb,艾位元"
 
-#: lib/unit.vala:116
+#: lib/unit.vala:128
 msgid "Exabytes"
 msgstr "艾位元組"
 
-#: lib/unit.vala:116 lib/unit.vala:120
+#: lib/unit.vala:128 lib/unit.vala:132
 #, c-format
 msgctxt "unit-format"
 msgid "%s EB"
 msgstr "%s EB"
 
-#: lib/unit.vala:116
+#: lib/unit.vala:128
 msgctxt "unit-symbols"
 msgid "exabyte,exabytes,EB"
-msgstr "exabyte,exabytes,EB"
+msgstr "exabyte,exabytes,EB,艾位元組"
 
-#: lib/unit.vala:117
+#: lib/unit.vala:129
 msgid "Exbibits"
 msgstr "Exbibits"
 
-#: lib/unit.vala:117
+#: lib/unit.vala:129
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eib"
 msgstr "%s Eib"
 
-#: lib/unit.vala:117
+#: lib/unit.vala:129
 msgctxt "unit-symbols"
 msgid "exbibit,exbibits,Eib"
 msgstr "exbibit,exbibits,Eib"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:130
 msgid "Exbibytes"
 msgstr "Exbibytes"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:130
 #, c-format
 msgctxt "unit-format"
 msgid "%s EiB"
 msgstr "%s EiB"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:130
 msgctxt "unit-symbols"
 msgid "exbibyte,exbibytes,EiB"
 msgstr "exbibyte,exbibytes,EiB"
 
-#: lib/unit.vala:119
+#: lib/unit.vala:131
 msgid "Zettabits"
 msgstr "皆位元"
 
-#: lib/unit.vala:119
+#: lib/unit.vala:131
 msgctxt "unit-symbols"
 msgid "zettabit,zettabits,Zb"
-msgstr "zettabit,zettabits,Zb"
+msgstr "zettabit,zettabits,Zb,皆位元"
 
-#: lib/unit.vala:120
+#: lib/unit.vala:132
 msgid "Zettabytes"
 msgstr "皆位元組"
 
-#: lib/unit.vala:120
+#: lib/unit.vala:132
 msgctxt "unit-symbols"
 msgid "zettabyte,zettabytes,ZB"
-msgstr "zettabyte,zettabytes,ZB"
+msgstr "zettabyte,zettabytes,ZB,皆位元組"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:133
 msgid "Zebibits"
 msgstr "Zebibits"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:133
 #, c-format
 msgctxt "unit-format"
 msgid "%s Zib"
 msgstr "%s Zib"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:133
 msgctxt "unit-symbols"
 msgid "zebibit,zebibits,Zib"
 msgstr "zebibit,zebibits,Zib"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:134
 msgid "Zebibytes"
 msgstr "Zebibytes"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:134
 #, c-format
 msgctxt "unit-format"
 msgid "%s ZiB"
 msgstr "%s ZiB"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:134
 msgctxt "unit-symbols"
 msgid "zebibyte,zebibytes,ZiB"
 msgstr "zebibyte,zebibytes,ZiB"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:135
 msgid "Yottabits"
 msgstr "佑位元"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:135
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yb"
 msgstr "%s Yb"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:135
 msgctxt "unit-symbols"
 msgid "yottabit,yottabits,Yb"
-msgstr "yottabit,yottabits,Yb"
+msgstr "yottabit,yottabits,Yb,佑位元"
 
-#: lib/unit.vala:124
+#: lib/unit.vala:136
 msgid "Yottabytes"
 msgstr "佑位元組"
 
-#: lib/unit.vala:124
+#: lib/unit.vala:136
 #, c-format
 msgctxt "unit-format"
 msgid "%s YB"
 msgstr "%s YB"
 
-#: lib/unit.vala:124
+#: lib/unit.vala:136
 msgctxt "unit-symbols"
 msgid "yottabyte,yottabytes,YB"
-msgstr "yottabyte,yottabytes,YB"
+msgstr "yottabyte,yottabytes,YB,佑位元組"
 
-#: lib/unit.vala:125
+#: lib/unit.vala:137
 msgid "Yobibits"
 msgstr "Yobibits"
 
-#: lib/unit.vala:125
+#: lib/unit.vala:137
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yib"
 msgstr "%s Yib"
 
-#: lib/unit.vala:125
+#: lib/unit.vala:137
 msgctxt "unit-symbols"
 msgid "yobibit,yobibits,Yib"
 msgstr "yobibit,yobibits,Yib"
 
-#: lib/unit.vala:126
+#: lib/unit.vala:138
 msgid "Yobibytes"
 msgstr "Yobibytes"
 
-#: lib/unit.vala:126
+#: lib/unit.vala:138
 #, c-format
 msgctxt "unit-format"
 msgid "%s YiB"
 msgstr "%s YiB"
 
-#: lib/unit.vala:126
+#: lib/unit.vala:138
 msgctxt "unit-symbols"
 msgid "yobibyte,yobibytes,YiB"
 msgstr "yobibyte,yobibytes,YiB"
 
-#: lib/unit.vala:128
+#: lib/unit.vala:139
+msgid "Hertz"
+msgstr "赫茲"
+
+#: lib/unit.vala:139
+#, c-format
+msgctxt "unit-format"
+msgid "%s Hz"
+msgstr "%s Hz"
+
+#: lib/unit.vala:139
+msgctxt "unit-symbols"
+msgid "hertz,Hz"
+msgstr "hertz,Hz,赫茲"
+
+#: lib/unit.vala:140
+msgid "Kilohertz"
+msgstr "千赫"
+
+#: lib/unit.vala:140
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s kHz"
+msgctxt "unit-format"
+msgid "%s kHz"
+msgstr "%s kHz"
+
+#: lib/unit.vala:140
+msgctxt "unit-symbols"
+msgid "kilohertz,kHz"
+msgstr "kilohertz,kHz,千赫"
+
+#: lib/unit.vala:141
+msgid "Megahertz"
+msgstr "百萬赫"
+
+#: lib/unit.vala:141
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s MHz"
+msgctxt "unit-format"
+msgid "%s MHz"
+msgstr "%s MHz"
+
+#: lib/unit.vala:141
+msgctxt "unit-symbols"
+msgid "megahertz,MHz"
+msgstr "megahertz,MHz,百萬赫"
+
+#: lib/unit.vala:142
+msgid "Gigahertz"
+msgstr "吉赫"
+
+#: lib/unit.vala:142
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s GHz"
+msgctxt "unit-format"
+msgid "%s GHz"
+msgstr "%s GHz"
+
+#: lib/unit.vala:142
+msgctxt "unit-symbols"
+msgid "gigahertz,GHz"
+msgstr "gigahertz,GHz,吉赫"
+
+#: lib/unit.vala:143
+msgid "Terahertz"
+msgstr "兆赫"
+
+#: lib/unit.vala:143
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s THz"
+msgctxt "unit-format"
+msgid "%s THz"
+msgstr "%s THz"
+
+#: lib/unit.vala:143
+msgctxt "unit-symbols"
+msgid "terahertz,THz"
+msgstr "terahertz,THz,兆赫"
+
+#: lib/unit.vala:145
 msgid "Currency"
 msgstr "貨幣"
 
 #. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: 
USD100
-#: lib/unit.vala:134
+#: lib/unit.vala:151
 #, c-format
 msgid "%s%%s"
 msgstr "%s%%s"
@@ -1980,269 +2231,187 @@ msgstr "複製"
 
 #: search-provider/search-provider.vala:190
 msgid "Copy result to clipboard"
-msgstr "複製結果至剪貼簿"
-
-#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2145
-msgid "Inverse [Ctrl+I]"
-msgstr "反轉 [Ctrl+I]"
-
-#. Accessible name for the inverse button
-#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2150
-msgid "Inverse"
-msgstr "反轉"
-
-#: src/buttons-advanced.ui:47 src/buttons-programming.ui:1279
-msgid "Factorize [Ctrl+F]"
-msgstr "因數分解 [Ctrl+F]"
-
-#. Accessible name for the factorize button
-#: src/buttons-advanced.ui:51 src/buttons-programming.ui:1283
-msgid "Factorize"
-msgstr "因數分解"
-
-#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2118
-msgid "Factorial [!]"
-msgstr "階乘 [!]"
-
-#. Accessible name for the factorial button
-#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2123
-msgid "Factorial"
-msgstr "階乘"
+msgstr "將結果複製至剪貼簿"
 
-#: src/buttons-advanced.ui:95
-msgid "Imaginary Component"
-msgstr "虛數部分"
+#: src/ui/buttons-advanced.ui:122 src/ui/buttons-basic.ui:127
+#: src/ui/buttons-financial.ui:1290 src/ui/buttons-programming.ui:1649
+msgid "Modulus divide"
+msgstr "餘數除法"
 
-#: src/buttons-advanced.ui:247 src/buttons-basic.ui:130
-#: src/buttons-financial.ui:2037 src/buttons-programming.ui:1379
+#: src/ui/buttons-advanced.ui:139 src/ui/buttons-basic.ui:145
+#: src/ui/buttons-financial.ui:1307 src/ui/buttons-programming.ui:1269
 msgid "Divide [/]"
 msgstr "除號 [/]"
 
-#: src/buttons-advanced.ui:359 src/buttons-basic.ui:258
-#: src/buttons-financial.ui:2165 src/buttons-programming.ui:1416
+#: src/ui/buttons-advanced.ui:235 src/ui/buttons-basic.ui:247
+#: src/ui/buttons-financial.ui:1403 src/ui/buttons-programming.ui:1286
 msgid "Multiply [*]"
 msgstr "乘號 [*]"
 
-#: src/buttons-advanced.ui:376 src/buttons-basic.ui:275
-#: src/buttons-financial.ui:2182 src/buttons-programming.ui:1433
+#: src/ui/buttons-advanced.ui:252 src/ui/buttons-basic.ui:265
+#: src/ui/buttons-financial.ui:1420 src/ui/buttons-programming.ui:1303
 msgid "Subtract [-]"
 msgstr "減號 [-]"
 
-#: src/buttons-advanced.ui:392 src/buttons-basic.ui:291
-#: src/buttons-financial.ui:2198 src/buttons-programming.ui:1449
+#: src/ui/buttons-advanced.ui:268 src/ui/buttons-basic.ui:282
+#: src/ui/buttons-financial.ui:1436 src/ui/buttons-programming.ui:1319
 msgid "Add [+]"
 msgstr "加號 [+]"
 
-#. Label on the solve button (clicking this solves the displayed calculation)
-#: src/buttons-advanced.ui:403 src/buttons-basic.ui:302
-#: src/buttons-financial.ui:2209 src/buttons-programming.ui:1460
-msgid "="
-msgstr "＝"
-
-#: src/buttons-advanced.ui:409 src/buttons-basic.ui:308
-#: src/buttons-financial.ui:2215 src/buttons-programming.ui:1466
-msgid "Calculate Result"
-msgstr "計算結果"
-
-#: src/buttons-advanced.ui:427 src/buttons-basic.ui:361
-#: src/buttons-financial.ui:2268 src/buttons-programming.ui:1484
-msgid "Clear Display [Escape]"
-msgstr "清除顯示 [Escape]"
-
-#: src/buttons-advanced.ui:441 src/buttons-programming.ui:1784
-msgid "Subscript mode [Alt]"
-msgstr "下標數字模式 [Alt]"
-
-#. Accessible name for the subscript mode button
-#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1789
-msgid "Subscript"
-msgstr "下標"
-
-#: src/buttons-advanced.ui:468 src/buttons-programming.ui:1811
-msgid "Superscript mode [Ctrl]"
-msgstr "上標數字模式 [Ctrl]"
-
-#. Accessible name for the superscript mode button
-#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1816
-msgid "Superscript"
-msgstr "上標"
-
-#: src/buttons-advanced.ui:495
-msgid "Scientific exponent [Ctrl+E]"
-msgstr "科學記號 [Ctrl+E]"
-
-#. Accessible name for the scientific exponent button
-#: src/buttons-advanced.ui:499
-msgid "Scientific Exponent"
-msgstr "科學記號"
-
-#: src/buttons-advanced.ui:522 src/buttons-programming.ui:1949
-msgid "Modulus divide"
-msgstr "餘數除法"
-
-#: src/buttons-advanced.ui:538 src/buttons-basic.ui:328
-#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1966
-msgid "Start Group [(]"
-msgstr "括號開頭 [(]"
-
-#: src/buttons-advanced.ui:555 src/buttons-basic.ui:345
-#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1982
-msgid "End Group [)]"
-msgstr "括號結尾 [)]"
-
-#. Accessible name for the memory button
-#. Accessible name for the memory value button
-#: src/buttons-advanced.ui:570 src/buttons-advanced.ui:573
-#: src/buttons-financial.ui:1854 src/buttons-financial.ui:1857
-#: src/buttons-programming.ui:1854
-msgid "Memory"
-msgstr "記憶"
-
-#. The label on the memory button
-#: src/buttons-advanced.ui:582 src/buttons-financial.ui:1869
-#: src/buttons-programming.ui:1867
-msgid "x"
-msgstr "x"
-
-#: src/buttons-advanced.ui:617 src/buttons-programming.ui:1316
-msgid "Absolute Value [|]"
-msgstr "絕對值 [|]"
+#: src/ui/buttons-advanced.ui:284 src/ui/buttons-basic.ui:299
+#: src/ui/buttons-programming.ui:1247
+msgid "Pi [Ctrl+P]"
+msgstr "圓周率 [Ctrl+P]"
 
-#. Accessible name for the absolute value button
-#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1321
-msgid "Absolute Value"
-msgstr "絕對值"
+#: src/ui/buttons-advanced.ui:307 src/ui/buttons-basic.ui:323
+#: src/ui/buttons-financial.ui:1453 src/ui/buttons-programming.ui:1231
+msgid "Root [Ctrl+R]"
+msgstr "開根號 [Ctrl+R]"
 
-#: src/buttons-advanced.ui:646
-msgid "Real Component"
-msgstr "實數部分"
+#: src/ui/buttons-advanced.ui:322 src/ui/buttons-basic.ui:339
+msgid "Square [Ctrl+2]"
+msgstr "平方 [Ctrl+2]"
 
-#: src/buttons-advanced.ui:663
-msgid "Complex conjugate"
-msgstr "共軛複數"
+#: src/ui/buttons-advanced.ui:343 src/ui/buttons-basic.ui:361
+#: src/ui/buttons-financial.ui:1469 src/ui/buttons-programming.ui:1352
+msgid "Clear Display [Escape]"
+msgstr "清除顯示 [Escape]"
 
-#: src/buttons-advanced.ui:680
-msgid "Complex argument"
-msgstr "複數輻角"
+#: src/ui/buttons-advanced.ui:359 src/ui/buttons-basic.ui:378
+#: src/ui/buttons-financial.ui:1485 src/ui/buttons-programming.ui:1665
+msgid "Start Group [(]"
+msgstr "括號開頭 [(]"
 
-#: src/buttons-advanced.ui:697
-msgid "Natural Logarithm"
-msgstr "自然對數"
+#: src/ui/buttons-advanced.ui:376 src/ui/buttons-basic.ui:396
+#: src/ui/buttons-financial.ui:1502 src/ui/buttons-programming.ui:1681
+msgid "End Group [)]"
+msgstr "括號結尾 [)]"
 
-#: src/buttons-advanced.ui:713 src/buttons-financial.ui:1908
-#: src/buttons-programming.ui:1262
-msgid "Logarithm"
-msgstr "對數"
+#: src/ui/buttons-advanced.ui:393 src/ui/buttons-basic.ui:414
+#: src/ui/buttons-financial.ui:1519
+msgid "Percentage [%]"
+msgstr "百分比 [%]"
 
-#: src/buttons-advanced.ui:728 src/buttons-financial.ui:2470
-#: src/buttons-programming.ui:2173
-msgid "Exponent [^ or **]"
-msgstr "指數 [^ 或 **]"
+#. Label on the solve button (clicking this solves the displayed calculation)
+#: src/ui/buttons-advanced.ui:407 src/ui/buttons-basic.ui:428
+#: src/ui/buttons-financial.ui:1533 src/ui/buttons-programming.ui:1333
+msgid "="
+msgstr "＝"
 
-#. Accessible name for the exponentiation (x to the power of y) button
-#: src/buttons-advanced.ui:733 src/buttons-basic.ui:396
-#: src/buttons-financial.ui:2475 src/buttons-programming.ui:2178
-msgid "Exponent"
-msgstr "指數"
+#: src/ui/buttons-advanced.ui:410 src/ui/buttons-basic.ui:432
+#: src/ui/buttons-financial.ui:1536 src/ui/buttons-programming.ui:1336
+msgid "Calculate Result"
+msgstr "計算結果"
 
-#: src/buttons-advanced.ui:757 src/buttons-financial.ui:2499
-#: src/buttons-programming.ui:1246
-msgid "Root [Ctrl+R]"
-msgstr "開根號 [Ctrl+R]"
+#: src/ui/buttons-advanced.ui:439 src/ui/buttons-programming.ui:1709
+msgid "Subscript mode [Alt]"
+msgstr "下標數字模式 [Alt]"
 
-#: src/buttons-advanced.ui:773 src/buttons-basic.ui:419
-#: src/buttons-financial.ui:2450
-msgid "Undo [Ctrl+Z]"
-msgstr "復原 [Ctrl+Z]"
+#: src/ui/buttons-advanced.ui:460 src/ui/buttons-programming.ui:1730
+msgid "Superscript mode [Ctrl]"
+msgstr "上標數字模式 [Ctrl]"
 
-#: src/buttons-advanced.ui:793
-msgid "Pi [Ctrl+P]"
-msgstr "Pi [Ctrl+P]"
+#: src/ui/buttons-advanced.ui:483 src/ui/buttons-programming.ui:2032
+msgid "Factorize [Ctrl+F]"
+msgstr "因數分解 [Ctrl+F]"
 
-#: src/buttons-advanced.ui:816
-msgid "Euler’s Number"
-msgstr "歐拉數"
+#: src/ui/buttons-advanced.ui:498
+msgid "Scientific exponent [Ctrl+E]"
+msgstr "科學記號 [Ctrl+E]"
 
-#: src/buttons-advanced.ui:846
+#: src/ui/buttons-advanced.ui:519
 msgid "Cosine"
 msgstr "餘弦"
 
-#: src/buttons-advanced.ui:861
+#: src/ui/buttons-advanced.ui:535
 msgid "Sine"
 msgstr "正弦"
 
-#: src/buttons-advanced.ui:876
+#: src/ui/buttons-advanced.ui:551
 msgid "Tangent"
 msgstr "正切"
 
-#: src/buttons-advanced.ui:891
-msgid "Hyperbolic Sine"
-msgstr "雙曲正弦"
-
-#: src/buttons-advanced.ui:907
+#: src/ui/buttons-advanced.ui:567
 msgid "Hyperbolic Cosine"
 msgstr "雙曲餘弦"
 
-#: src/buttons-advanced.ui:923
+#: src/ui/buttons-advanced.ui:583
+msgid "Hyperbolic Sine"
+msgstr "雙曲正弦"
+
+#: src/ui/buttons-advanced.ui:599
 msgid "Hyperbolic Tangent"
 msgstr "雙曲正切"
 
-#: src/buttons-advanced.ui:946
-msgid "Additional Functions"
-msgstr "額外的函數"
+#: src/ui/buttons-advanced.ui:614 src/ui/buttons-financial.ui:1551
+#: src/ui/buttons-programming.ui:1877
+msgid "Exponent [^ or **]"
+msgstr "指數 [^ 或 **]"
 
-#. Accessible name for the store value button
-#: src/buttons-advanced.ui:949 src/buttons-programming.ui:1857
-msgid "Store"
-msgstr "儲存"
+#: src/ui/buttons-advanced.ui:635 src/ui/buttons-programming.ui:1898
+msgid "Inverse [Ctrl+I]"
+msgstr "反轉 [Ctrl+I]"
 
-#: src/buttons-basic.ui:222 src/buttons-financial.ui:2129
-msgid "Percentage [%]"
-msgstr "百分比 [%]"
+#: src/ui/buttons-advanced.ui:658
+msgid "Euler’s Number"
+msgstr "歐拉數"
 
-#: src/buttons-basic.ui:377
-msgid "Square root [Ctrl+R]"
-msgstr "平方根 [Ctrl+R]"
+#: src/ui/buttons-advanced.ui:681
+msgid "Natural Logarithm"
+msgstr "自然對數"
 
-#: src/buttons-basic.ui:392
-msgid "Square [Ctrl+2]"
-msgstr "平方 [Ctrl+2]"
+#: src/ui/buttons-advanced.ui:697 src/ui/buttons-financial.ui:1573
+#: src/ui/buttons-programming.ui:1921
+msgid "Logarithm"
+msgstr "對數"
+
+#: src/ui/buttons-advanced.ui:712 src/ui/buttons-programming.ui:1953
+msgid "Factorial [!]"
+msgstr "階乘 [!]"
+
+#: src/ui/buttons-advanced.ui:734 src/ui/buttons-programming.ui:1975
+msgid "Absolute Value [|]"
+msgstr "絕對值 [|]"
+
+#: src/ui/buttons-advanced.ui:778
+msgid "Real Component"
+msgstr "實數部分"
+
+#: src/ui/buttons-advanced.ui:795
+msgid "Imaginary Component"
+msgstr "虛數部分"
+
+#: src/ui/buttons-advanced.ui:812
+msgid "Complex conjugate"
+msgstr "共軛複數"
+
+#: src/ui/buttons-advanced.ui:829
+msgid "Complex argument"
+msgstr "複數輻角"
+
+#: src/ui/buttons-advanced.ui:844 src/ui/buttons-financial.ui:1602
+#: src/ui/buttons-programming.ui:2063
+msgid "Memory"
+msgstr "記憶"
+
+#. The label on the memory button
+#: src/ui/buttons-advanced.ui:845 src/ui/buttons-financial.ui:1603
+#: src/ui/buttons-programming.ui:2062
+msgid "x"
+msgstr "x"
+
+#: src/ui/buttons-advanced.ui:859
+msgid "Additional Functions"
+msgstr "額外的函數"
 
 #. Title of Compounding Term dialog
-#: src/buttons-financial.ui:8 src/buttons-financial.ui:2284
+#: src/ui/buttons-financial.ui:5 src/ui/buttons-financial.ui:1619
 msgid "Compounding Term"
 msgstr "複利期間"
 
-#: src/buttons-financial.ui:22 src/buttons-financial.ui:205
-#: src/buttons-financial.ui:388 src/buttons-financial.ui:571
-#: src/buttons-financial.ui:723 src/buttons-financial.ui:907
-#: src/buttons-financial.ui:1091 src/buttons-financial.ui:1275
-#: src/buttons-financial.ui:1459 src/buttons-financial.ui:1674
-#: src/buttons-programming.ui:2303
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#. Compounding Term Dialog: Calculate button
-#. Double-Declining Depreciation Dialog: Calculate button
-#. Future Value Dialog: Calculate button
-#. Gross Profit Margin Dialog: Calculate button
-#. Periodic Payment Dialog: Calculate button
-#. Present Value Dialog: Calculate button
-#. Periodic Interest Rate Dialog: Calculate button
-#. Straight-Line Depreciation Dialog: Calculate button
-#. Sum-of-the-Years’-Digits Depreciation Dialog: Calculate result button
-#. Payment Period Dialog: Button to calculate result
-#: src/buttons-financial.ui:37 src/buttons-financial.ui:220
-#: src/buttons-financial.ui:403 src/buttons-financial.ui:586
-#: src/buttons-financial.ui:738 src/buttons-financial.ui:922
-#: src/buttons-financial.ui:1106 src/buttons-financial.ui:1290
-#: src/buttons-financial.ui:1474 src/buttons-financial.ui:1689
-msgid "C_alculate"
-msgstr "計算(_A)"
-
 #. Compounding Term Dialog: Label before present value input
 #. Periodic Interest Rate Dialog: Label before present value input
-#: src/buttons-financial.ui:117 src/buttons-financial.ui:1172
+#: src/ui/buttons-financial.ui:55 src/ui/buttons-financial.ui:727
 msgid "Present _Value:"
 msgstr "現值(_V)："
 
@@ -2251,34 +2420,61 @@ msgstr "現值(_V)："
 #. Periodic Payment Dialog: Label before periodic interest rate input
 #. Present Value Dialog: Label before periodic interest rate input
 #. Payment Period Dialog: Label before periodic interest rate input
-#: src/buttons-financial.ui:133 src/buttons-financial.ui:468
-#: src/buttons-financial.ui:804 src/buttons-financial.ui:988
-#: src/buttons-financial.ui:1769
+#: src/ui/buttons-financial.ui:67 src/ui/buttons-financial.ui:282
+#: src/ui/buttons-financial.ui:493 src/ui/buttons-financial.ui:610
+#: src/ui/buttons-financial.ui:1106
 msgid "Periodic Interest _Rate:"
 msgstr "定期利率(_R)："
 
 #. Compounding Term Dialog: Description of calculation
-#: src/buttons-financial.ui:149
+#: src/ui/buttons-financial.ui:80
 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 "
 "compounding period."
 msgstr ""
-"計算一項投資的現值要到達某未來值所需的複利期數，每個複利期間的利率為固定的。"
+"計算一項投資的現值要至達某未來值所需的複利期數，每個複利期間的利率為固定的。"
 
 #. Compounding Term Dialog: Label before future value input
 #. Periodic Interest Rate Dialog: Label before future value input
-#: src/buttons-financial.ui:163 src/buttons-financial.ui:1156
+#: src/ui/buttons-financial.ui:91 src/ui/buttons-financial.ui:715
 msgid "_Future Value:"
-msgstr "未來值(_F)："
+msgstr "終值(_F)："
+
+#: src/ui/buttons-financial.ui:110 src/ui/buttons-financial.ui:227
+#: src/ui/buttons-financial.ui:343 src/ui/buttons-financial.ui:437
+#: src/ui/buttons-financial.ui:554 src/ui/buttons-financial.ui:671
+#: src/ui/buttons-financial.ui:788 src/ui/buttons-financial.ui:905
+#: src/ui/buttons-financial.ui:1044 src/ui/buttons-financial.ui:1161
+#: src/ui/buttons-programming.ui:2139
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. Compounding Term Dialog: Calculate button
+#. Double-Declining Depreciation Dialog: Calculate button
+#. Future Value Dialog: Calculate button
+#. Gross Profit Margin Dialog: Calculate button
+#. Periodic Payment Dialog: Calculate button
+#. Present Value Dialog: Calculate button
+#. Periodic Interest Rate Dialog: Calculate button
+#. Straight-Line Depreciation Dialog: Calculate button
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Calculate result button
+#. Payment Period Dialog: Button to calculate result
+#: src/ui/buttons-financial.ui:116 src/ui/buttons-financial.ui:233
+#: src/ui/buttons-financial.ui:349 src/ui/buttons-financial.ui:443
+#: src/ui/buttons-financial.ui:560 src/ui/buttons-financial.ui:677
+#: src/ui/buttons-financial.ui:794 src/ui/buttons-financial.ui:911
+#: src/ui/buttons-financial.ui:1050 src/ui/buttons-financial.ui:1167
+msgid "C_alculate"
+msgstr "計算(_A)"
 
 #. Title of Double-Declining Depreciation dialog
-#: src/buttons-financial.ui:191
+#: src/ui/buttons-financial.ui:122
 msgid "Double-Declining Depreciation"
-msgstr "雙倍餘額遞減折舊法"
+msgstr "雙倍餘額遞減法"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: src/buttons-financial.ui:255
+#: src/ui/buttons-financial.ui:143
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
@@ -2286,31 +2482,31 @@ msgstr "計算在指定的期間中某資產的折舊免稅額，使用雙倍餘
 
 #. Double-Declining Depreciation Dialog: Label before cost input
 #. Gross Profit Margin Dialog: Label before cost input
-#: src/buttons-financial.ui:269 src/buttons-financial.ui:635
+#: src/ui/buttons-financial.ui:154 src/ui/buttons-financial.ui:386
 msgid "C_ost:"
 msgstr "花費(_O)："
 
 #. Double-Declining Depreciation Dialog: Label before life input
 #. Straight-Line Depreciation Dialog: Label before life input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before life input
-#: src/buttons-financial.ui:285 src/buttons-financial.ui:1357
-#: src/buttons-financial.ui:1525
+#: src/ui/buttons-financial.ui:166 src/ui/buttons-financial.ui:844
+#: src/ui/buttons-financial.ui:949
 msgid "_Life:"
 msgstr "年限(_L)："
 
 #. Double-Declining Depreciation Dialog: Label before period input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before period input
-#: src/buttons-financial.ui:331 src/buttons-financial.ui:1509
+#: src/ui/buttons-financial.ui:198 src/ui/buttons-financial.ui:937
 msgid "_Period:"
 msgstr "週期(_P)："
 
 #. Title of Future Value dialog
-#: src/buttons-financial.ui:374 src/buttons-financial.ui:2316
+#: src/ui/buttons-financial.ui:239 src/ui/buttons-financial.ui:1651
 msgid "Future Value"
-msgstr "未來值"
+msgstr "終值"
 
 #. Future Value Dialog: Description of calculation
-#: src/buttons-financial.ui:438
+#: src/ui/buttons-financial.ui:259
 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 "
@@ -2320,64 +2516,64 @@ msgstr "計算投資的未來值，根據一系列等額付款，按照約定付
 #. Future Value Dialog: Label before periodic payment input
 #. Present Value Dialog: Label before periodic payment input
 #. Payment Period Dialog: Label before periodic payment input
-#: src/buttons-financial.ui:452 src/buttons-financial.ui:972
-#: src/buttons-financial.ui:1801
+#: src/ui/buttons-financial.ui:270 src/ui/buttons-financial.ui:598
+#: src/ui/buttons-financial.ui:1130
 msgid "_Periodic Payment:"
 msgstr "定期付款(_P)："
 
 #. Future Value Dialog: Label before number of periods input
 #. Present Value Dialog: Label before number of periods input
-#: src/buttons-financial.ui:484 src/buttons-financial.ui:1004
+#: src/ui/buttons-financial.ui:294 src/ui/buttons-financial.ui:622
 msgid "_Number of Periods:"
 msgstr "週期數(_N)："
 
 #. Title of Gross Profit Margin dialog
-#: src/buttons-financial.ui:557 src/buttons-financial.ui:2434
+#: src/ui/buttons-financial.ui:355 src/ui/buttons-financial.ui:1769
 msgid "Gross Profit Margin"
 msgstr "毛利率"
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: src/buttons-financial.ui:621
+#: src/ui/buttons-financial.ui:375
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
-msgstr "計算轉售價格的產品，根據產品成本和希望的毛利率。"
+msgstr "根據產品成本和希望的毛利，率計算轉售價格的產品。"
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: src/buttons-financial.ui:651
+#: src/ui/buttons-financial.ui:398
 msgid "_Margin:"
 msgstr "盈餘(_M)："
 
 #. Title of Periodic Payment dialog
-#: src/buttons-financial.ui:709 src/buttons-financial.ui:2417
+#: src/ui/buttons-financial.ui:449 src/ui/buttons-financial.ui:1752
 msgid "Periodic Payment"
 msgstr "定期付款"
 
 #. Periodic Payment Dialog: Description of calculation
-#: src/buttons-financial.ui:774
+#: src/ui/buttons-financial.ui:470
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
 msgstr "計算出定期支付的貸款數額，支付款項的時刻為每個付款期間結束時。"
 
 #. Periodic Payment Dialog: Label before principal input
-#: src/buttons-financial.ui:788
+#: src/ui/buttons-financial.ui:481
 msgid "_Principal:"
 msgstr "本金(_P)："
 
 #. Periodic Payment Dialog: Label before term input
 #. Periodic Interest Rate Dialog: Label before term input
-#: src/buttons-financial.ui:820 src/buttons-financial.ui:1188
+#: src/ui/buttons-financial.ui:505 src/ui/buttons-financial.ui:739
 msgid "_Term:"
 msgstr "期數(_T)："
 
 #. Title of Present Value dialog
-#: src/buttons-financial.ui:893 src/buttons-financial.ui:2400
+#: src/ui/buttons-financial.ui:566 src/ui/buttons-financial.ui:1735
 msgid "Present Value"
 msgstr "現值"
 
 #. Present Value Dialog: Description of calculation
-#: src/buttons-financial.ui:958
+#: src/ui/buttons-financial.ui:587
 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 "
@@ -2386,52 +2582,52 @@ msgstr ""
 "計算投資的現值，根據一系列等額付款，按照約定付款期數的定期利率下進行折現。"
 
 #. Title of Periodic Interest Rate dialog
-#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2383
+#: src/ui/buttons-financial.ui:683 src/ui/buttons-financial.ui:1718
 msgid "Periodic Interest Rate"
 msgstr "定期利率"
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: src/buttons-financial.ui:1142
+#: src/ui/buttons-financial.ui:704
 msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
 msgstr "計算投資增加到未來值所需的定期利率，按照複利期數。"
 
 #. Title of Straight-Line Depreciation dialog
-#: src/buttons-financial.ui:1261
+#: src/ui/buttons-financial.ui:800
 msgid "Straight-Line Depreciation"
-msgstr "直線折舊法"
+msgstr "直線法折舊"
 
 #. Straight-Line Depreciation Dialog: Label before cost input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before cost input
-#: src/buttons-financial.ui:1325 src/buttons-financial.ui:1557
+#: src/ui/buttons-financial.ui:820 src/ui/buttons-financial.ui:973
 msgid "_Cost:"
 msgstr "花費(_C)："
 
 #. Straight-Line Depreciation Dialog: Label before salvage input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before salvage input
-#: src/buttons-financial.ui:1341 src/buttons-financial.ui:1541
+#: src/ui/buttons-financial.ui:832 src/ui/buttons-financial.ui:961
 msgid "_Salvage:"
 msgstr "剩餘價值(_S)："
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: src/buttons-financial.ui:1419
+#: src/ui/buttons-financial.ui:887
 msgid ""
 "Calculates the straight-line depreciation of an asset for one period. 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. "
 msgstr ""
-"計算一期間內資產的直線折舊。直線折舊法在資產可用年限內將折舊花費平均分攤。可"
-"用年限指資產折舊的期數，典型狀況下為年。"
+"計算一期間內資產的直線折舊。直線法折舊在資產可用年限內將折舊花費平均分攤。可"
+"用年限指資產折舊的期數（通常為年）。"
 
 #. Title of Sum-of-the-Years’-Digits Depreciation dialog
-#: src/buttons-financial.ui:1445
+#: src/ui/buttons-financial.ui:917
 msgid "Sum-of-the-Years’-Digits Depreciation"
-msgstr "年數總和折舊法"
+msgstr "年數總和法折舊"
 
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Description of calculation
-#: src/buttons-financial.ui:1634
+#: src/ui/buttons-financial.ui:1026
 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 "
@@ -2440,21 +2636,21 @@ msgid ""
 "of periods, typically years, over which an asset is depreciated. "
 msgstr ""
 "計算在指定的期間中某資產的折舊免稅額，使用年數總和法。這個折舊方式會加速折舊"
-"率，所以前期會比後期有更多折舊費用。可用年限是指該資產折舊的週期數 (通常為"
-"年)。"
+"率，所以前期會比後期有更多折舊費用。可用年限是指該資產折舊的週期數（通常為"
+"年）。"
 
 #. Title of Payment Period dialog
-#: src/buttons-financial.ui:1660
+#: src/ui/buttons-financial.ui:1056
 msgid "Payment Period"
 msgstr "付款期間"
 
 #. Payment Period Dialog: Label before future value input
-#: src/buttons-financial.ui:1785
+#: src/ui/buttons-financial.ui:1118
 msgid "Future _Value:"
-msgstr "未來值(_V)："
+msgstr "終值(_V)："
 
 #. Payment Period Dialog: Description of calculation
-#: src/buttons-financial.ui:1818
+#: src/ui/buttons-financial.ui:1143
 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 "
@@ -2462,554 +2658,651 @@ msgid ""
 msgstr "計算普通年金累積至未來值所需的付款期數，按照某一定期利率。"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a 
future value of fv, at a fixed interest rate of int per compounding period. See also: 
http://en.wikipedia.org/wiki/Compound_interest
-#: src/buttons-financial.ui:2278
+#: src/ui/buttons-financial.ui:1616
 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
-#: src/buttons-financial.ui:2294
+#: src/ui/buttons-financial.ui:1632
 msgid "Ddb"
 msgstr "Ddb"
 
-#: src/buttons-financial.ui:2300
+#: src/ui/buttons-financial.ui:1635
 msgid "Double Declining Depreciation"
-msgstr "雙倍餘額遞減折舊法"
+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
-#: src/buttons-financial.ui:2310
+#: src/ui/buttons-financial.ui:1648
 msgid "Fv"
 msgstr "Fv"
 
 #. 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)
-#: src/buttons-financial.ui:2326
+#: src/ui/buttons-financial.ui:1664
 msgid "Term"
 msgstr "Term"
 
-#: src/buttons-financial.ui:2332
+#: src/ui/buttons-financial.ui:1667
 msgid "Financial Term"
 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
-#: src/buttons-financial.ui:2343
+#: src/ui/buttons-financial.ui:1681
 msgid "Syd"
 msgstr "Syd"
 
-#: src/buttons-financial.ui:2349
+#: src/ui/buttons-financial.ui:1684
 msgid "Sum of the Years Digits Depreciation"
-msgstr "年數總和折舊法"
+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
-#: src/buttons-financial.ui:2360
+#: src/ui/buttons-financial.ui:1698
 msgid "Sln"
 msgstr "Sln"
 
-#: src/buttons-financial.ui:2366
+#: src/ui/buttons-financial.ui:1701
 msgid "Straight Line Depreciation"
-msgstr "直線折舊法"
+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
-#: src/buttons-financial.ui:2377
+#: src/ui/buttons-financial.ui:1715
 msgid "Rate"
 msgstr "Rate"
 
 #. 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
-#: src/buttons-financial.ui:2394
+#: src/ui/buttons-financial.ui:1732
 msgid "Pv"
 msgstr "Pv"
 
 #. 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
-#: src/buttons-financial.ui:2411
+#: src/ui/buttons-financial.ui:1749
 msgid "Pmt"
 msgstr "Pmt"
 
 #. 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
-#: src/buttons-financial.ui:2428
+#: src/ui/buttons-financial.ui:1766
 msgid "Gpm"
 msgstr "Gpm"
 
-#: src/buttons-programming.ui:17
+#: src/ui/buttons-programming.ui:16
 msgid "Binary"
-msgstr "2 進位"
+msgstr "二進位"
 
-#: src/buttons-programming.ui:18
+#: src/ui/buttons-programming.ui:17
 msgid "Octal"
-msgstr "8 進位"
+msgstr "八進位"
 
-#: src/buttons-programming.ui:19
+#: src/ui/buttons-programming.ui:18
 msgid "Decimal"
-msgstr "10 進位"
+msgstr "十進位"
 
-#: src/buttons-programming.ui:20
+#: src/ui/buttons-programming.ui:19
 msgid "Hexadecimal"
-msgstr "16 進位"
-
-#: src/buttons-programming.ui:1300
-msgid "Binary Logarithm"
-msgstr "位元組對數"
+msgstr "十六進位"
 
-#: src/buttons-programming.ui:1345
-msgid "Integer Component"
-msgstr "整數部分"
+#: src/ui/buttons-programming.ui:1751
+msgid "Shift Left"
+msgstr "左移"
 
-#: src/buttons-programming.ui:1362
-msgid "Fractional Component"
-msgstr "小數部分"
+#: src/ui/buttons-programming.ui:1764
+msgid "Shift Right"
+msgstr "右移"
 
-#: src/buttons-programming.ui:1898
+#: src/ui/buttons-programming.ui:1778
 msgid "Boolean Exclusive OR"
 msgstr "布林排除 OR"
 
-#: src/buttons-programming.ui:1915
+#: src/ui/buttons-programming.ui:1794
 msgid "Boolean OR"
 msgstr "布林 OR"
 
-#: src/buttons-programming.ui:1932
+#: src/ui/buttons-programming.ui:1811
 msgid "Boolean AND"
 msgstr "布林 AND"
 
-#. Accessible name for the shift left button
-#: src/buttons-programming.ui:1996 src/buttons-programming.ui:1999
-msgid "Shift Left"
-msgstr "左移"
-
-#. Accessible name for the shift right button
-#: src/buttons-programming.ui:2039 src/buttons-programming.ui:2042
-msgid "Shift Right"
-msgstr "右移"
-
-#. Title of insert character code dialog
-#: src/buttons-programming.ui:2083 src/buttons-programming.ui:2256
-msgid "Insert Character Code"
-msgstr "插入字元代碼"
-
-#. Accessible name for the insert character button
-#: src/buttons-programming.ui:2087
-msgid "Insert Character"
-msgstr "插入字元"
-
-#: src/buttons-programming.ui:2103
+#: src/ui/buttons-programming.ui:1828
 msgid "Boolean NOT"
 msgstr "布林 NOT"
 
-#: src/buttons-programming.ui:2202
+#: src/ui/buttons-programming.ui:1845
 msgid "Ones’ Complement"
 msgstr "1 的補數"
 
-#: src/buttons-programming.ui:2219
+#: src/ui/buttons-programming.ui:1862
 msgid "Two’s Complement"
 msgstr "2 的補數"
 
+#: src/ui/buttons-programming.ui:1938
+msgid "Binary Logarithm"
+msgstr "位元組對數"
+
+#: src/ui/buttons-programming.ui:1998
+msgid "Integer Component"
+msgstr "整數部分"
+
+#: src/ui/buttons-programming.ui:2015
+msgid "Fractional Component"
+msgstr "小數部分"
+
+#. Title of insert character code dialog
+#: src/ui/buttons-programming.ui:2047 src/ui/buttons-programming.ui:2101
+msgid "Insert Character Code"
+msgstr "插入字元代碼"
+
+#: src/ui/buttons-programming.ui:2078
+msgid "Change word size"
+msgstr "更改字組長度"
+
 #. Insert ASCII dialog: Label before character entry
-#: src/buttons-programming.ui:2269
+#: src/ui/buttons-programming.ui:2115
 msgid "Ch_aracter:"
 msgstr "字元(_A)："
 
 #. Insert ASCII dialog: Button to insert selected character
-#: src/buttons-programming.ui:2318
+#: src/ui/buttons-programming.ui:2145
 msgid "_Insert"
 msgstr "插入(_I)"
 
 #. Translators: Do not translate possible mode names basic, advanced, financial, programming and keyboard
-#: src/gnome-calculator.vala:25
+#: src/gnome-calculator.vala:24
 msgid "Start in given mode (basic, advanced, financial, programming, keyboard)"
-msgstr "以指定模式啟動 (basic, advanced, financial, programming, keyboard)"
+msgstr ""
+"以指定模式啟動：\n"
+"\t\t\t      basic\t\t基本模式\n"
+"\t\t\t      advanced\t\t進階模式\n"
+"\t\t\t      financial\t\t財務模式\n"
+"\t\t\t      programming\t程式設計模式\n"
+"\t\t\t      keyboard\t\t鍵盤模式"
 
-#: src/gnome-calculator.vala:26
+#: src/gnome-calculator.vala:25
 msgid "Solve given equation"
-msgstr "解答指定的等式"
+msgstr "計算指定算式"
 
-#: src/gnome-calculator.vala:27
+#: src/gnome-calculator.vala:26
 msgid "Start with given equation"
-msgstr "以指定等式開始"
+msgstr "以指定算式啟動程式"
 
-#: src/gnome-calculator.vala:28
+#: src/gnome-calculator.vala:27
 msgid "Show release version"
-msgstr "顯示釋出版本"
-
-#. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:299
-msgid "Unable to open help file"
-msgstr "無法開啟求助檔案"
+msgstr "輸出版本資訊"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:330
+#: src/gnome-calculator.vala:319
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
 "以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
-"zh-l10n lists linux org tw\n"
-"\n"
-"Abel Cheung <abel oaka org>, 2003, 05, 07\n"
-"Ching-Hung Lin <2billlin yahoo com tw>, 2004"
+"zh-l10n lists linux org tw<zh-l10n lists linux org tw>\n"
+"Abel Cheung <abel oaka org>, 2003, 05, 07.\n"
+"Ching-Hung Lin <2billlin yahoo com tw>, 2004.\n"
+"Freddy Cheng <freddy4212 gmail com>, 2022."
 
-#: src/gnome-calculator.vala:336 src/math-window.ui:68
+#: src/gnome-calculator.vala:325 src/ui/math-window.ui:101
 msgid "About Calculator"
 msgstr "關於計算機"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:344
+#: src/gnome-calculator.vala:334
 msgid "Calculator with financial and scientific modes."
 msgstr "附有財務及科學計算模式的計算機。"
 
-#: src/gnome-calculator.vala:359
+#: src/gnome-calculator.vala:347
 msgid "Are you sure you want to close all open windows?"
-msgstr "確定關閉所有開啟視窗？"
+msgstr "確定關閉所有視窗？"
 
-#: src/gnome-calculator.vala:360
+#: src/gnome-calculator.vala:348
 msgid "Close _All"
 msgstr "全部關閉(_A)"
 
-#: src/math-buttons.vala:464
+#: src/math-buttons.vala:227 src/math-buttons.vala:609
+#: src/math-buttons.vala:625
+#, c-format
+msgid "%d-bit"
+msgid_plural "%d-bit"
+msgstr[0] "%d 位元"
+
+#: src/math-buttons.vala:594
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
-msgstr[0] "%d 個位"
+msgstr[0] "%d 位"
+
+#: src/ui/math-converter.ui:41
+msgid " to "
+msgstr "轉換為"
 
-#: src/math-converter.ui:16
+#: src/ui/math-converter.ui:59
 msgid "Switch conversion units"
 msgstr "切換轉換單位"
 
-#: src/math-converter.ui:29
-msgid " to "
-msgstr " 至 "
-
-#: src/math-converter.ui:112
+#: src/ui/math-converter.ui:98
 msgctxt "convertion equals label"
 msgid "="
 msgstr "="
 
-#: src/math-display.vala:544
+#: src/math-display.vala:606
+#, fuzzy
 msgid "Defined Functions"
 msgstr "定義的函數"
 
-#: src/math-display.vala:601
+#: src/math-display.vala:651
+#, fuzzy
+msgid "Built-in keywords"
+msgstr "內建關鍵字"
+
+#: src/math-display.vala:695
+#, fuzzy
+#| msgid "Defined Functions"
+msgid "Defined currencies"
+msgstr "定義的函數"
+
+#: src/math-display.vala:745
+#, fuzzy
 msgid "Defined Variables"
 msgstr "定義的變數"
 
-#: src/math-function-popover.ui:34
+#: src/ui/math-function-popover.ui:27
+#, fuzzy
 msgid "New function"
 msgstr "新增函式"
 
-#: src/math-function-popover.ui:47
+#: src/ui/math-function-popover.ui:37
+#, fuzzy
 msgid "Select no. of arguments"
 msgstr "選取參數編號"
 
-#. Title of preferences dialog
-#: src/math-preferences.vala:33 src/math-window.ui:56
-msgid "Preferences"
-msgstr "偏好設定"
-
-#. Preferences dialog: Label for number format combo box
-#: src/math-preferences.vala:46
-msgid "Number _Format:"
-msgstr "數字格式(_F)："
-
-#. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234×10^99)
-#: src/math-preferences.vala:63
-msgid "Automatic"
-msgstr "自動"
-
-#. Number display mode combo: Fixed, e.g. 1234
-#: src/math-preferences.vala:67
-msgid "Fixed"
-msgstr "固定的"
-
-#. Number display mode combo: Scientific, e.g. 1.234×10^3
-#: src/math-preferences.vala:71
-msgid "Scientific"
-msgstr "科學計算"
-
-#. Number display mode combo: Engineering, e.g. 1.234k
-#: src/math-preferences.vala:75
-msgid "Engineering"
-msgstr "工程"
-
-#. Preferences dialog: label for show trailing zeroes check button
-#: src/math-preferences.vala:92
-msgid "Number of _decimals"
-msgstr "位數(_D)"
-
-#. Preferences dialog: label for show trailing zeroes switch
-#: src/math-preferences.vala:104
-msgid "Trailing _zeroes"
-msgstr "末端的零(_Z)"
-
-#. Preferences dialog: label for show show thousands separator switch
-#: src/math-preferences.vala:117
-msgid "_Thousands separators"
-msgstr "千位分隔符號(_T)"
-
-#. Preferences dialog: Label for angle unit combo box
-#: src/math-preferences.vala:131
-msgid "_Angle units:"
-msgstr "角度單位(_A)："
-
-#. Preferences dialog: Label for word size combo box
-#: src/math-preferences.vala:161
-msgid "Word _size:"
-msgstr "文字大小(_S)："
-
-#. Word size combo: 8 bits
-#: src/math-preferences.vala:175
-msgid "8 bits"
+#: src/math-preferences.vala:123
+msgid "8-bit"
 msgstr "8 位元"
 
-#. Word size combo: 16 bits
-#: src/math-preferences.vala:177
-msgid "16 bits"
+#: src/math-preferences.vala:125
+msgid "16-bit"
 msgstr "16 位元"
 
-#. Word size combo: 32 bits
-#: src/math-preferences.vala:179
-msgid "32 bits"
+#: src/math-preferences.vala:127
+msgid "32-bit"
 msgstr "32 位元"
 
-#. Word size combo: 64 bits
-#: src/math-preferences.vala:181
-msgid "64 bits"
+#: src/math-preferences.vala:129
+msgid "64-bit"
 msgstr "64 位元"
 
-#. Preferences dialog: Label for exchange rate refresh interval combo box
-#: src/math-preferences.vala:187
-msgid "E_xchange rate refresh interval"
-msgstr "匯率重新整理週期(_X)"
-
-#. Refresh interval combo: never
-#: src/math-preferences.vala:201
-msgid "never"
+#: src/math-preferences.vala:138
+msgid "Never"
 msgstr "永不"
 
-#. Refresh interval combo: daily
-#: src/math-preferences.vala:203
-msgid "daily"
-msgstr "每日"
+#: src/math-preferences.vala:140
+msgid "Daily"
+msgstr "每天"
 
-#. Refresh interval combo: weekly
-#: src/math-preferences.vala:205
-msgid "weekly"
+#: src/math-preferences.vala:142
+msgid "Weekly"
 msgstr "每週"
 
-#: src/math-shortcuts.ui:15
+#: src/ui/math-preferences.ui:19
+msgid "Number of _decimals"
+msgstr "小數位數(_D)"
+
+#: src/ui/math-preferences.ui:34
+msgid "Trailing _zeroes"
+msgstr "顯示末端的 0 (_Z)"
+
+#: src/ui/math-preferences.ui:46
+msgid "_Thousands separators"
+msgstr "顯示千分位符號(_T)"
+
+#: src/ui/math-preferences.ui:58
+msgid "_Angle units"
+msgstr "角度單位(_A)"
+
+#: src/ui/math-preferences.ui:64
+msgid "Word _size"
+msgstr "字組長度(_S)"
+
+#: src/ui/math-preferences.ui:70
+msgid "E_xchange rate refresh interval"
+msgstr "匯率更新週期(_X)"
+
+#: src/ui/math-shortcuts.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "一般"
 
-#: src/math-shortcuts.ui:20
+#: src/ui/math-shortcuts.ui:20
 msgctxt "shortcut window"
 msgid "Open a new window"
-msgstr "開啟新的視窗"
+msgstr "開啟新視窗"
 
-#: src/math-shortcuts.ui:27
+#: src/ui/math-shortcuts.ui:27
 msgctxt "shortcut window"
 msgid "Close current window"
-msgstr "關閉目前的視窗"
+msgstr "關閉目前視窗"
 
-#: src/math-shortcuts.ui:34
+#: src/ui/math-shortcuts.ui:34
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "退出應用程式"
 
-#: src/math-shortcuts.ui:41
+#: src/ui/math-shortcuts.ui:41
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "顯示求助"
 
-#: src/math-shortcuts.ui:48
+#: src/ui/math-shortcuts.ui:48
 msgctxt "shortcut window"
 msgid "Open menu"
 msgstr "開啟選單"
 
-#: src/math-shortcuts.ui:55
+#: src/ui/math-shortcuts.ui:55
 msgctxt "shortcut window"
 msgid "Keyboard shortcuts"
-msgstr "鍵盤快捷鍵"
+msgstr "鍵盤捷徑鍵"
 
-#: src/math-shortcuts.ui:62
+#: src/ui/math-shortcuts.ui:62
 msgctxt "shortcut window"
 msgid "Clear history"
 msgstr "清除紀錄"
 
-#: src/math-shortcuts.ui:70
+#: src/ui/math-shortcuts.ui:70
 msgctxt "shortcut window"
 msgid "Switching modes"
 msgstr "切換模式"
 
-#: src/math-shortcuts.ui:75
+#: src/ui/math-shortcuts.ui:75
 msgctxt "shortcut window"
 msgid "Switch to Basic mode"
-msgstr "切換到基本模式"
+msgstr "切換至基本模式"
 
-#: src/math-shortcuts.ui:82
+#: src/ui/math-shortcuts.ui:82
 msgctxt "shortcut window"
 msgid "Switch to Advanced mode"
-msgstr "切換到進階模式"
+msgstr "切換至進階模式"
 
-#: src/math-shortcuts.ui:89
+#: src/ui/math-shortcuts.ui:89
 msgctxt "shortcut window"
 msgid "Switch to Financial mode"
-msgstr "切換到金融模式"
+msgstr "切換至財務模式"
 
-#: src/math-shortcuts.ui:96
+#: src/ui/math-shortcuts.ui:96
 msgctxt "shortcut window"
 msgid "Switch to Programming mode"
-msgstr "切換到程式設計模式"
+msgstr "切換至程式設計模式"
 
-#: src/math-shortcuts.ui:103
+#: src/ui/math-shortcuts.ui:103
 msgctxt "shortcut window"
 msgid "Switch to Keyboard mode"
-msgstr "切換到鍵盤模式"
+msgstr "切換至鍵盤模式"
 
-#: src/math-shortcuts.ui:111
+#: src/ui/math-shortcuts.ui:111
 msgctxt "shortcut window"
 msgid "Keyboard entry"
 msgstr "鍵盤項目"
 
-#: src/math-shortcuts.ui:116
+#: src/ui/math-shortcuts.ui:116
 msgctxt "shortcut window"
 msgid "Multiply (×)"
 msgstr "乘號 (×)"
 
-#: src/math-shortcuts.ui:123
+#: src/ui/math-shortcuts.ui:123
 msgctxt "shortcut window"
 msgid "Divide (÷)"
 msgstr "除號 (÷)"
 
-#: src/math-shortcuts.ui:130
+#: src/ui/math-shortcuts.ui:130
 msgctxt "shortcut window"
 msgid "Square root (√)"
 msgstr "平方根 (√)"
 
-#: src/math-shortcuts.ui:137
+#: src/ui/math-shortcuts.ui:137
 msgctxt "shortcut window"
 msgid "Inverse"
 msgstr "反轉"
 
-#: src/math-shortcuts.ui:144
+#: src/ui/math-shortcuts.ui:144
 msgctxt "shortcut window"
 msgid "Pi (π)"
-msgstr "Pi (π)"
+msgstr "圓周率(π)"
 
-#: src/math-shortcuts.ui:151
+#: src/ui/math-shortcuts.ui:151
 msgctxt "shortcut window"
 msgid "Enter numbers in scientific format"
-msgstr "輸入科學記數格式的數字"
+msgstr "以科學記號格式輸入數字"
 
-#: src/math-shortcuts.ui:159
+#: src/ui/math-shortcuts.ui:159
 msgctxt "shortcut window"
 msgid "Programming mode"
 msgstr "程式設計模式"
 
-#: src/math-shortcuts.ui:164
+#: src/ui/math-shortcuts.ui:164
 msgctxt "shortcut window"
 msgid "Switch to binary"
-msgstr "切換到 2 進位"
+msgstr "切換至二進位"
 
-#: src/math-shortcuts.ui:171
+#: src/ui/math-shortcuts.ui:171
 msgctxt "shortcut window"
 msgid "Switch to octal"
-msgstr "切換到 8 進位"
+msgstr "切換至八進位"
 
-#: src/math-shortcuts.ui:178
+#: src/ui/math-shortcuts.ui:178
 msgctxt "shortcut window"
 msgid "Switch to decimal"
-msgstr "切換到 10 進位"
+msgstr "切換至十進位"
 
-#: src/math-shortcuts.ui:185
+#: src/ui/math-shortcuts.ui:185
 msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
-msgstr "切換到 16 進位"
+msgstr "切換至十六進位"
 
-#: src/math-shortcuts.ui:193
+#: src/ui/math-shortcuts.ui:193
 msgctxt "shortcut window"
 msgid "Others"
 msgstr "其他"
 
-#: src/math-shortcuts.ui:198
+#: src/ui/math-shortcuts.ui:198
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "複製"
 
-#: src/math-shortcuts.ui:205
+#: src/ui/math-shortcuts.ui:205
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "貼上"
 
-#: src/math-shortcuts.ui:212
+#: src/ui/math-shortcuts.ui:212
 msgctxt "shortcut window"
 msgid "Undo"
-msgstr "復原"
+msgstr "還原"
 
-#: src/math-shortcuts.ui:219
+#: src/ui/math-shortcuts.ui:219
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "重做"
 
-#: src/math-shortcuts.ui:226
+#: src/ui/math-shortcuts.ui:226
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Previous result"
 msgstr "上一個結果"
 
-#: src/math-shortcuts.ui:233
+#: src/ui/math-shortcuts.ui:233
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Next result"
 msgstr "下一個結果"
 
-#: src/math-shortcuts.ui:240
+#: src/ui/math-shortcuts.ui:240
 msgctxt "shortcut window"
 msgid "Switch to Keyboard mode (alt.)"
-msgstr "切換到鍵盤模式 (替代)"
+msgstr "切換至鍵盤模式（替代）"
 
-#: src/math-variable-popover.ui:38
+#: src/ui/math-variable-popover.ui:31
 msgid "Variable name"
 msgstr "變數名稱"
 
-#: src/math-variable-popover.ui:52
+#: src/ui/math-variable-popover.ui:40
 msgid "Store value into existing or new variable"
-msgstr "將數值儲存到現有或新的變數"
+msgstr "將數值儲存至現有或新的變數"
 
-#: src/math-window.ui:20 src/math-window.vala:88
-msgid "Basic Mode"
-msgstr "基礎模式"
+#: src/ui/math-window.ui:20 src/math-window.vala:113
+msgid "Basic"
+msgstr "基本模式"
 
-#: src/math-window.ui:25 src/math-window.vala:93
-msgid "Advanced Mode"
+#: src/ui/math-window.ui:25 src/math-window.vala:119
+msgid "Advanced"
 msgstr "進階模式"
 
-#: src/math-window.ui:30 src/math-window.vala:98
-msgid "Financial Mode"
-msgstr "金融模式"
+#: src/ui/math-window.ui:30 src/math-window.vala:125
+msgid "Financial"
+msgstr "財務模式"
 
-#: src/math-window.ui:35 src/math-window.vala:103
-msgid "Programming Mode"
+#: src/ui/math-window.ui:35 src/math-window.vala:131
+msgid "Programming"
 msgstr "程式設計模式"
 
-#: src/math-window.ui:40 src/math-window.vala:108
-msgid "Keyboard Mode"
+#: src/ui/math-window.ui:40 src/math-window.vala:137
+msgid "Keyboard"
 msgstr "鍵盤模式"
 
-#: src/math-window.ui:49
+#: src/ui/math-window.ui:49
 msgid "_New Window"
-msgstr "開新視窗(_N)"
+msgstr "新視窗(_N)"
+
+#. Translators: entry of the Setup submenu of the hamburger menu (with a mnemonic that appears when pressing 
Alt); set number format to "automatic"; other possible options are "_Fixed", "_Scientific" and "_Engineering"
+#: src/ui/math-window.ui:61
+msgid "_Automatic"
+msgstr "自動(_A)"
 
-#: src/math-window.ui:60
+#. Translators: entry of the Setup submenu of the hamburger menu (with a mnemonic that appears when pressing 
Alt); set number format to "fixed"; other possible options are "_Automatic", "_Scientific" and "_Engineering"
+#: src/ui/math-window.ui:67
+msgid "_Fixed"
+msgstr "固定數字(_F)"
+
+#. Translators: entry of the Setup submenu of the hamburger menu (with a mnemonic that appears when pressing 
Alt); set number format to "scientific"; other possible options are "_Fixed", "_Automatic" and "_Engineering"
+#: src/ui/math-window.ui:73
+msgid "_Scientific"
+msgstr "科學記號(_S)"
+
+#. Translators: entry of the Setup submenu of the hamburger menu (with a mnemonic that appears when pressing 
Alt); set number format to "engineering"; other possible options are "_Fixed", "_Scientific" and "_Automatic"
+#: src/ui/math-window.ui:79
+msgid "_Engineering"
+msgstr "工程記號(_N)"
+
+#: src/ui/math-window.ui:89
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: src/ui/math-window.ui:93
 msgid "Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵"
+msgstr "鍵盤捷徑鍵"
 
-#: src/math-window.ui:64
+#: src/ui/math-window.ui:97
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: src/math-window.ui:115
+#: src/ui/math-window.ui:117
 msgid "Mode selection"
 msgstr "模式選擇"
 
-#: src/math-window.ui:162
+#: src/ui/math-window.ui:128
+msgid "Undo [Ctrl+Z]"
+msgstr "還原[Ctrl+Z]"
+
+#: src/ui/math-window.ui:132
+#| msgctxt "shortcut window"
+#| msgid "Undo"
+msgid "Undo"
+msgstr "還原"
+
+#: src/ui/math-window.ui:143
 msgid "Primary menu"
 msgstr "主選單"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:166
 msgid "_Quit"
-msgstr "離開(_Q)"
+msgstr "退出(_Q)"
+
+#~ msgid "GNOME Calculator"
+#~ msgstr "GNOME 計算機"
+
+#~ msgid "GNOME Calculator in Basic Mode"
+#~ msgstr "GNOME 計算機基本模式"
+
+#~ msgid "GNOME Calculator in Advanced Mode"
+#~ msgstr "GNOME 計算機進階模式"
+
+#~ msgid "GNOME Calculator in Financial Mode"
+#~ msgstr "GNOME 計算機金融模式"
+
+#~ msgid "GNOME Calculator in Programming Mode"
+#~ msgstr "GNOME 計算機程式設計模式"
+
+#~ msgid "How often the currency exchange rates should be updated"
+#~ msgstr "多久更新幣值匯率一次"
+
+#~ msgid "Inverse"
+#~ msgstr "反轉"
+
+#~ msgid "Factorize"
+#~ msgstr "因數分解"
+
+#~ msgid "Factorial"
+#~ msgstr "階乘"
+
+#~ msgid "Subscript"
+#~ msgstr "下標"
+
+#~ msgid "Superscript"
+#~ msgstr "上標"
+
+#~ msgid "Scientific Exponent"
+#~ msgstr "科學記號"
+
+#~ msgid "Absolute Value"
+#~ msgstr "絕對值"
+
+#~ msgid "Exponent"
+#~ msgstr "指數"
+
+#~ msgid "Store"
+#~ msgstr "儲存"
+
+#~ msgid "Square root [Ctrl+R]"
+#~ msgstr "平方根 [Ctrl+R]"
+
+#~ msgid "Insert Character"
+#~ msgstr "插入字元"
+
+#~ msgid "Unable to open help file"
+#~ msgstr "無法開啟求助檔案"
+
+#~ msgid "Number _Format:"
+#~ msgstr "數字格式(_F)："
+
+#~ msgid "Scientific"
+#~ msgstr "科學計算"
+
+#~ msgid "8 bits"
+#~ msgstr "8 位元"
+
+#~ msgid "16 bits"
+#~ msgstr "16 位元"
+
+#~ msgid "32 bits"
+#~ msgstr "32 位元"
+
+#~ msgid "64 bits"
+#~ msgstr "64 位元"
+
+#~ msgid "Basic Mode"
+#~ msgstr "基礎模式"
+
+#~ msgid "Advanced Mode"
+#~ msgstr "進階模式"
+
+#~ msgid "Financial Mode"
+#~ msgstr "金融模式"
+
+#~ msgid "Programming Mode"
+#~ msgstr "程式設計模式"
 
 #~ msgid "Start in given mode"
 #~ msgstr "以指定模式開始"
@@ -3093,18 +3386,6 @@ msgstr "離開(_Q)"
 #~ msgid "Mode"
 #~ msgstr "模式"
 
-#~ msgid "Basic"
-#~ msgstr "基本"
-
-#~ msgid "Advanced"
-#~ msgstr "進階"
-
-#~ msgid "Financial"
-#~ msgstr "金融"
-
-#~ msgid "Programming"
-#~ msgstr "程式開發"
-
 #~ msgid "Round"
 #~ msgstr "四捨五入"
 
@@ -3120,18 +3401,6 @@ msgstr "離開(_Q)"
 #~ msgid "Litres"
 #~ msgstr "公升"
 
-#~ msgid "8-bit"
-#~ msgstr "8 位元"
-
-#~ msgid "16-bit"
-#~ msgstr "16 位元"
-
-#~ msgid "32-bit"
-#~ msgstr "32 位元"
-
-#~ msgid "64-bit"
-#~ msgstr "64 位元"
-
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s — Perform mathematical calculations"
@@ -3369,9 +3638,6 @@ msgstr "離開(_Q)"
 #~ msgid "_9 places"
 #~ msgstr "_9 個位"
 
-#~ msgid "_Scientific"
-#~ msgstr "科學計算模式(_S)"
-
 #~ msgid "_View"
 #~ msgstr "檢視(_V)"
 
@@ -3392,16 +3658,16 @@ msgstr "離開(_Q)"
 #~ "「SCIENTIFIC」和「PROGRAMMING」"
 
 #~ msgid ""
-#~ "The initial display mode. Valid values are \"ENG\" (engineering), \"FIX"
-#~ "\" (fixed-point) and \"SCI\" (scientific)"
+#~ "The initial display mode. Valid values are \"ENG\" (engineering), "
+#~ "\"FIX\" (fixed-point) and \"SCI\" (scientific)"
 #~ msgstr ""
 #~ "初始的顯示模式。可用的數值有「ENG」(工程用)、「FIX」(固定點) 和「SCI」(科"
 #~ "學用)"
 
 #, fuzzy
 #~ msgid ""
-#~ "The initial trigonometric type. Valid values are \"DEG\" (degrees), \"GRAD"
-#~ "\" (gradians) and \"RAD\" (radians)."
+#~ "The initial trigonometric type. Valid values are \"DEG\" (degrees), "
+#~ "\"GRAD\" (gradians) and \"RAD\" (radians)."
 #~ msgstr ""
 #~ "初始的三角函數類型。可用的數值有「DEG」(度)、「GRAD」(gradians)、「RAD」"
 #~ "(弧度)。"