i18n: bugfix in zh_TW

[mypaint-anime/master.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 27b9a3e..a97d13b 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2010 Martin Renold
 # This file is distributed under the same license as the MyPaint package.
 # Dong-Jun Wu, 2010
-
 msgid ""
 msgstr ""
 "Project-Id-Version: mypaint\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-09 18:29+0800\n"
+"POT-Creation-Date: 2011-11-30 15:54+0800\n"
 "PO-Revision-Date: 2010-03-09 18:43+0800\n"
 "Last-Translator: Dong-Jun Wu <ziyawu@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,106 +19,161 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 
 #. name, hard minimum, soft minimum, normal[1], soft maximum, hard maximum, displayed name, tooltip
-#: ../brushlib/brushsettings.py:22
-#: ../gui/preferenceswindow.py:42
+#: ../brushlib/brushsettings.py:26
 msgid "Pressure"
 msgstr "壓力"
 
-#: ../brushlib/brushsettings.py:22
-msgid "The pressure reported by the tablet, between 0.0 and 1.0. If you use the mouse, it will be 0.5 when a button is pressed and 0.0 otherwise."
-msgstr "由繪圖板回報的壓力，在 0.0 和 1.0 之間。如果您使用滑鼠，按下右鍵時壓力為 0.5，反之為 0.0。"
+#: ../brushlib/brushsettings.py:26
+msgid ""
+"The pressure reported by the tablet, between 0.0 and 1.0. If you use the "
+"mouse, it will be 0.5 when a button is pressed and 0.0 otherwise."
+msgstr ""
+"由繪圖板回報的壓力，在 0.0 和 1.0 之間。如果您使用滑鼠，按下右鍵時壓力為 "
+"0.5，反之為 0.0。"
 
-#: ../brushlib/brushsettings.py:23
+#: ../brushlib/brushsettings.py:27
 msgid "Fine speed"
 msgstr "精細速度"
 
-#: ../brushlib/brushsettings.py:23
-msgid "How fast you currently move. This can change very quickly. Try 'print input values' from the 'help' menu to get a feeling for the range; negative values are rare but possible for very low speed."
-msgstr "您目前移動的速度。這個可以變得非常快。用「說明」選單的「列印輸入值」來感受數值範圍的感覺；負值比較罕見，但可用於非常緩慢的速度。"
+#: ../brushlib/brushsettings.py:27
+msgid ""
+"How fast you currently move. This can change very quickly. Try 'print input "
+"values' from the 'help' menu to get a feeling for the range; negative values "
+"are rare but possible for very low speed."
+msgstr ""
+"您目前移動的速度。這個可以變得非常快。用「說明」選單的「列印輸入值」來感受數"
+"值範圍的感覺；負值比較罕見，但可用於非常緩慢的速度。"
 
-#: ../brushlib/brushsettings.py:24
+#: ../brushlib/brushsettings.py:28
 msgid "Gross speed"
 msgstr "總速度"
 
-#: ../brushlib/brushsettings.py:24
-msgid "Same as fine speed, but changes slower. Also look at the 'gross speed filter' setting."
+#: ../brushlib/brushsettings.py:28
+msgid ""
+"Same as fine speed, but changes slower. Also look at the 'gross speed "
+"filter' setting."
 msgstr "同於精細速度，但變化較慢。也請查看「總速度濾鏡」設定值。"
 
-#: ../brushlib/brushsettings.py:25
+#: ../brushlib/brushsettings.py:29
 msgid "Random"
 msgstr "隨機"
 
-#: ../brushlib/brushsettings.py:25
-msgid "Fast random noise, changing at each evaluation. Evenly distributed between 0 and 1."
+#: ../brushlib/brushsettings.py:29
+msgid ""
+"Fast random noise, changing at each evaluation. Evenly distributed between 0 "
+"and 1."
 msgstr "快速隨機雜訊，於每次評估時改變。在 0 和 1 之間均勻分佈。"
 
-#: ../brushlib/brushsettings.py:26
+#: ../brushlib/brushsettings.py:30 ../gui/brushsettingswindow.py:107
 msgid "Stroke"
 msgstr "筆畫"
 
-#: ../brushlib/brushsettings.py:26
-msgid "This input slowly goes from zero to one while you draw a stroke. It can also be configured to jump back to zero periodically while you move. Look at the 'stroke duration' and 'stroke hold time' settings."
-msgstr "當您繪製一道筆畫時，這種輸入會緩慢地從零到一。它也可以設定成移動時週期性跳回零。請查看「筆畫持續時間」和「筆畫維持時間」設定值。"
+#: ../brushlib/brushsettings.py:30
+msgid ""
+"This input slowly goes from zero to one while you draw a stroke. It can also "
+"be configured to jump back to zero periodically while you move. Look at the "
+"'stroke duration' and 'stroke hold time' settings."
+msgstr ""
+"當您繪製一道筆畫時，這種輸入會緩慢地從零到一。它也可以設定成移動時週期性跳回"
+"零。請查看「筆畫持續時間」和「筆畫維持時間」設定值。"
 
-#: ../brushlib/brushsettings.py:27
+#: ../brushlib/brushsettings.py:31
 msgid "Direction"
 msgstr "方向"
 
-#: ../brushlib/brushsettings.py:27
-msgid "The angle of the stroke, in degrees. The value will stay between 0.0 and 180.0, effectively ignoring turns of 180 degrees."
-msgstr "筆畫的角度，單位為度。此數值會在 0.0 到 180.0 之間，有效地忽略 180 度轉彎。"
+#: ../brushlib/brushsettings.py:31
+msgid ""
+"The angle of the stroke, in degrees. The value will stay between 0.0 and "
+"180.0, effectively ignoring turns of 180 degrees."
+msgstr ""
+"筆畫的角度，單位為度。此數值會在 0.0 到 180.0 之間，有效地忽略 180 度轉彎。"
+
+#: ../brushlib/brushsettings.py:32
+msgid "Declination"
+msgstr "上傾"
+
+#: ../brushlib/brushsettings.py:32
+msgid ""
+"Declination of stylus tilt. 0 when stylus is parallel to tablet and 90.0 "
+"when it's perpendicular to tablet."
+msgstr ""
+
+#: ../brushlib/brushsettings.py:33
+msgid "Ascension"
+msgstr "上升"
+
+#: ../brushlib/brushsettings.py:33
+msgid ""
+"Right ascension of stylus tilt. 0 when stylus working end points to you, +90 "
+"when rotated 90 degrees clockwise, -90 when rotated 90 degrees "
+"counterclockwise."
+msgstr ""
 
 #. ['motion_strength',0.0,0.0,  0.0,  1.0, 1.0,  "[EXPERIMENTAL] Same as angle, but wraps at 180 degrees. The dynamics are shared with BRUSH_OFFSET_BY_SPEED_FILTER (FIXME: which is a bad thing)."],
-#: ../brushlib/brushsettings.py:29
+#: ../brushlib/brushsettings.py:35 ../gui/brushsettingswindow.py:109
 msgid "Custom"
 msgstr "自訂"
 
-#: ../brushlib/brushsettings.py:29
-msgid "This is a user defined input. Look at the 'custom input' setting for details."
+#: ../brushlib/brushsettings.py:35
+msgid ""
+"This is a user defined input. Look at the 'custom input' setting for details."
 msgstr "這是使用者定義的輸入。詳見「自訂輸入」設定值來獲得詳細資訊。"
 
 #. internal name, displayed name, constant, minimum, default, maximum, tooltip
-#: ../brushlib/brushsettings.py:38
-msgid "opaque"
-msgstr "不透明"
+#: ../brushlib/brushsettings.py:44 ../gui/brushsettingswindow.py:102
+msgid "Opacity"
+msgstr "不透明度"
 
-#: ../brushlib/brushsettings.py:38
+#: ../brushlib/brushsettings.py:44
 msgid ""
 "0 means brush is transparent, 1 fully visible\n"
-"(also known als alpha or opacity)"
+"(also known as alpha or opacity)"
 msgstr ""
 "0 表示筆刷是透明的，1 則完全不透明\n"
 "(亦稱為 alpha 或 不透明度)"
 
-#: ../brushlib/brushsettings.py:39
-msgid "opaque multiply"
+#: ../brushlib/brushsettings.py:45
+msgid "Opacity multiply"
 msgstr "不透明相乘"
 
-#: ../brushlib/brushsettings.py:39
-msgid "This gets multiplied with opaque. It is used for making opaque depend on pressure (or other inputs)."
-msgstr "這可得到乘以不透明度的值。它會用於由壓力 (或者其他輸入) 決定產生的不透明度。"
+#: ../brushlib/brushsettings.py:45
+msgid ""
+"This gets multiplied with opaque. You should only change the pressure input "
+"of this setting. Use 'opaque' instead to make opacity depend on speed.\n"
+"This setting is responsible to stop painting when there is zero pressure. "
+"This is just a convention, the behaviour is identical to 'opaque'."
+msgstr ""
 
-#: ../brushlib/brushsettings.py:40
-msgid "opaque linearize"
+#: ../brushlib/brushsettings.py:46
+msgid "Opacity linearize"
 msgstr "不透明線性化"
 
-#: ../brushlib/brushsettings.py:40
+#: ../brushlib/brushsettings.py:46
 msgid ""
-"Correct the nonlinearity introduced by blending multiple dabs on top of each other. This correction should get you a linear (\"natural\") pressure response when pressure is mapped to opaque_multiply, as it is usually done. 0.9 is good for standard strokes, set it smaller if your brush scatters a lot, or higher if you use dabs_per_second.\n"
+"Correct the nonlinearity introduced by blending multiple dabs on top of each "
+"other. This correction should get you a linear (\"natural\") pressure "
+"response when pressure is mapped to opaque_multiply, as it is usually done. "
+"0.9 is good for standard strokes, set it smaller if your brush scatters a "
+"lot, or higher if you use dabs_per_second.\n"
 "0.0 the opaque value above is for the individual dabs\n"
-"1.0 the opaque value above is for the final brush stroke, assuming each pixel gets (dabs_per_radius*2) brushdabs on average during a stroke"
+"1.0 the opaque value above is for the final brush stroke, assuming each "
+"pixel gets (dabs_per_radius*2) brushdabs on average during a stroke"
 msgstr ""
-"藉由混合多個筆觸彼此的頂部進行非線性修正。因為通常已經完成，所以當壓力對應到「不透明相乘」時，這項修正應該給您一種線性的 (自然的) 壓力感應。0.9 有利於標準筆畫，如果您的筆刷散佈很廣則設定較小的值，或者您使用「每秒筆觸數量」的話就設定較高的數值。\n"
+"藉由混合多個筆觸彼此的頂部進行非線性修正。因為通常已經完成，所以當壓力對應到"
+"「不透明相乘」時，這項修正應該給您一種線性的 (自然的) 壓力感應。0.9 有利於標"
+"準筆畫，如果您的筆刷散佈很廣則設定較小的值，或者您使用「每秒筆觸數量」的話就"
+"設定較高的數值。\n"
 "0.0 上面的不透明值是針對個別筆觸\n"
-"1.0 上面的不透明值是針對最終筆刷筆畫，假定一道筆畫中每個像素平均獲得 (每半徑筆觸數量*2) 筆刷筆觸數量"
+"1.0 上面的不透明值是針對最終筆刷筆畫，假定一道筆畫中每個像素平均獲得 (每半徑"
+"筆觸數量*2) 筆刷筆觸數量"
 
-#: ../brushlib/brushsettings.py:41
-msgid "radius"
+#: ../brushlib/brushsettings.py:47
+msgid "Radius"
 msgstr "半徑"
 
-#: ../brushlib/brushsettings.py:41
+#: ../brushlib/brushsettings.py:47
 msgid ""
-"basic brush radius (logarithmic)\n"
+"Basic brush radius (logarithmic)\n"
 " 0.7 means 2 pixels\n"
 " 3.0 means 20 pixels"
 msgstr ""
@@ -126,103 +181,128 @@ msgstr ""
 " 0.7 代表 2 像素\n"
 " 3.0 代表 20 像素"
 
-#: ../brushlib/brushsettings.py:42
-msgid "hardness"
+#: ../brushlib/brushsettings.py:48
+msgid "Hardness"
 msgstr "硬度"
 
-#: ../brushlib/brushsettings.py:42
-msgid "hard brush-circle borders (setting to zero will draw nothing)"
+#: ../brushlib/brushsettings.py:48
+msgid ""
+"Hard brush-circle borders (setting to zero will draw nothing). To reach the "
+"maximum hardness, you need to disable Anti-aliasing."
 msgstr "硬式圓形筆刷邊界 (設定值為零會畫不出東西)"
 
-#: ../brushlib/brushsettings.py:43
-msgid "dabs per basic radius"
+#: ../brushlib/brushsettings.py:49
+msgid "Anti-aliasing"
+msgstr "反鋸齒"
+
+#: ../brushlib/brushsettings.py:49
+msgid ""
+"This setting decreases the hardness when necessary to prevent a pixel "
+"staircase effect.\n"
+" 0.0 disable (for very strong erasers and pixel brushes)\n"
+" 1.0 blur one pixel (good value)\n"
+" 5.0 notable blur, thin strokes will disappear"
+msgstr ""
+
+#: ../brushlib/brushsettings.py:50
+msgid "Dabs per basic radius"
 msgstr "每基本半徑的筆觸數量"
 
-#: ../brushlib/brushsettings.py:43
-msgid "how many dabs to draw while the pointer moves a distance of one brush radius (more precise: the base value of the radius)"
+#: ../brushlib/brushsettings.py:50
+msgid ""
+"How many dabs to draw while the pointer moves a distance of one brush radius "
+"(more precise: the base value of the radius)"
 msgstr "當游標移動一段筆刷半徑的距離時繪製的筆觸數量 (更加精確：半徑的基本值)"
 
-#: ../brushlib/brushsettings.py:44
-msgid "dabs per actual radius"
+#: ../brushlib/brushsettings.py:51
+msgid "Dabs per actual radius"
 msgstr "每實際半徑的筆觸數量"
 
-#: ../brushlib/brushsettings.py:44
-msgid "same as above, but the radius actually drawn is used, which can change dynamically"
+#: ../brushlib/brushsettings.py:51
+msgid ""
+"Same as above, but the radius actually drawn is used, which can change "
+"dynamically"
 msgstr "與上面相同，但使用實際半徑繪製，實際半徑可以動態變化"
 
-#: ../brushlib/brushsettings.py:45
-msgid "dabs per second"
+#: ../brushlib/brushsettings.py:52
+msgid "Dabs per second"
 msgstr "每秒的筆觸數量"
 
-#: ../brushlib/brushsettings.py:45
-msgid "dabs to draw each second, no matter how far the pointer moves"
+#: ../brushlib/brushsettings.py:52
+msgid "Dabs to draw each second, no matter how far the pointer moves"
 msgstr "每秒繪製的筆觸數量，與游標移動距離無關"
 
-#: ../brushlib/brushsettings.py:46
-msgid "radius by random"
+#: ../brushlib/brushsettings.py:53
+msgid "Radius by random"
 msgstr "隨機半徑"
 
-#: ../brushlib/brushsettings.py:46
+#: ../brushlib/brushsettings.py:53
 msgid ""
-"Alter the radius randomly each dab. You can also do this with the by_random input on the radius setting. If you do it here, there are two differences:\n"
-"1) the opaque value will be corrected such that a big-radius dabs is more transparent\n"
+"Alter the radius randomly each dab. You can also do this with the by_random "
+"input on the radius setting. If you do it here, there are two differences:\n"
+"1) the opaque value will be corrected such that a big-radius dabs is more "
+"transparent\n"
 "2) it will not change the actual radius seen by dabs_per_actual_radius"
 msgstr ""
-"每個筆觸隨機改變半徑。您也可以用半徑設定值上的「隨機」 輸入來做出這種效果。如果您在這裡執行會有兩點不同的地方：\n"
+"每個筆觸隨機改變半徑。您也可以用半徑設定值上的「隨機」 輸入來做出這種效果。如"
+"果您在這裡執行會有兩點不同的地方：\n"
 "1) 不透明度會進行修正使得大半徑的筆觸更透明。\n"
 "2) 看起來不會受「每實際半徑的筆觸數量」影響而改變實際半徑"
 
-#: ../brushlib/brushsettings.py:47
-msgid "fine speed filter"
+#: ../brushlib/brushsettings.py:54
+msgid "Fine speed filter"
 msgstr "精細速度濾鏡"
 
-#: ../brushlib/brushsettings.py:47
+#: ../brushlib/brushsettings.py:54
 msgid ""
-"how slow the input fine speed is following the real speed\n"
+"How slow the input fine speed is following the real speed\n"
 "0.0 change immediately as your speed changes (not recommended, but try it)"
 msgstr ""
 "輸入精細速度多慢跟上真實速度\n"
 "0.0 您的速度改變時會立即跟著改變 (不推薦，但可以試試)"
 
-#: ../brushlib/brushsettings.py:48
-msgid "gross speed filter"
+#: ../brushlib/brushsettings.py:55
+msgid "Gross speed filter"
 msgstr "總速度濾鏡"
 
-#: ../brushlib/brushsettings.py:48
-msgid "same as 'fine speed filter', but note that the range is different"
+#: ../brushlib/brushsettings.py:55
+msgid "Same as 'fine speed filter', but note that the range is different"
 msgstr "和「精細速度濾鏡」相同，但注意兩者的範圍是不一樣的"
 
-#: ../brushlib/brushsettings.py:49
-msgid "fine speed gamma"
+#: ../brushlib/brushsettings.py:56
+msgid "Fine speed gamma"
 msgstr "精細速度伽瑪值"
 
-#: ../brushlib/brushsettings.py:49
+#: ../brushlib/brushsettings.py:56
 msgid ""
-"This changes the reaction of the 'fine speed' input to extreme physical speed. You will see the difference best if 'fine speed' is mapped to the radius.\n"
+"This changes the reaction of the 'fine speed' input to extreme physical "
+"speed. You will see the difference best if 'fine speed' is mapped to the "
+"radius.\n"
 "-8.0 very fast speed does not increase 'fine speed' much more\n"
 "+8.0 very fast speed increases 'fine speed' a lot\n"
 "For very slow speed the opposite happens."
 msgstr ""
-"這會將「精細速度」的反應變為物理速度的極限。如果「精細速度」對應到半徑，您會看到最佳的差別。\n"
+"這會將「精細速度」的反應變為物理速度的極限。如果「精細速度」對應到半徑，您會"
+"看到最佳的差別。\n"
 "-8.0  非常快的速度不會增加更多「精細速度」\n"
 "+8.0 非常快的速度會大大增加「精細速度」\n"
 "若速度非常慢則為相反情況。"
 
-#: ../brushlib/brushsettings.py:50
-msgid "gross speed gamma"
+#: ../brushlib/brushsettings.py:57
+msgid "Gross speed gamma"
 msgstr "總速度伽瑪值"
 
-#: ../brushlib/brushsettings.py:50
-msgid "same as 'fine speed gamma' for gross speed"
+#: ../brushlib/brushsettings.py:57
+msgid "Same as 'fine speed gamma' for gross speed"
 msgstr "同於總速度的「精細速度伽瑪值」"
 
-#: ../brushlib/brushsettings.py:51
-msgid "jitter"
+#: ../brushlib/brushsettings.py:58
+msgid "Jitter"
 msgstr "抖動"
 
-#: ../brushlib/brushsettings.py:51
+#: ../brushlib/brushsettings.py:58
 msgid ""
-"add a random offset to the position where each dab is drawn\n"
+"Add a random offset to the position where each dab is drawn\n"
 " 0.0 disabled\n"
 " 1.0 standard deviation is one basic radius away\n"
 "<0.0 negative values produce no jitter"
@@ -232,13 +312,13 @@ msgstr ""
 " 1.0 標準差是一個基本半徑的距離\n"
 "<0.0 數值為負則不會產生抖動"
 
-#: ../brushlib/brushsettings.py:52
-msgid "offset by speed"
+#: ../brushlib/brushsettings.py:59
+msgid "Offset by speed"
 msgstr "速度偏移"
 
-#: ../brushlib/brushsettings.py:52
+#: ../brushlib/brushsettings.py:59
 msgid ""
-"change position depending on pointer speed\n"
+"Change position depending on pointer speed\n"
 "= 0 disable\n"
 "> 0 draw where the pointer moves to\n"
 "< 0 draw where the pointer comes from"
@@ -248,59 +328,84 @@ msgstr ""
 "> 0 繪製游標移到的地方\n"
 "< 0 繪製游標過來的地方"
 
-#: ../brushlib/brushsettings.py:53
-msgid "offset by speed filter"
+#: ../brushlib/brushsettings.py:60
+msgid "Offset by speed filter"
 msgstr "速度偏移濾鏡"
 
-#: ../brushlib/brushsettings.py:53
-msgid "how slow the offset goes back to zero when the cursor stops moving"
+#: ../brushlib/brushsettings.py:60
+msgid "How slow the offset goes back to zero when the cursor stops moving"
 msgstr "當游標停止移動時偏移回到零有多慢"
 
-#: ../brushlib/brushsettings.py:54
-msgid "slow position tracking"
+#: ../brushlib/brushsettings.py:61
+msgid "Slow position tracking"
 msgstr "減慢位置描繪"
 
-#: ../brushlib/brushsettings.py:54
-msgid "Slowdown pointer tracking speed. 0 disables it, higher values remove more jitter in cursor movements. Useful for drawing smooth, comic-like outlines."
-msgstr "減慢游標描繪速度。0 為停用，較高的數值會移除游標移動中較多的抖動。對於繪製平滑、類似漫畫輪廓時很有用。"
+#: ../brushlib/brushsettings.py:61
+msgid ""
+"Slowdown pointer tracking speed. 0 disables it, higher values remove more "
+"jitter in cursor movements. Useful for drawing smooth, comic-like outlines."
+msgstr ""
+"減慢游標描繪速度。0 為停用，較高的數值會移除游標移動中較多的抖動。對於繪製平"
+"滑、類似漫畫輪廓時很有用。"
 
-#: ../brushlib/brushsettings.py:55
-msgid "slow tracking per dab"
+#: ../brushlib/brushsettings.py:62
+msgid "Slow tracking per dab"
 msgstr "每個筆觸緩慢描繪"
 
-#: ../brushlib/brushsettings.py:55
-msgid "Similar as above but at brushdab level (ignoring how much time has past, if brushdabs do not depend on time)"
-msgstr "和上面類似，但屬於筆刷筆觸層級 (如果筆刷筆觸不由時間決定，則忽略已經過了多少時間)"
+#: ../brushlib/brushsettings.py:62
+msgid ""
+"Similar as above but at brushdab level (ignoring how much time has past, if "
+"brushdabs do not depend on time)"
+msgstr ""
+"和上面類似，但屬於筆刷筆觸層級 (如果筆刷筆觸不由時間決定，則忽略已經過了多少"
+"時間)"
 
-#: ../brushlib/brushsettings.py:56
-msgid "tracking noise"
+#: ../brushlib/brushsettings.py:63
+msgid "Tracking noise"
 msgstr "軌跡雜點"
 
-#: ../brushlib/brushsettings.py:56
-msgid "add randomness to the mouse pointer; this usually generates many small lines in random directions; maybe try this together with 'slow tracking'"
-msgstr "加入隨機性雜點到滑鼠游標；這通常會產生許多隨機方向的小線條；也許試試和「緩慢描繪」一起使用"
+#: ../brushlib/brushsettings.py:63
+msgid ""
+"Add randomness to the mouse pointer; this usually generates many small lines "
+"in random directions; maybe try this together with 'slow tracking'"
+msgstr ""
+"加入隨機性雜點到滑鼠游標；這通常會產生許多隨機方向的小線條；也許試試和「緩慢"
+"描繪」一起使用"
 
-#: ../brushlib/brushsettings.py:58
-msgid "color hue"
+#: ../brushlib/brushsettings.py:65
+msgid "Color hue"
 msgstr "色相"
 
-#: ../brushlib/brushsettings.py:59
-msgid "color saturation"
+#: ../brushlib/brushsettings.py:66
+msgid "Color saturation"
 msgstr "飽和度"
 
-#: ../brushlib/brushsettings.py:60
-msgid "color value"
+#: ../brushlib/brushsettings.py:67
+msgid "Color value"
 msgstr "明度"
 
-#: ../brushlib/brushsettings.py:60
-msgid "color value (brightness, intensity)"
+#: ../brushlib/brushsettings.py:67
+msgid "Color value (brightness, intensity)"
 msgstr "明度 (亮度，光強度)"
 
-#: ../brushlib/brushsettings.py:61
-msgid "change color hue"
+#: ../brushlib/brushsettings.py:68
+msgid "Save color"
+msgstr "儲存顏色"
+
+#: ../brushlib/brushsettings.py:68
+msgid ""
+"When selecting a brush, the color can be restored to the color that the "
+"brush was saved with.\n"
+" 0.0 do not modify the active color when selecting this brush\n"
+" 0.5 change active color towards brush color\n"
+" 1.0 set the active color to the brush color when selected"
+msgstr ""
+
+#: ../brushlib/brushsettings.py:69
+msgid "Change color hue"
 msgstr "改變色相"
 
-#: ../brushlib/brushsettings.py:61
+#: ../brushlib/brushsettings.py:69
 msgid ""
 "Change color hue.\n"
 "-0.1 small clockwise color hue shift\n"
@@ -312,11 +417,11 @@ msgstr ""
 " 0.0 停用\n"
 " 0.5 以 180 度逆時針位移色相"
 
-#: ../brushlib/brushsettings.py:62
-msgid "change color lightness (HSL)"
+#: ../brushlib/brushsettings.py:70
+msgid "Change color lightness (HSL)"
 msgstr "改變亮度 (HSL)"
 
-#: ../brushlib/brushsettings.py:62
+#: ../brushlib/brushsettings.py:70
 msgid ""
 "Change the color lightness (luminance) using the HSL color model.\n"
 "-1.0 blacker\n"
@@ -328,11 +433,11 @@ msgstr ""
 " 0.0 停用\n"
 " 1.0 較白"
 
-#: ../brushlib/brushsettings.py:63
-msgid "change color satur. (HSL)"
+#: ../brushlib/brushsettings.py:71
+msgid "Change color satur. (HSL)"
 msgstr "改變飽和度 (HSL)"
 
-#: ../brushlib/brushsettings.py:63
+#: ../brushlib/brushsettings.py:71
 msgid ""
 "Change the color saturation using the HSL color model.\n"
 "-1.0 more grayish\n"
@@ -344,13 +449,14 @@ msgstr ""
 " 0.0 停用\n"
 " 1.0 更飽和"
 
-#: ../brushlib/brushsettings.py:64
-msgid "change color value (HSV)"
+#: ../brushlib/brushsettings.py:72
+msgid "Change color value (HSV)"
 msgstr "改變明度 (HSV)"
 
-#: ../brushlib/brushsettings.py:64
+#: ../brushlib/brushsettings.py:72
 msgid ""
-"Change the color value (brightness, intensity) using the HSV color model. HSV changes are applied before HSL.\n"
+"Change the color value (brightness, intensity) using the HSV color model. "
+"HSV changes are applied before HSL.\n"
 "-1.0 darker\n"
 " 0.0 disable\n"
 " 1.0 brigher"
@@ -360,13 +466,14 @@ msgstr ""
 " 0.0 停用\n"
 " 1.0 更亮"
 
-#: ../brushlib/brushsettings.py:65
-msgid "change color satur. (HSV)"
+#: ../brushlib/brushsettings.py:73
+msgid "Change color satur. (HSV)"
 msgstr "改變飽和度 (HSV)"
 
-#: ../brushlib/brushsettings.py:65
+#: ../brushlib/brushsettings.py:73
 msgid ""
-"Change the color saturation using the HSV color model. HSV changes are applied before HSL.\n"
+"Change the color saturation using the HSV color model. HSV changes are "
+"applied before HSL.\n"
 "-1.0 more grayish\n"
 " 0.0 disable\n"
 " 1.0 more saturated"
@@ -376,13 +483,14 @@ msgstr ""
 " 0.0 停用\n"
 " 1.0 更飽和"
 
-#: ../brushlib/brushsettings.py:66
-msgid "smudge"
+#: ../brushlib/brushsettings.py:74 ../gui/brushsettingswindow.py:104
+msgid "Smudge"
 msgstr "塗抹"
 
-#: ../brushlib/brushsettings.py:66
+#: ../brushlib/brushsettings.py:74
 msgid ""
-"Paint with the smudge color instead of the brush color. The smudge color is slowly changed to the color you are painting on.\n"
+"Paint with the smudge color instead of the brush color. The smudge color is "
+"slowly changed to the color you are painting on.\n"
 " 0.0 do not use the smudge color\n"
 " 0.5 mix the smudge color with the brush color\n"
 " 1.0 use only the smudge color"
@@ -392,25 +500,42 @@ msgstr ""
 " 0.5 塗抹顏色混合筆刷顏色\n"
 " 1.0 只使用塗抹顏色"
 
-#: ../brushlib/brushsettings.py:67
-msgid "smudge length"
+#: ../brushlib/brushsettings.py:75
+msgid "Smudge length"
 msgstr "塗抹長度"
 
-#: ../brushlib/brushsettings.py:67
+#: ../brushlib/brushsettings.py:75
 msgid ""
-"This controls how fast the smudge color becomes the color you are painting on.\n"
-"0.0 immediately change the smudge color\n"
+"This controls how fast the smudge color becomes the color you are painting "
+"on.\n"
+"0.0 immediately update the smudge color (requires more CPU cycles because of "
+"the frequent color checks)\n"
+"0.5 change the smudge color steadily towards the canvas color\n"
 "1.0 never change the smudge color"
 msgstr ""
 "這項控制塗抹顏色變成您正在繪畫的顏色的速度。\n"
 "0.0 立即改變塗抹顏色\n"
 "1.0 永不改變塗抹顏色"
 
-#: ../brushlib/brushsettings.py:68
-msgid "eraser"
+#: ../brushlib/brushsettings.py:76
+msgid "Smudge radius"
+msgstr "半徑"
+
+#: ../brushlib/brushsettings.py:76
+msgid ""
+"This modifies the radius of the circle where color is picked up for "
+"smudging.\n"
+" 0.0 use the brush radius\n"
+"-0.7 half the brush radius (fast, but not always intuitive)\n"
+"+0.7 twice the brush radius\n"
+"+1.6 five times the brush radius (slow performance)"
+msgstr ""
+
+#: ../brushlib/brushsettings.py:77 ../gui/stock.py:52
+msgid "Eraser"
 msgstr "橡皮擦"
 
-#: ../brushlib/brushsettings.py:68
+#: ../brushlib/brushsettings.py:77
 msgid ""
 "how much this tool behaves like an eraser\n"
 " 0.0 normal painting\n"
@@ -422,75 +547,99 @@ msgstr ""
 " 1.0 標準橡皮擦\n"
 " 0.5 像素變為 50 % 透明"
 
-#: ../brushlib/brushsettings.py:70
-msgid "stroke threshold"
+#: ../brushlib/brushsettings.py:79
+msgid "Stroke threshold"
 msgstr "筆畫臨界值"
 
-#: ../brushlib/brushsettings.py:70
-msgid "How much pressure is needed to start a stroke. This affects the stroke input only. Mypaint does not need a minimal pressure to start drawing."
-msgstr "需要多少壓力才會開始筆畫。這會只影響筆畫的輸入。Mypaint 不需要開始繪畫的最小壓力值。"
+#: ../brushlib/brushsettings.py:79
+msgid ""
+"How much pressure is needed to start a stroke. This affects the stroke input "
+"only. Mypaint does not need a minimal pressure to start drawing."
+msgstr ""
+"需要多少壓力才會開始筆畫。這會只影響筆畫的輸入。Mypaint 不需要開始繪畫的最小"
+"壓力值。"
 
-#: ../brushlib/brushsettings.py:71
-msgid "stroke duration"
+#: ../brushlib/brushsettings.py:80
+msgid "Stroke duration"
 msgstr "筆畫持續時間"
 
-#: ../brushlib/brushsettings.py:71
-msgid "How far you have to move until the stroke input reaches 1.0. This value is logarithmic (negative values will not inverse the process)."
-msgstr "您必須移動多遠直到筆畫輸入達到 1.0。這項數值為對數 (數值為負不會反向處理)。"
+#: ../brushlib/brushsettings.py:80
+msgid ""
+"How far you have to move until the stroke input reaches 1.0. This value is "
+"logarithmic (negative values will not inverse the process)."
+msgstr ""
+"您必須移動多遠直到筆畫輸入達到 1.0。這項數值為對數 (數值為負不會反向處理)。"
 
-#: ../brushlib/brushsettings.py:72
-msgid "stroke hold time"
+#: ../brushlib/brushsettings.py:81
+msgid "Stroke hold time"
 msgstr "筆畫維持時間"
 
-#: ../brushlib/brushsettings.py:72
+#: ../brushlib/brushsettings.py:81
 msgid ""
-"This defines how long the stroke input stays at 1.0. After that it will reset to 0.0 and start growing again, even if the stroke is not yet finished.\n"
+"This defines how long the stroke input stays at 1.0. After that it will "
+"reset to 0.0 and start growing again, even if the stroke is not yet "
+"finished.\n"
 "2.0 means twice as long as it takes to go from 0.0 to 1.0\n"
 "9.9 and bigger stands for infinite"
 msgstr ""
-"這項數值可定義筆畫輸入會停留在 1.0 多長的時間。從那以後會重設為 0.0 並再一次開始增長，即使這道筆畫還未結束。\n"
+"這項數值可定義筆畫輸入會停留在 1.0 多長的時間。從那以後會重設為 0.0 並再一次"
+"開始增長，即使這道筆畫還未結束。\n"
 "2.0 代表從 0.0 開始到 1.0 期間的兩倍\n"
 "9.9 和更大的數值代表無窮大"
 
-#: ../brushlib/brushsettings.py:73
-msgid "custom input"
+#: ../brushlib/brushsettings.py:82
+msgid "Custom input"
 msgstr "自訂輸入"
 
-#: ../brushlib/brushsettings.py:73
+#: ../brushlib/brushsettings.py:82
 msgid ""
-"Set the custom input to this value. If it is slowed down, move it towards this value (see below). The idea is that you make this input depend on a mixture of pressure/speed/whatever, and then make other settings depend on this 'custom input' instead of repeating this combination everywhere you need it.\n"
-"If you make it change 'by random' you can generate a slow (smooth) random input."
+"Set the custom input to this value. If it is slowed down, move it towards "
+"this value (see below). The idea is that you make this input depend on a "
+"mixture of pressure/speed/whatever, and then make other settings depend on "
+"this 'custom input' instead of repeating this combination everywhere you "
+"need it.\n"
+"If you make it change 'by random' you can generate a slow (smooth) random "
+"input."
 msgstr ""
-"將自訂輸入設為這個數值。如果減速，將它往這個數值移動 (如下面所示)。意思是您讓壓力/速度/其他等的混合因素來決定這個輸入，然後由這個「自訂輸入」決定其他設定值而不是您需要它時重複這種組合。\n"
+"將自訂輸入設為這個數值。如果減速，將它往這個數值移動 (如下面所示)。意思是您讓"
+"壓力/速度/其他等的混合因素來決定這個輸入，然後由這個「自訂輸入」決定其他設定"
+"值而不是您需要它時重複這種組合。\n"
 "如果您讓它「隨機」改變，就可以產生一種緩慢 (平滑) 隨機輸入。"
 
-#: ../brushlib/brushsettings.py:74
-msgid "custom input filter"
+#: ../brushlib/brushsettings.py:83
+msgid "Custom input filter"
 msgstr "自訂輸入濾鏡"
 
-#: ../brushlib/brushsettings.py:74
+#: ../brushlib/brushsettings.py:83
 msgid ""
-"How slow the custom input actually follows the desired value (the one above). This happens at brushdab level (ignoring how much time has past, if brushdabs do not depend on time).\n"
+"How slow the custom input actually follows the desired value (the one "
+"above). This happens at brushdab level (ignoring how much time has past, if "
+"brushdabs do not depend on time).\n"
 "0.0 no slowdown (changes apply instantly)"
 msgstr ""
-"自訂輸入實際上多慢達到期望值 (上面一項)。這發生在筆刷筆觸層級 (如果筆刷筆觸不由時間決定，則忽略已經過了多少時間)。\n"
+"自訂輸入實際上多慢達到期望值 (上面一項)。這發生在筆刷筆觸層級 (如果筆刷筆觸不"
+"由時間決定，則忽略已經過了多少時間)。\n"
 "0.0 不減速 (立即套用變更)"
 
-#: ../brushlib/brushsettings.py:76
-msgid "elliptical dab: ratio"
+#: ../brushlib/brushsettings.py:85
+msgid "Elliptical dab: ratio"
 msgstr "橢圓筆觸：比例"
 
-#: ../brushlib/brushsettings.py:76
-msgid "aspect ratio of the dabs; must be >= 1.0, where 1.0 means a perfectly round dab. TODO: linearize? start at 0.0 maybe, or log?"
-msgstr "筆觸的外觀比例；必須是 >= 1.0，這裡 1.0 代表一個完美圓形的筆觸。提醒：線性化？可能從 0.0 開始，或者對數？"
+#: ../brushlib/brushsettings.py:85
+msgid ""
+"Aspect ratio of the dabs; must be >= 1.0, where 1.0 means a perfectly round "
+"dab. TODO: linearize? start at 0.0 maybe, or log?"
+msgstr ""
+"筆觸的外觀比例；必須是 >= 1.0，這裡 1.0 代表一個完美圓形的筆觸。提醒：線性"
+"化？可能從 0.0 開始，或者對數？"
 
-#: ../brushlib/brushsettings.py:77
-msgid "elliptical dab: angle"
+#: ../brushlib/brushsettings.py:86
+msgid "Elliptical dab: angle"
 msgstr "橢圓筆觸：角度"
 
-#: ../brushlib/brushsettings.py:77
+#: ../brushlib/brushsettings.py:86
 msgid ""
-"this defines the angle by which eliptical dabs are tilted\n"
+"Angle by which elliptical dabs are tilted\n"
 " 0.0 horizontal dabs\n"
 " 45.0 45 degrees, turned clockwise\n"
 " 180.0 horizontal again"
@@ -500,19 +649,34 @@ msgstr ""
 " 45.0 45 度，順時針轉動\n"
 " 180.0 再次水平"
 
-#: ../brushlib/brushsettings.py:78
-msgid "direction filter"
+#: ../brushlib/brushsettings.py:87
+msgid "Direction filter"
 msgstr "方向濾鏡"
 
-#: ../brushlib/brushsettings.py:78
-msgid "a low value will make the direction input adapt more quickly, a high value will make it smoother"
+#: ../brushlib/brushsettings.py:87
+msgid ""
+"A low value will make the direction input adapt more quickly, a high value "
+"will make it smoother"
 msgstr "數值較低會使輸入方向調整更迅速，數值較高則會更平滑"
 
-#: ../gui/backgroundwindow.py:22
-msgid "save as default"
+#: ../brushlib/brushsettings.py:89
+msgid "Lock alpha"
+msgstr "鎖定 alpha"
+
+#: ../brushlib/brushsettings.py:89
+msgid ""
+"Do not modify the alpha channel of the layer (paint only where there is "
+"paint already)\n"
+" 0.0 normal painting\n"
+" 0.5 half of the paint gets applied normally\n"
+" 1.0 alpha channel fully locked"
+msgstr ""
+
+#: ../gui/backgroundwindow.py:23
+msgid "Save as Default"
 msgstr "儲存為預設值"
 
-#: ../gui/backgroundwindow.py:24
+#: ../gui/backgroundwindow.py:25 ../gui/drawwindow.py:287
 msgid "Background"
 msgstr "背景"
 
@@ -520,795 +684,1720 @@ msgstr "背景"
 msgid "Pattern"
 msgstr "圖案"
 
-#: ../gui/backgroundwindow.py:45
-#: ../gui/colorselectionwindow.py:25
-#: ../gui/drawwindow.py:118
+#: ../gui/backgroundwindow.py:45 ../gui/brushsettingswindow.py:108
+#: ../gui/drawwindow.py:220
 msgid "Color"
 msgstr "顏色"
 
 #: ../gui/backgroundwindow.py:51
-msgid "add color to patterns"
+msgid "Add color to Patterns"
 msgstr "加入顏色到圖案"
 
 #: ../gui/backgroundwindow.py:123
 #, python-format
-msgid "The background %s was ignored because it has an alpha channel. Please remove it."
+msgid ""
+"The background %s was ignored because it has an alpha channel. Please remove "
+"it."
 msgstr "因為含有 alpha 色版，所以忽略背景 %s。請移除它。"
 
 #: ../gui/backgroundwindow.py:127
 #, python-format
-msgid "The background %s was ignored because it has the wrong size. Only (N*%d)x(M*%d) is supported."
+msgid ""
+"The background %s was ignored because it is the wrong size. Only (N*%d)x(M*"
+"%d) is supported."
 msgstr "因為含有錯誤尺寸，所以忽略背景 %s。只支援 (N*%d)x(M*%d)。"
 
-#: ../gui/brushcreationwidget.py:34
-#: ../gui/drawwindow.py:135
-msgid "Clear"
-msgstr "清除"
-
-#: ../gui/brushcreationwidget.py:43
-#: ../gui/brushcreationwidget.py:188
-msgid "(no name)"
-msgstr "(未命名)"
-
-#: ../gui/brushcreationwidget.py:47
-msgid "add as new"
-msgstr "加入新筆刷"
-
-#: ../gui/brushcreationwidget.py:48
-msgid "rename..."
-msgstr "重新命名..."
-
-#: ../gui/brushcreationwidget.py:49
-msgid "remove..."
-msgstr "移除..."
+#: ../gui/brushcreationwidget.py:46 ../gui/brushcreationwidget.py:66
+msgid "(unnamed brush)"
+msgstr "(未命名的筆刷)"
 
 #: ../gui/brushcreationwidget.py:50
-msgid "settings..."
-msgstr "設定值..."
+msgid "Save Settings"
+msgstr "儲存設定值"
 
 #: ../gui/brushcreationwidget.py:51
-msgid "save settings"
-msgstr "儲存設定值"
+msgid "Add As New"
+msgstr "新增為新筆刷"
 
 #: ../gui/brushcreationwidget.py:52
-msgid "save preview"
-msgstr "儲存預覽"
+msgid "Edit Brush Icon"
+msgstr "編輯筆刷圖示"
+
+#: ../gui/brushcreationwidget.py:53
+msgid "Rename..."
+msgstr "重新命名..."
 
-#: ../gui/brushcreationwidget.py:100
-#: ../gui/brushcreationwidget.py:161
+#: ../gui/brushcreationwidget.py:54
+msgid "Remove..."
+msgstr "移除..."
+
+#: ../gui/brushcreationwidget.py:101 ../gui/brushcreationwidget.py:150
 msgid "No brush selected!"
 msgstr "沒有選擇筆刷！"
 
-#: ../gui/brushcreationwidget.py:103
+#: ../gui/brushcreationwidget.py:104
 msgid "Rename Brush"
 msgstr "重新命名筆刷"
 
-#: ../gui/brushcreationwidget.py:115
+#: ../gui/brushcreationwidget.py:116
 msgid "A brush with this name already exists!"
 msgstr "已經存在相同名稱的筆刷！"
 
-#: ../gui/brushcreationwidget.py:142
-#: ../gui/brushcreationwidget.py:153
-msgid "No brush selected, please use \"add as new\" instead."
+#: ../gui/brushcreationwidget.py:142 ../gui/brushcreationwidget.py:242
+msgid "No brush selected, please use \"Add As New\" instead."
 msgstr "沒有選擇筆刷，請改用「加入新筆刷」。"
 
-#: ../gui/brushcreationwidget.py:163
+#: ../gui/brushcreationwidget.py:152
 msgid "Really delete brush from disk?"
 msgstr "確定要從磁碟中刪除筆刷？"
 
-#: ../gui/brushmanager.py:26
-msgid "default"
-msgstr "預設"
+#: ../gui/brushcreationwidget.py:203 ../gui/drawwindow.py:218
+msgid "Edit"
+msgstr "編輯"
+
+#: ../gui/brushcreationwidget.py:207 ../gui/document.py:97
+msgid "Clear"
+msgstr "清除"
+
+#: ../gui/brushcreationwidget.py:213 ../gui/filehandling.py:63
+msgid "Save"
+msgstr "儲存"
+
+#: ../gui/brushmanager.py:71
+msgid "Lost & Found"
+msgstr ""
 
-#: ../gui/brushmanager.py:27
-msgid "deleted"
+#: ../gui/brushmanager.py:72
+msgid "Deleted"
 msgstr "刪除的"
 
-#: ../gui/brushmanager.py:28
-msgid "favorites"
+#: ../gui/brushmanager.py:73
+msgid "Favorites"
 msgstr "收藏"
 
-#: ../gui/brushmanager.py:29
-msgid "ink"
+#: ../gui/brushmanager.py:74
+msgid "Ink"
 msgstr "墨水"
 
-#: ../gui/brushmanager.py:30
-msgid "classic"
+#: ../gui/brushmanager.py:75
+msgid "Classic"
 msgstr "經典"
 
-#: ../gui/brushmanager.py:31
-msgid "experimental"
+#: ../gui/brushmanager.py:76
+msgid "Set#1"
+msgstr "組合 #1"
+
+#: ../gui/brushmanager.py:77
+msgid "Set#2"
+msgstr "組合 #2"
+
+#: ../gui/brushmanager.py:78
+msgid "Set#3"
+msgstr "組合 #3"
+
+#: ../gui/brushmanager.py:79
+msgid "Set#4"
+msgstr "組合 #4"
+
+#: ../gui/brushmanager.py:80
+msgid "Set#5"
+msgstr "組合 #5"
+
+#: ../gui/brushmanager.py:81
+msgid "Experimental"
 msgstr "實驗性"
 
-#: ../gui/brushselectionwindow.py:21
-msgid "Brush selection"
-msgstr "筆刷選擇"
+#: ../gui/brushmanager.py:714
+msgid "Unknown Brush"
+msgstr "未知的筆刷"
 
-#: ../gui/brushselectionwindow.py:35
-#: ../gui/drawwindow.py:106
-msgid "Edit"
-msgstr "編輯"
+#: ../gui/brushmodifier.py:56
+msgid "Paint normally"
+msgstr "正常塗色"
+
+#: ../gui/brushmodifier.py:59
+msgid "Eraser Mode: remove strokes using the current brush"
+msgstr "橡皮擦模式: 以目前筆刷消除筆劃"
 
-#: ../gui/brushselectionwindow.py:165
-msgid "Right click on group to modify"
-msgstr "用右鍵點擊群組進行修改"
+#: ../gui/brushmodifier.py:62
+msgid "Lock Alpha: paint over existing strokes only, using the current brush"
+msgstr "鎖定 Alpha 值: 僅利用目前筆刷蓋過已存在的筆劃"
 
-#: ../gui/brushselectionwindow.py:293
+#: ../gui/brushselectionwindow.py:233
+msgid "Try right click, middle click or Ctrl click"
+msgstr "試著按滑鼠右鍵、中鍵或 ctrl + 左鍵"
+
+#: ../gui/brushselectionwindow.py:401
 msgid "New group..."
 msgstr "新增群組..."
 
-#: ../gui/brushselectionwindow.py:295
+#: ../gui/brushselectionwindow.py:403
 msgid "Rename group..."
 msgstr "重新命名群組..."
 
-#: ../gui/brushselectionwindow.py:296
+#: ../gui/brushselectionwindow.py:404
 msgid "Delete group..."
 msgstr "刪除群組..."
 
-#: ../gui/brushselectionwindow.py:310
+#: ../gui/brushselectionwindow.py:405
+msgid "Export group as brush package..."
+msgstr "匯出筆刷群組並另存成套件..."
+
+#: ../gui/brushselectionwindow.py:407
+msgid "Download brushes (in web browser)"
+msgstr "下載筆刷 (開啟瀏覽器)"
+
+#: ../gui/brushselectionwindow.py:408 ../gui/drawwindow.py:250
+#: ../gui/drawwindow.py:923
+msgid "Import brush package..."
+msgstr "匯入筆刷套件..."
+
+#: ../gui/brushselectionwindow.py:422
 msgid "Create group"
 msgstr "建立群組"
 
-#: ../gui/brushselectionwindow.py:315
+#: ../gui/brushselectionwindow.py:427
 msgid "Rename group"
 msgstr "重新命名群組"
 
-#: ../gui/brushselectionwindow.py:321
+#: ../gui/brushselectionwindow.py:433
 msgid "A group with this name already exists!"
 msgstr "已經存在相同名稱的群組！"
 
-#: ../gui/brushselectionwindow.py:324
+#: ../gui/brushselectionwindow.py:436
+msgid "Export brush pack..."
+msgstr "匯出筆刷套件..."
+
+#: ../gui/brushselectionwindow.py:437 ../gui/drawwindow.py:924
+msgid "MyPaint brush package (*.zip)"
+msgstr "MyPaint 筆刷套件 (*.zip)"
+
+#: ../gui/brushselectionwindow.py:443
 #, python-format
 msgid "Really delete group %s?"
 msgstr "確定要刪除群組 %s？"
 
-#: ../gui/brushselectionwindow.py:327
-msgid "This group can not be deleted (try to make it empty first)."
+#: ../gui/brushselectionwindow.py:446
+msgid "This group can not be deleted (try to empty it first)."
 msgstr "這個群組無法刪除 (先試著清空這個群組)。"
 
-#: ../gui/brushsettingswindow.py:22
-msgid "Brush settings"
-msgstr "筆刷設定值"
+#: ../gui/brushsettingswindow.py:32 ../gui/drawwindow.py:293
+msgid "Brush Settings Editor"
+msgstr "筆刷設定編輯器"
 
-#: ../gui/brushsettingswindow.py:28
-msgid "live update the last canvas stroke"
-msgstr "å\8d³æ\99\82æ\9b´æ\96°æ\9c\80å¾\8cç\95«å¸\83ç­\86ç\95«"
+#: ../gui/brushsettingswindow.py:56
+msgid "Back to settings"
+msgstr "å\9b\9eå\88°è¨­å®\9aé \81é\9d¢"
 
+#. Live update (goes to the end)
 #: ../gui/brushsettingswindow.py:64
+msgid "Update the last canvas stroke in realtime"
+msgstr "即時更新最後畫布筆畫"
+
+#: ../gui/brushsettingswindow.py:101
+msgid "Basic"
+msgstr "基本"
+
+#: ../gui/brushsettingswindow.py:103
+msgid "Dabs"
+msgstr "筆觸"
+
+#: ../gui/brushsettingswindow.py:105
+msgid "Speed"
+msgstr "速度"
+
+#: ../gui/brushsettingswindow.py:106
+msgid "Tracking"
+msgstr "軌跡"
+
+#: ../gui/brushsettingswindow.py:138
+msgid "Reset to default value"
+msgstr "重設至預設值"
+
+#: ../gui/brushsettingswindow.py:143
 msgid "No additional configuration"
 msgstr "沒有附加的組態設定"
 
-#: ../gui/brushsettingswindow.py:69
-#: ../gui/brushsettingswindow.py:117
-msgid "Add input values mapping"
+#: ../gui/brushsettingswindow.py:148 ../gui/brushsettingswindow.py:191
+msgid "Add input value mapping"
 msgstr "加入輸入值對應"
 
-#: ../gui/brushsettingswindow.py:119
-msgid "Modify input values mapping"
+#: ../gui/brushsettingswindow.py:193
+msgid "Modify input value mapping"
 msgstr "修改輸入值對應"
 
-#: ../gui/colorsamplerwindow.py:816
+#: ../gui/colorsamplerwindow.py:166
+msgid "Recently used colors"
+msgstr "最近使用過的顏色"
+
+#. : Background neutral mid grey, intended to permit colour comparisons without theme colours distracting and imposing themselves
+#. : Slightly distinct outlinefor colour pots, intended to reduce "1+1=3 (or more)" effects
+#. : Central saturation/value square
+#. : Grey area inside the rings
+#. : Inner ring of color sampler boxes (hue)
+#. : Outer gradiated ring (hue)
+#. : Current/previous comparison semicircles
+#. : The picker icon's circle
+#. : Blank outer area, outer space
+#: ../gui/colorsamplerwindow.py:197
+msgid "Change Saturation and Value"
+msgstr "變更飽和度和明度"
+
+#: ../gui/colorsamplerwindow.py:199
+msgid "Harmony color switcher"
+msgstr ""
+
+#: ../gui/colorsamplerwindow.py:200
+msgid "Change Hue"
+msgstr "變更色相"
+
+#: ../gui/colorsamplerwindow.py:201
+msgid "Current color vs. Last Used"
+msgstr "目前顏色 vs. 上次使用的"
+
+#: ../gui/colorsamplerwindow.py:202
+msgid "Pick a screen color"
+msgstr "從畫面上選取顏色"
+
+#: ../gui/colorsamplerwindow.py:929
+msgid "Change Hue, Saturation and Value"
+msgstr "變更色相、飽和度和明度"
+
+#: ../gui/colorsamplerwindow.py:1000
+msgid "Change Red, Green and Blue components"
+msgstr "變更紅色、綠色和藍色成份"
+
+#: ../gui/colorsamplerwindow.py:1062
 msgid "RGB"
 msgstr "RGB"
 
-#: ../gui/colorsamplerwindow.py:817
+#: ../gui/colorsamplerwindow.py:1063
 msgid "HSV"
 msgstr "HSV"
 
-#: ../gui/colorsamplerwindow.py:819
-msgid "Colors history"
+#. Colour history
+#: ../gui/colorsamplerwindow.py:1066
+msgid "Color history"
 msgstr "顏色記錄"
 
-#: ../gui/colorsamplerwindow.py:823
-#: ../gui/functionwindow.py:145
+#. Colour details
+#: ../gui/colorsamplerwindow.py:1073 ../gui/functionwindow.py:154
 msgid "Details"
 msgstr "詳細資訊"
 
-#: ../gui/colorsamplerwindow.py:833
+#: ../gui/colorsamplerwindow.py:1089
 msgid "Harmonies"
 msgstr "協調色"
 
-#: ../gui/colorsamplerwindow.py:835
+#: ../gui/colorsamplerwindow.py:1091
 msgid "Analogous"
 msgstr "類似色"
 
-#: ../gui/colorsamplerwindow.py:836
-msgid "Complimentary color"
+#: ../gui/colorsamplerwindow.py:1091
+msgid ""
+"Three nearby hues on the color wheel.\n"
+"Often found in nature, frequently pleasing to the eye."
+msgstr ""
+
+#: ../gui/colorsamplerwindow.py:1092
+msgid "Complementary"
 msgstr "互補色"
 
-#: ../gui/colorsamplerwindow.py:837
-msgid "Split complimentary"
-msgstr "鄰接補色"
+#: ../gui/colorsamplerwindow.py:1092
+msgid ""
+"Two opposite hues on the color wheel.\n"
+"Vibrant, and maximally contrasting."
+msgstr ""
+
+#: ../gui/colorsamplerwindow.py:1093
+msgid "Split complementary"
+msgstr "分裂補色"
 
-#: ../gui/colorsamplerwindow.py:838
-msgid "Double complimentary"
+#: ../gui/colorsamplerwindow.py:1093
+msgid ""
+"Two hues next to the current hue's complement.\n"
+"Contrasting, but adds a possibly pleasing harmony."
+msgstr ""
+
+#: ../gui/colorsamplerwindow.py:1094
+msgid "Double complementary"
 msgstr "雙補色"
 
-#: ../gui/colorsamplerwindow.py:839
+#: ../gui/colorsamplerwindow.py:1094
+msgid "Four hues in two complementary pairs."
+msgstr ""
+
+#: ../gui/colorsamplerwindow.py:1095
 msgid "Square"
-msgstr "二元"
+msgstr "四等分"
+
+#: ../gui/colorsamplerwindow.py:1095
+msgid "Four equally-spaced hues"
+msgstr ""
 
-#: ../gui/colorsamplerwindow.py:840
+#: ../gui/colorsamplerwindow.py:1096
 msgid "Triadic"
-msgstr "三元"
+msgstr "三等分"
 
-#: ../gui/colorsamplerwindow.py:842
-msgid "Select harmonies"
-msgstr "選擇協調色"
+#: ../gui/colorsamplerwindow.py:1096
+msgid ""
+"Three equally-spaced hues.\n"
+"Vibrant with equal tension."
+msgstr ""
 
-#: ../gui/colorsamplerwindow.py:845
+#: ../gui/colorsamplerwindow.py:1099
 msgid "Change value/saturation"
 msgstr "改變明度/飽和度"
 
-#: ../gui/colorsamplerwindow.py:848
+#: ../gui/colorsamplerwindow.py:1102
 msgid "Blend each color to opposite"
 msgstr "混合每種顏色為相反"
 
-#: ../gui/colorsamplerwindow.py:850
+#: ../gui/colorsamplerwindow.py:1104
 msgid "Blend each color to negative"
 msgstr "混合每種顏色為負值"
 
-#: ../gui/colorsamplerwindow.py:914
+#: ../gui/colorsamplerwindow.py:1215
 msgid "MyPaint color selector"
 msgstr "MyPaint 選色器"
 
-#: ../gui/dialogs.py:37
-#: ../gui/layerswindow.py:223
+#: ../gui/dialogs.py:54 ../gui/layerswindow.py:62 ../gui/layerswindow.py:226
 msgid "Name"
 msgstr "名稱"
 
-#. name, stock id, label, accelerator, tooltip, callback
-#: ../gui/drawwindow.py:103
-msgid "File"
-msgstr "檔案"
+#: ../gui/dialogs.py:89
+msgid "Overwrite brush?"
+msgstr "取代筆刷？"
 
-#. FIXME: should do this periodically, not only on quit
-#: ../gui/drawwindow.py:104
-#: ../gui/drawwindow.py:637
-msgid "Quit"
-msgstr "離開"
+#: ../gui/dialogs.py:98 ../gui/dialogs.py:156
+msgid "Replace"
+msgstr "取代"
 
-#: ../gui/drawwindow.py:107
-msgid "Undo"
-msgstr "復原"
+#: ../gui/dialogs.py:101 ../gui/dialogs.py:159
+msgid "Rename"
+msgstr "重新命名"
 
-#: ../gui/drawwindow.py:108
-msgid "Redo"
-msgstr "取消復原"
+#: ../gui/dialogs.py:104
+msgid "Replace all"
+msgstr "取代全部"
 
-#: ../gui/drawwindow.py:110
-msgid "Brush"
-msgstr "筆刷"
+#: ../gui/dialogs.py:106
+msgid "Rename all"
+msgstr "全部重新命名"
+
+#: ../gui/dialogs.py:121
+msgid "Imported brush"
+msgstr "已匯入的筆刷"
+
+#: ../gui/dialogs.py:122
+msgid "Existing brush"
+msgstr "已存在的筆刷"
+
+#: ../gui/dialogs.py:124
+#, python-format
+msgid ""
+"<b>A brush named `%s' already exists.</b>\n"
+"Do you want to replace it, or should the new brush be renamed?"
+msgstr ""
+
+#: ../gui/dialogs.py:147
+msgid "Overwrite brush group?"
+msgstr "取代筆刷群組？"
+
+#: ../gui/dialogs.py:169
+#, python-format
+msgid ""
+"<b>A group named `%s' already exists.</b>\n"
+"Do you want to replace it, or should the new group be renamed?\n"
+"If you replace it, the brushes may be moved to a group called `%s'."
+msgstr ""
+
+#: ../gui/dialogs.py:257
+msgid "Import brush package?"
+msgstr "要匯入筆刷套件？"
+
+#: ../gui/dialogs.py:269
+#, python-format
+msgid "<b>Do you really want to import package `%s'?</b>"
+msgstr ""
+
+#: ../gui/dialogs.py:285
+msgid "Color details"
+msgstr "顏色詳細資訊"
 
-#: ../gui/drawwindow.py:111
+#. Quick brush changer
+#: ../gui/dialogs.py:382 ../gui/toolbar.py:300
+msgid "Change Brush"
+msgstr "變更筆刷"
+
+#: ../gui/document.py:81
 msgid "Brighter"
 msgstr "變亮"
 
-#: ../gui/drawwindow.py:112
+#: ../gui/document.py:82
 msgid "Smaller"
 msgstr "變小"
 
-#: ../gui/drawwindow.py:113
+#: ../gui/document.py:83
 msgid "More Opaque"
-msgstr "增加不透明"
+msgstr "增加不透明度"
 
-#: ../gui/drawwindow.py:114
+#: ../gui/document.py:84
 msgid "Less Opaque"
-msgstr "減少不透明"
-
-#: ../gui/drawwindow.py:115
-msgid "Toggle Eraser Mode"
-msgstr "切換橡皮擦模式"
+msgstr "減少不透明度"
 
-#. TODO: make toggle action
-#: ../gui/drawwindow.py:116
+#: ../gui/document.py:85 ../gui/preferenceswindow.py:37
 msgid "Pick Context (layer, brush and color)"
 msgstr "點取內容 (圖層、筆刷和顏色)"
 
-#: ../gui/drawwindow.py:119
+#: ../gui/document.py:87
 msgid "Darker"
 msgstr "變暗"
 
-#: ../gui/drawwindow.py:120
-msgid "Bigger"
-msgstr "變大"
+#: ../gui/document.py:88
+msgid "Change Color Hue (counter-clockwise)"
+msgstr "變更色相 (逆時針)"
 
-#: ../gui/drawwindow.py:121
-msgid "Pick Color"
-msgstr "點取顏色"
+#: ../gui/document.py:89
+msgid "Change Color Hue (clockwise)"
+msgstr "變更色相 (順時針)"
 
-#: ../gui/drawwindow.py:122
-msgid "Color History"
-msgstr "顏色記錄"
+#: ../gui/document.py:90
+msgid "Purer"
+msgstr "純化"
 
-#: ../gui/drawwindow.py:123
-msgid "Color Changer"
-msgstr "換色器"
+#: ../gui/document.py:91
+msgid "Grayer"
+msgstr "灰化"
 
-#: ../gui/drawwindow.py:124
-msgid "Color Ring"
-msgstr "色圈"
-
-#: ../gui/drawwindow.py:126
-msgid "Brushkeys"
-msgstr "筆刷按鍵"
+#: ../gui/document.py:92
+msgid "Bigger"
+msgstr "變大"
 
-#. each of the context actions are generated and added below
-#: ../gui/drawwindow.py:128
+#. Context actions are also added in init_context_actions
+#: ../gui/document.py:95
 msgid "Save to Most Recently Restored"
 msgstr "儲存到最近還原的檔案"
 
-#: ../gui/drawwindow.py:129
-msgid "Help!"
-msgstr "說明！"
-
-#: ../gui/drawwindow.py:131
-#: ../gui/layerswindow.py:337
-msgid "Layers"
-msgstr "圖層"
-
-#: ../gui/drawwindow.py:133
-msgid "Layers..."
-msgstr "圖層..."
-
-#: ../gui/drawwindow.py:134
-msgid "Background..."
-msgstr "背景..."
-
-#: ../gui/drawwindow.py:136
+#: ../gui/document.py:98
 msgid "Copy to Clipboard"
 msgstr "複製到剪貼簿"
 
-#: ../gui/drawwindow.py:137
+#: ../gui/document.py:99
 msgid "Paste Clipboard (Replace Layer)"
 msgstr "貼上剪貼簿 (取代圖層)"
 
-#: ../gui/drawwindow.py:138
+#: ../gui/document.py:100 ../gui/preferenceswindow.py:38
 msgid "Select Layer at Cursor"
 msgstr "選擇游標下的圖層"
 
-#: ../gui/drawwindow.py:139
+#: ../gui/document.py:101
 msgid "Next (above current)"
 msgstr "下一個 (目前之上)"
 
-#: ../gui/drawwindow.py:140
+#: ../gui/document.py:102
 msgid "Next (below current)"
 msgstr "下一個 (目前之下)"
 
-#: ../gui/drawwindow.py:141
+#: ../gui/document.py:103
 msgid "New (above current)"
 msgstr "新增 (目前之上)"
 
-#: ../gui/drawwindow.py:142
+#: ../gui/document.py:104
 msgid "New (below current)"
 msgstr "新增 (目前之下)"
 
-#: ../gui/drawwindow.py:143
+#. XXX need a batter one, but stay consistent with layerswindow for now
+#: ../gui/document.py:106 ../gui/layerswindow.py:115
 msgid "Merge Down"
 msgstr "向下合併"
 
-#: ../gui/drawwindow.py:144
+#: ../gui/document.py:107
 msgid "Remove"
 msgstr "移除"
 
-#: ../gui/drawwindow.py:145
+#: ../gui/document.py:108
 msgid "Increase Layer Opacity"
 msgstr "增加圖層不透明度"
 
-#: ../gui/drawwindow.py:146
+#: ../gui/document.py:109
 msgid "Decrease Layer Opacity"
 msgstr "減少圖層不透明度"
 
-#: ../gui/drawwindow.py:148
-msgid "Brush List..."
-msgstr "筆刷清單..."
+#: ../gui/document.py:111
+msgid "Shortcuts"
+msgstr "快捷鍵"
 
-#: ../gui/drawwindow.py:149
-msgid "Brush Settings..."
-msgstr "筆刷設定值..."
+#: ../gui/document.py:113
+msgid "Reset and Center"
+msgstr "重置並置中"
 
-#: ../gui/drawwindow.py:150
-msgid "Color Triangle..."
-msgstr "顏色三角..."
+#: ../gui/document.py:114
+msgid "Reset Zoom, Rotation and Mirroring, and recenter the document"
+msgstr "重置縮放、旋轉與鏡射，並且重新置中"
+
+#: ../gui/document.py:116
+msgid "Reset"
+msgstr "重置"
+
+#: ../gui/document.py:117 ../gui/preferenceswindow.py:40
+msgid "Zoom"
+msgstr "縮放"
+
+#: ../gui/document.py:118
+msgid "Rotation"
+msgstr "旋轉"
 
-#: ../gui/drawwindow.py:151
-msgid "Color Sampler..."
-msgstr "顏色取樣器..."
+#: ../gui/document.py:119
+msgid "Mirror"
+msgstr "鏡射"
+
+#: ../gui/document.py:120
+msgid "Zoom In"
+msgstr "放大"
+
+#: ../gui/document.py:121
+msgid "Increase magnification"
+msgstr ""
+
+#: ../gui/document.py:122
+msgid "Zoom Out"
+msgstr "縮小"
 
-#: ../gui/drawwindow.py:152
-msgid "Preferences..."
-msgstr "偏好設定..."
+#: ../gui/document.py:123
+msgid "Decrease magnification"
+msgstr ""
+
+#: ../gui/document.py:125
+msgid "Rotate the view left"
+msgstr ""
+
+#: ../gui/document.py:128
+msgid "Rotate the view right"
+msgstr ""
+
+#: ../gui/document.py:131
+msgid "Mirror: flip the view left to right"
+msgstr ""
+
+#: ../gui/document.py:134
+msgid "Flip the view upside-down"
+msgstr ""
+
+#: ../gui/document.py:136
+msgid "Layer Solo"
+msgstr "圖層單獨顯示"
 
 #. TODO: make toggle action
-#: ../gui/drawwindow.py:154
-#: ../gui/drawwindow.py:176
+#: ../gui/document.py:137
+msgid "Hide Layers Above Current"
+msgstr "隱藏目前之上的圖層"
+
+#: ../gui/document.py:150
+msgid "Print Brush Input Values to Console"
+msgstr "列印筆刷輸入值到標準輸出"
+
+#: ../gui/document.py:151
+msgid "Visualize Rendering"
+msgstr "視覺化描繪演算"
+
+#: ../gui/document.py:152
+msgid "Disable GTK Double Buffering"
+msgstr "停用 GTK 雙重緩衝"
+
+#: ../gui/document.py:161
+#, python-format
+msgid "Restore Brush %d"
+msgstr "還原筆刷 %d"
+
+#: ../gui/document.py:163
+#, python-format
+msgid "Save to Brush %d"
+msgstr "儲存到筆刷 %d"
+
+#: ../gui/document.py:644
+#, python-format
+msgid "Undo %s"
+msgstr "復原 %s"
+
+#: ../gui/document.py:646
+msgid "Undo: nothing to undo"
+msgstr "復原: 無上一步"
+
+#: ../gui/document.py:653
+#, python-format
+msgid "Redo %s"
+msgstr "取消復原 %s"
+
+#: ../gui/document.py:655
+msgid "Redo: nothing to redo"
+msgstr "取消復原: 無下一步"
+
+#. name, stock id, label, accelerator, tooltip, callback
+#: ../gui/drawwindow.py:214
+msgid "File"
+msgstr "檔案"
+
+#. FIXME: should do this periodically, not only on quit
+#: ../gui/drawwindow.py:215 ../gui/drawwindow.py:907
+msgid "Quit"
+msgstr "離開"
+
+#: ../gui/drawwindow.py:216
+msgid "Toggle Document Frame"
+msgstr "切換顯示文件邊框"
+
+#: ../gui/drawwindow.py:221 ../gui/preferenceswindow.py:36
+msgid "Pick Color"
+msgstr "點取顏色"
+
+#: ../gui/drawwindow.py:222 ../gui/preferenceswindow.py:46
+msgid "Color History"
+msgstr "顏色記錄"
+
+#: ../gui/drawwindow.py:223
+msgid "Color Changer (crossed bowl)"
+msgstr "換色器 (crossed bowl)"
+
+#: ../gui/drawwindow.py:224
+msgid "Color Changer (washed)"
+msgstr "換色器 (washed)"
+
+#: ../gui/drawwindow.py:225 ../gui/preferenceswindow.py:45
+msgid "Color Ring"
+msgstr "色圈"
+
+#: ../gui/drawwindow.py:226
+msgid "Color Details"
+msgstr "詳細資訊"
+
+#: ../gui/drawwindow.py:228
+msgid "Brushkeys"
+msgstr "筆刷按鍵"
+
+#: ../gui/drawwindow.py:229
+msgid "Help!"
+msgstr "說明！"
+
+#: ../gui/drawwindow.py:231 ../gui/stock.py:43
+msgid "Layers"
+msgstr "圖層"
+
+#. Scratchpad menu items
+#: ../gui/drawwindow.py:234 ../gui/scratchwindow.py:36 ../gui/stock.py:42
+msgid "Scratchpad"
+msgstr "便條紙"
+
+#: ../gui/drawwindow.py:235 ../gui/scratchwindow.py:55
+msgid "New Scratchpad"
+msgstr "新增便條紙"
+
+#: ../gui/drawwindow.py:236
+msgid "Load Scratchpad..."
+msgstr "載入便條紙"
+
+#: ../gui/drawwindow.py:237
+msgid "Save Scratchpad Now"
+msgstr "立即儲存便條紙"
+
+#: ../gui/drawwindow.py:238
+msgid "Save Scratchpad As..."
+msgstr "另存便條紙..."
+
+#: ../gui/drawwindow.py:239 ../gui/scratchwindow.py:53
+msgid "Revert Scratchpad"
+msgstr "復原便條紙"
+
+#: ../gui/drawwindow.py:240
+msgid "Save Scratchpad as Default"
+msgstr "儲存便條紙為預設值"
+
+#: ../gui/drawwindow.py:241
+msgid "Clear the Default Scratchpad"
+msgstr "清除預設的便條紙"
+
+#: ../gui/drawwindow.py:242
+msgid "Render a Palette"
+msgstr "繪製調色盤"
+
+#: ../gui/drawwindow.py:243
+msgid "Load Palette File..."
+msgstr "載入調色盤..."
+
+#: ../gui/drawwindow.py:244
+msgid "Different Saturations of the current Color"
+msgstr "以目前顏色畫出飽和度變化"
+
+#: ../gui/drawwindow.py:245
+msgid "Copy Background to Scratchpad"
+msgstr "將背景複製到便條紙"
+
+#: ../gui/drawwindow.py:247
+msgid "Brush"
+msgstr "筆刷"
+
+#: ../gui/drawwindow.py:248
+msgid "Change Brush..."
+msgstr "變更筆刷..."
+
+#: ../gui/drawwindow.py:249
+msgid "Download more brushes (in web browser)"
+msgstr "下載更多筆刷 (開啟瀏覽器)"
+
+#: ../gui/drawwindow.py:252 ../gui/drawwindow.py:268
 msgid "Help"
 msgstr "說明"
 
-#: ../gui/drawwindow.py:155
+#: ../gui/drawwindow.py:253
 msgid "Where is the Documentation?"
 msgstr "說明文件？"
 
-#: ../gui/drawwindow.py:156
+#: ../gui/drawwindow.py:254
 msgid "Change the Keyboard Shortcuts?"
 msgstr "變更鍵盤快捷鍵？"
 
-#: ../gui/drawwindow.py:157
+#: ../gui/drawwindow.py:255
 msgid "About MyPaint"
 msgstr "關於 MyPaint"
 
-#: ../gui/drawwindow.py:159
+#: ../gui/drawwindow.py:257
 msgid "Debug"
 msgstr "除錯"
 
-#: ../gui/drawwindow.py:160
-msgid "Print Memory Leak Info to stdout (Slow!)"
+#: ../gui/drawwindow.py:258
+msgid "Print Memory Leak Info to Console (Slow!)"
 msgstr "列印記憶體溢出資訊到標準輸出 (慢！)"
 
-#: ../gui/drawwindow.py:161
+#: ../gui/drawwindow.py:259
 msgid "Run Garbage Collector Now"
 msgstr "立刻執行垃圾收集器"
 
-#: ../gui/drawwindow.py:163
-msgid "Shortcuts"
-msgstr "快捷鍵"
+#: ../gui/drawwindow.py:260
+msgid "Start/Stop Python Profiling (cProfile)"
+msgstr "開始/停止 Python Profiling (cProfile)"
+
+#: ../gui/drawwindow.py:261
+msgid "GTK input device dialog"
+msgstr "GTK 輸入裝置對話視窗"
 
-#: ../gui/drawwindow.py:165
+#: ../gui/drawwindow.py:264 ../gui/preferenceswindow.py:225
+#: ../gui/toolbar.py:36
 msgid "View"
 msgstr "檢視"
 
-#: ../gui/drawwindow.py:166
-msgid "Fullscreen"
-msgstr "å\85¨è\9e¢å¹\95"
+#: ../gui/drawwindow.py:265
+msgid "Toolbars"
+msgstr "å·¥å\85·å\88\97"
 
-#: ../gui/drawwindow.py:167
-msgid "Show Menu"
+#: ../gui/drawwindow.py:266
+msgid "Popup Menu"
 msgstr "顯示選單"
 
-#: ../gui/drawwindow.py:168
-msgid "Toggle Subwindows"
-msgstr "å\88\87æ\8f\9bå­\90è¦\96çª\97"
+#: ../gui/drawwindow.py:278 ../gui/preferenceswindow.py:70
+msgid "Preferences"
+msgstr "å\81\8f好設å®\9a"
 
-#: ../gui/drawwindow.py:169
-msgid "Reset (Zoom, Rotation, Mirror)"
-msgstr "重設 (縮放、旋轉、鏡像)"
+#: ../gui/drawwindow.py:280
+msgid "Test input devices"
+msgstr "測試輸入裝置"
 
-#: ../gui/drawwindow.py:170
-msgid "Zoom In (at cursor)"
-msgstr "æ\94¾å¤§ (æ\96¼æ¸¸æ¨\99è\99\95)"
+#: ../gui/drawwindow.py:282
+msgid "Document Frame..."
+msgstr "æ\96\87件é\82\8aæ¡\86..."
 
-#: ../gui/drawwindow.py:171
-msgid "Zoom Out"
-msgstr "縮小"
+#: ../gui/drawwindow.py:284
+msgid "Toggle the Layers list"
+msgstr "切換顯示圖層清單"
 
-#: ../gui/drawwindow.py:172
-msgid "Rotate Counterclockwise"
-msgstr "逆時針旋轉"
+#: ../gui/drawwindow.py:290
+msgid "Edit and reorganise Brush Lists"
+msgstr "編輯並重新組織筆刷清單"
 
-#: ../gui/drawwindow.py:173
-msgid "Rotate Clockwise"
-msgstr "順時針旋轉"
+#: ../gui/drawwindow.py:294
+msgid "Change Brush Settings in detail"
+msgstr "變更筆刷的詳細設定"
 
-#: ../gui/drawwindow.py:174
-msgid "Layer Solo"
-msgstr "å\9c\96層å\96®ç\8d¨é¡¯ç¤º"
+#: ../gui/drawwindow.py:297
+msgid "Toggle the Colour Triangle"
+msgstr "å\88\87æ\8f\9b顯示é¡\8fè\89²ä¸\89è§\92..."
 
-#. TODO: make toggle action
-#: ../gui/drawwindow.py:175
-msgid "Hide Layers Above Current"
-msgstr "隱藏目前之上的圖層"
+#: ../gui/drawwindow.py:300
+msgid "Toggle the advanced Colour Sampler"
+msgstr "切換顯示進階顏色取樣器"
 
-#: ../gui/drawwindow.py:182
-#, python-format
-msgid "Restore Brush %d"
-msgstr "還原筆刷 %d"
+#: ../gui/drawwindow.py:303
+msgid "Toggle the scratchpad"
+msgstr "切換顯示便條紙"
 
-#: ../gui/drawwindow.py:184
-#, python-format
-msgid "Save to Brush %d"
-msgstr "儲存到筆刷 %d"
+#: ../gui/drawwindow.py:326 ../gui/toolbar.py:37
+msgid "Subwindows"
+msgstr "顯示子視窗"
 
-#. name, stock id, label, accelerator, tooltip, callback, default toggle status
-#: ../gui/drawwindow.py:191
-msgid "Print Brush Input Values to stdout"
-msgstr "列印筆刷輸入值到標準輸出"
+#: ../gui/drawwindow.py:327
+msgid "Show subwindows"
+msgstr "顯示子視窗"
 
-#: ../gui/drawwindow.py:192
-msgid "Visualize Rendering"
-msgstr "è¦\96覺å\8c\96æ¼\94ç®\97"
+#: ../gui/drawwindow.py:334
+msgid "Menubar only"
+msgstr "å\8fªæ\9c\89é\81¸å\96®å\88\97"
 
-#: ../gui/drawwindow.py:193
-msgid "Disable GTK Double Buffering"
-msgstr "停用 GTK 雙倍緩衝"
+#: ../gui/drawwindow.py:335
+msgid "Show menu bar"
+msgstr "顯示選單列"
+
+#: ../gui/drawwindow.py:337
+msgid "Toolbar only"
+msgstr "只有工具列"
 
-#: ../gui/drawwindow.py:194
-msgid "Mirror Image"
-msgstr "é\8f¡å°\84å\9c\96å\83\8f"
+#: ../gui/drawwindow.py:338
+msgid "Show toolbar"
+msgstr "顯示工å\85·å\88\97"
 
-#: ../gui/drawwindow.py:637
+#: ../gui/drawwindow.py:340
+msgid "Both"
+msgstr "顯示兩者"
+
+#: ../gui/drawwindow.py:341
+msgid "Show both the menu bar and the toolbar"
+msgstr "同時顯示選單列與工具列"
+
+#: ../gui/drawwindow.py:777
+msgid "Leave Fullscreen Mode"
+msgstr "離開全螢幕模式"
+
+#: ../gui/drawwindow.py:778
+msgid "UnFullscreen"
+msgstr "離開全螢幕"
+
+#: ../gui/drawwindow.py:781
+msgid "Enter Fullscreen Mode"
+msgstr "進入全螢幕模式"
+
+#: ../gui/drawwindow.py:782
+msgid "Fullscreen"
+msgstr "全螢幕"
+
+#: ../gui/drawwindow.py:870
+msgid "Gimp Palette Format"
+msgstr "Gimp 調色盤格式"
+
+#: ../gui/drawwindow.py:871
+msgid "All Files"
+msgstr "所有檔案"
+
+#: ../gui/drawwindow.py:907
 msgid "Really Quit?"
 msgstr "確定要離開？"
 
-#: ../gui/drawwindow.py:746
+#: ../gui/drawwindow.py:935
 msgid ""
-"Copyright (C) 2005-2010\n"
+"Copyright (C) 2005-2012\n"
 "Martin Renold and the MyPaint Development Team"
 msgstr ""
 "著作權 (C) 2005-2010\n"
 "Martin Renold 和 MyPaint 開發團隊"
 
-#: ../gui/drawwindow.py:750
+#: ../gui/drawwindow.py:939
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the COPYING file for more details."
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY. See the COPYING file for more details."
 msgstr ""
-"此程式是自由軟體；你可以在遵守由自由軟體基金會發佈的 GNU 通用公共授權條款的情形下重新發行和 (或) 修改這個程式；授權第二版或任何更新的版本 (根據您的選擇)。\n"
+"此程式是自由軟體；你可以在遵守由自由軟體基金會發佈的 GNU 通用公共授權條款的情"
+"形下重新發行和 (或) 修改這個程式；授權第二版或任何更新的版本 (根據您的選"
+"擇)。\n"
 "\n"
-"這個程式發佈的目的是希望它對人們有所幫助，但沒有任何保證。請見 COPYING 檔案獲得更多詳細資訊。"
-
-#: ../gui/drawwindow.py:760
-#: ../gui/drawwindow.py:764
-#: ../gui/drawwindow.py:766
-#: ../gui/drawwindow.py:767
-#: ../gui/drawwindow.py:769
-#: ../gui/drawwindow.py:773
-#: ../gui/drawwindow.py:774
-#: ../gui/drawwindow.py:775
+"這個程式發佈的目的是希望它對人們有所幫助，但沒有任何保證。請見 COPYING 檔案獲"
+"得更多詳細資訊。"
+
+#. (in order of appearance)
+#: ../gui/drawwindow.py:950 ../gui/drawwindow.py:952 ../gui/drawwindow.py:953
+#: ../gui/drawwindow.py:954 ../gui/drawwindow.py:955 ../gui/drawwindow.py:957
+#: ../gui/drawwindow.py:958 ../gui/drawwindow.py:959 ../gui/drawwindow.py:960
+#: ../gui/drawwindow.py:961 ../gui/drawwindow.py:962 ../gui/drawwindow.py:963
+#: ../gui/drawwindow.py:964 ../gui/drawwindow.py:965 ../gui/drawwindow.py:966
 msgid "programming"
 msgstr "程式"
 
-#: ../gui/drawwindow.py:761
-#: ../gui/drawwindow.py:770
-#: ../gui/drawwindow.py:771
-#: ../gui/drawwindow.py:772
-msgid "brushes"
-msgstr "筆刷"
-
-#: ../gui/drawwindow.py:762
-#: ../gui/drawwindow.py:768
+#: ../gui/drawwindow.py:951 ../gui/drawwindow.py:956
 msgid "portability"
 msgstr "可移植性"
 
-#: ../gui/drawwindow.py:763
-msgid "brushes, programming"
-msgstr "筆刷、程式"
+#: ../gui/drawwindow.py:969 ../gui/drawwindow.py:970 ../gui/drawwindow.py:972
+#: ../gui/drawwindow.py:974 ../gui/drawwindow.py:977
+msgid "brushes"
+msgstr "筆刷"
 
-#: ../gui/drawwindow.py:765
+#: ../gui/drawwindow.py:971
 msgid "patterns, brushes"
 msgstr "圖案、筆刷"
 
-#: ../gui/drawwindow.py:778
+#: ../gui/drawwindow.py:973
+msgid "brushes, patterns"
+msgstr "筆刷、圖案"
+
+#: ../gui/drawwindow.py:975
 msgid "desktop icon"
 msgstr "桌面圖示"
 
-#: ../gui/drawwindow.py:803
+#: ../gui/drawwindow.py:976 ../gui/drawwindow.py:978
+msgid "patterns"
+msgstr "圖案"
+
+#: ../gui/drawwindow.py:979 ../gui/drawwindow.py:980
+msgid "tool icons"
+msgstr "工具圖示"
+
+#: ../gui/drawwindow.py:1012
 msgid "Move your mouse over a menu entry, then press the key to assign."
 msgstr "將您的滑鼠移動到選單項目上方，然後按滑鼠鍵來指定。"
 
-#: ../gui/drawwindow.py:805
+#: ../gui/drawwindow.py:1014
 msgid ""
-"You can also drag the canvas with the mouse while holding the middle mouse button or spacebar. Or with the arrow keys.\n"
+"You can also drag the canvas with the mouse while holding the middle mouse "
+"button or spacebar. Or with the arrow keys.\n"
 "\n"
-"In contrast to earlier versions, scrolling and zooming are harmless now and will not make you run out of memory. But you still require a lot of memory if you paint all over while fully zoomed out."
+"In contrast to earlier versions, scrolling and zooming are harmless now and "
+"will not make you run out of memory. But you still require a lot of memory "
+"if you paint all over while fully zoomed out."
 msgstr ""
 "當按住滑鼠中鍵或空白鍵時您也可以用滑鼠拖曳畫布。或者按方向鍵。\n"
 "\n"
-"相對於早期版本，現在畫面滾動和縮放更為順暢且不會讓您用完記憶體。但如果在畫面縮到相當小時您到處塗繪，仍然需要大量的記憶體。"
+"相對於早期版本，現在畫面滾動和縮放更為順暢且不會讓您用完記憶體。但如果在畫面"
+"縮到相當小時您到處塗繪，仍然需要大量的記憶體。"
 
-#: ../gui/drawwindow.py:812
+#: ../gui/drawwindow.py:1021
 msgid ""
-"This is used to quickly save/restore brush settings using keyboard shortcuts. You can paint with one hand and change brushes with the other without interrupting.\n"
+"Brushkeys are used to quickly save/restore brush settings using keyboard "
+"shortcuts. You can paint with one hand and change brushes with the other "
+"without interruption.\n"
 "\n"
 "There are 10 memory slots to hold brush settings.\n"
-"Those are anonymous brushes, they are not visible in the brush selector list. But they will stay even if you quit. They will also remember the selected color. In contrast, selecting a normal brush never changes the color. "
+"They are anonymous brushes, which are not visible in the brush selector "
+"list. But they are remembered even if you quit."
 msgstr ""
-"這用於使用快捷鍵快速儲存/還原筆刷。您可以用一隻手塗繪並用另一隻手變更筆刷而不必中斷。\n"
+"這用於使用快捷鍵快速儲存/還原筆刷。您可以用一隻手塗繪並用另一隻手變更筆刷而不"
+"必中斷。\n"
 "\n"
 "有 10 個記憶槽來保留筆刷設定值。\n"
-"這些不具名稱的筆刷不會顯示在筆刷選擇器清單。但這些筆刷會被留下來，即使您離開程式。這些筆刷也會記住選擇的顏色。相反的，選擇普通筆刷則不會改變顏色。"
+"這些不具名稱的筆刷不會顯示在筆刷選擇器清單。但這些筆刷會被留下來，即使您離開"
+"程式。這些筆刷也會記住選擇的顏色。相反的，選擇普通筆刷則不會改變顏色。"
 
-#: ../gui/drawwindow.py:823
+#: ../gui/drawwindow.py:1030
 msgid ""
-"There is a tutorial available on the MyPaint homepage. It explains some features which are hard to discover yourself.\n"
+"There is a tutorial available on the MyPaint homepage. It explains some "
+"features which are hard to discover yourself.\n"
 "\n"
-"Comments about the brush settings (opaque, hardness, etc.) and inputs (pressure, speed, etc.) are available as tooltips. Put your mouse over a label to see them. \n"
+"Comments about the brush settings (opaque, hardness, etc.) and inputs "
+"(pressure, speed, etc.) are available as tooltips. Put your mouse over a "
+"label to see them. \n"
 msgstr ""
 "在 MyPaint 的首頁上有一份教學。這份教學會解釋一些使用者很難自己發現的功能。\n"
 "\n"
-"關於筆刷設定值 (不透明度、硬度等) 和輸入 (壓力、速度等) 會有工具提示。將您的滑鼠移到標籤的上方可看見這些提示。\n"
+"關於筆刷設定值 (不透明度、硬度等) 和輸入 (壓力、速度等) 會有工具提示。將您的"
+"滑鼠移到標籤的上方可看見這些提示。\n"
 
-#: ../gui/filehandling.py:36
+#: ../gui/filehandling.py:59
 msgid "New"
 msgstr "新增"
 
-#: ../gui/filehandling.py:37
-#: ../gui/filehandling.py:198
+#: ../gui/filehandling.py:59
+msgid "Start with a new blank canvas"
+msgstr ""
+
+#: ../gui/filehandling.py:60 ../gui/filehandling.py:344
+#: ../gui/filehandling.py:361
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../gui/filehandling.py:38
+#: ../gui/filehandling.py:60
+msgid "Open a file, replacing the current painting"
+msgstr ""
+
+#: ../gui/filehandling.py:61
 msgid "Open Last"
-msgstr "最後開啟"
+msgstr "開啟上次編輯的檔案"
 
-#: ../gui/filehandling.py:39
+#: ../gui/filehandling.py:61
+msgid "Open the last file you saved"
+msgstr ""
+
+#: ../gui/filehandling.py:62
 msgid "Reload"
 msgstr "重新載入"
 
-#: ../gui/filehandling.py:40
-msgid "Save"
-msgstr "儲存"
+#: ../gui/filehandling.py:62
+msgid "Reload the current file"
+msgstr "重新載入目前的檔案"
 
-#: ../gui/filehandling.py:41
+#: ../gui/filehandling.py:63
+msgid "Save to a file"
+msgstr "儲存至檔案"
+
+#: ../gui/filehandling.py:64
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: ../gui/filehandling.py:42
+#: ../gui/filehandling.py:64
+msgid "Save to a file with a new name"
+msgstr ""
+
+#: ../gui/filehandling.py:65
+msgid "Export..."
+msgstr "匯出..."
+
+#: ../gui/filehandling.py:65
+msgid "Export to a file"
+msgstr "匯出至檔案"
+
+#: ../gui/filehandling.py:66
 msgid "Save As Scrap"
 msgstr "另存為廢料"
 
-#: ../gui/filehandling.py:43
+#: ../gui/filehandling.py:67
+msgid ""
+"Saves to a new scrap file. If this drawing is currently saved as a scrap, "
+"this will write a new revision of it."
+msgstr ""
+
+#: ../gui/filehandling.py:71
 msgid "Open Previous Scrap"
 msgstr "開啟上一個廢料"
 
-#: ../gui/filehandling.py:44
+#: ../gui/filehandling.py:71
+msgid "Load the previous scrap file, replacing the current drawing"
+msgstr ""
+
+#: ../gui/filehandling.py:72
 msgid "Open Next Scrap"
 msgstr "開啟下一個廢料"
 
-#: ../gui/filehandling.py:50
+#: ../gui/filehandling.py:72
+msgid "Load the next scrap file, replacing the current drawing"
+msgstr ""
+
+#: ../gui/filehandling.py:78
 msgid "Open Recent"
-msgstr "開啟最近的"
+msgstr "開啟最近使用的檔案"
 
-#: ../gui/filehandling.py:50
+#: ../gui/filehandling.py:78
 msgid "Open Recent files"
-msgstr "開啟最近的檔案"
+msgstr "開啟最近使用的檔案"
 
-#: ../gui/filehandling.py:89
-msgid "Save..."
-msgstr "儲存..."
+#. (name, patterns)
+#: ../gui/filehandling.py:99
+msgid "All Recognized Formats"
+msgstr "所有可辨識的格式"
+
+#. 0
+#: ../gui/filehandling.py:100 ../gui/filehandling.py:106
+msgid "OpenRaster (*.ora)"
+msgstr "OpenRaster (*.ora)"
 
-#. name, patterns, saveopts
 #: ../gui/filehandling.py:101
-msgid "Any format (prefer OpenRaster)"
-msgstr "任何格式 (優先使用 OpenRaster)"
+msgid "PNG (*.png)"
+msgstr "PNG (*.png)"
 
 #: ../gui/filehandling.py:102
-#: ../gui/filehandling.py:206
-msgid "OpenRaster (*.ora)"
-msgstr "OpenRaster (*.ora)"
+msgid "JPEG (*.jpg; *.jpeg)"
+msgstr "JPEG (*.jpg; *.jpeg)"
 
-#: ../gui/filehandling.py:104
+#. (name, extension, options)
+#: ../gui/filehandling.py:105
+msgid "By extension (prefer default format)"
+msgstr "依附檔名決定 (偏好預設格式)"
+
+#. 1
+#: ../gui/filehandling.py:107
+msgid "PNG solid with background (*.png)"
+msgstr ""
+
+#. 2
+#: ../gui/filehandling.py:108
 msgid "PNG transparent (*.png)"
 msgstr "PNG 透明圖片 (*.png)"
 
-#: ../gui/filehandling.py:105
+#. 3
+#: ../gui/filehandling.py:109
 msgid "Multiple PNG transparent (*.XXX.png)"
 msgstr "多個 PNG 透明圖片"
 
-#: ../gui/filehandling.py:106
+#. 4
+#: ../gui/filehandling.py:110
 msgid "JPEG 90% quality (*.jpg; *.jpeg)"
 msgstr "JPEG 90% 品質 (*.jpg; *.jpeg)"
 
-#: ../gui/filehandling.py:127
+#: ../gui/filehandling.py:151
+msgid "Save..."
+msgstr "儲存..."
+
+#: ../gui/filehandling.py:162
+msgid "Format to save as:"
+msgstr "另存格式:"
+
+#: ../gui/filehandling.py:188
+msgid "Confirm"
+msgstr ""
+
+#: ../gui/filehandling.py:188
+msgid "Really continue?"
+msgstr "確定要繼續？"
+
+#: ../gui/filehandling.py:197
 #, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分鐘"
+msgid "This will discard %d minute of unsaved painting."
+msgid_plural "This will discard %d minutes of unsaved painting."
+msgstr[0] "這將會丟棄 %d 分鐘以來尚未儲存的圖畫。"
 
-#: ../gui/filehandling.py:130
+#: ../gui/filehandling.py:202
 #, python-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
+msgid "This will discard %d second of unsaved painting."
+msgid_plural "This will discard %d seconds of unsaved painting."
+msgstr[0] "這將會丟棄 %d 秒以來尚未儲存的圖畫。"
 
-#: ../gui/filehandling.py:136
+#: ../gui/filehandling.py:210
 msgid "_Save as Scrap"
 msgstr "另存為廢料(_S)"
 
-#: ../gui/filehandling.py:142
+#: ../gui/filehandling.py:393
+msgid "Open Scratchpad..."
+msgstr "開啟便條紙..."
+
+#: ../gui/filehandling.py:698
 #, python-format
-msgid ""
-"<b>%s</b>\n"
-"\n"
-"This will discard %s of unsaved painting."
-msgstr ""
-"<b>%s</b>\n"
-"\n"
-"這將會丟棄未儲存圖畫的 %s。"
+msgid "There are no scrap files named \"%s\" yet."
+msgstr "還沒有廢料檔命名為「%s」。"
 
-#: ../gui/filehandling.py:179
-msgid "Did not save, the canvas is empty."
-msgstr "沒有儲存，畫布是空白的。"
+#: ../gui/framewindow.py:34
+msgid "Height"
+msgstr "高度"
 
-#. name, patterns
-#: ../gui/filehandling.py:205
-msgid "All Recognized Formats"
-msgstr "所有可辨識的格式"
+#: ../gui/framewindow.py:35
+msgid "Width"
+msgstr "寬度"
 
-#: ../gui/filehandling.py:207
-msgid "PNG (*.png)"
-msgstr "PNG (*.png)"
+#: ../gui/framewindow.py:46
+msgid "Crop to active layer bounds"
+msgstr "裁剪到啟用圖層的邊界"
 
-#: ../gui/filehandling.py:208
-msgid "JPEG (*.jpg; *.jpeg)"
-msgstr "JPEG (*.jpg; *.jpeg)"
+#: ../gui/framewindow.py:47
+msgid "Crop to document bounds"
+msgstr "裁剪到文件的邊界"
 
-#: ../gui/filehandling.py:384
-#, python-format
-msgid "There are no scrap files named \"%s\" yet."
-msgstr "還沒有廢料檔命名為「%s」。"
+#: ../gui/framewindow.py:51
+msgid "Enabled"
+msgstr "啟用"
 
-#: ../gui/functionwindow.py:40
+#: ../gui/functionwindow.py:38
 msgid "Base Value"
 msgstr "基本值"
 
-#: ../gui/gtkexcepthook.py:118
+#: ../gui/gtkexcepthook.py:127
 msgid "Bug Detected"
 msgstr "偵測到程式錯誤"
 
-#: ../gui/gtkexcepthook.py:122
+#: ../gui/gtkexcepthook.py:131
 msgid "<big><b>A programming error has been detected.</b></big>"
 msgstr "<big><b>已偵測到一個程式錯誤。</b></big>"
 
-#: ../gui/gtkexcepthook.py:123
-msgid "It probably isn't fatal, but the details should be reported to the developers nonetheless."
+#: ../gui/gtkexcepthook.py:132
+msgid ""
+"It probably isn't fatal, but the details should be reported to the "
+"developers nonetheless."
 msgstr "它可能不是很嚴重的錯誤，儘管如此詳細資訊還是應該回報給開發人員。"
 
-#: ../gui/gtkexcepthook.py:138
-msgid "Report..."
-msgstr "回報..."
-
-#: ../gui/gtkexcepthook.py:142
+#: ../gui/gtkexcepthook.py:155
 msgid "Details..."
 msgstr "詳細資訊..."
 
-#. Show details...
-#: ../gui/gtkexcepthook.py:171
-msgid "Bug Details"
-msgstr "程式錯誤詳細資訊"
+#: ../gui/gtkexcepthook.py:176 ../gui/gtkexcepthook.py:179
+msgid "Exception while analyzing the exception."
+msgstr ""
+
+#: ../gui/inputtestwindow.py:20
+msgid "Input Device Test"
+msgstr "輸入裝置測試"
+
+#: ../gui/inputtestwindow.py:47
+msgid "(no pressure)"
+msgstr "(無壓感)"
+
+#: ../gui/inputtestwindow.py:48
+msgid "Pressure:"
+msgstr "壓力:"
 
-#: ../gui/layerswindow.py:35
-msgid "Layer visibility"
-msgstr "圖層可見度"
+#: ../gui/inputtestwindow.py:50
+msgid "(no tilt)"
+msgstr "(無傾斜)"
 
-#: ../gui/layerswindow.py:354
+#: ../gui/inputtestwindow.py:51
+msgid "Tilt:"
+msgstr "傾斜:"
+
+#: ../gui/inputtestwindow.py:56
+msgid "(no device)"
+msgstr "(無裝置)"
+
+#: ../gui/inputtestwindow.py:57
+msgid "Device:"
+msgstr "裝置:"
+
+#: ../gui/layerswindow.py:50
+msgid "Visible"
+msgstr "可見"
+
+#: ../gui/layerswindow.py:56
+msgid "Locked"
+msgstr "已鎖定"
+
+#: ../gui/layerswindow.py:72
+msgid "Mode:"
+msgstr "模式:"
+
+#: ../gui/layerswindow.py:83
 msgid "Opacity:"
 msgstr "不透明度："
 
-#: ../gui/preferenceswindow.py:26
-msgid "Preferences"
-msgstr "偏好設定"
+#: ../gui/layerswindow.py:101 ../lib/command.py:243
+msgid "Duplicate Layer"
+msgstr "複製圖層"
+
+#: ../gui/layerswindow.py:280
+#, python-format
+msgid "Copy of %s"
+msgstr "%s 的複本"
+
+#: ../gui/layerswindow.py:283
+#, python-format
+msgid "Copy of Untitled layer #%d"
+msgstr "未命名的圖層 #%d 的複本"
 
-#: ../gui/preferenceswindow.py:46
-msgid "<b><span size=\"large\">Global Pressure Mapping</span></b>"
-msgstr "<b><span size=\"large\">整體壓力對應</span></b>"
+#: ../gui/layerswindow.py:326
+#, python-format
+msgid "Untitled layer #%d"
+msgstr "未命名的圖層 #%d"
+
+#: ../gui/layout.py:591
+msgid "Collapse"
+msgstr "收合"
+
+#: ../gui/layout.py:592
+msgid "Expand"
+msgstr "展開"
+
+#: ../gui/layout.py:666
+msgid "Snap out"
+msgstr "脫離"
+
+#: ../gui/layout.py:668
+msgid "Close"
+msgstr "關閉"
+
+#: ../gui/preferenceswindow.py:20
+msgid "Disabled (no pressure sensitivity)"
+msgstr "停用 (無壓感)"
+
+#: ../gui/preferenceswindow.py:21
+msgid "Screen (normal)"
+msgstr "螢幕 (標準)"
+
+#: ../gui/preferenceswindow.py:22
+msgid "Window (not recommended)"
+msgstr "視窗 (不建議)"
+
+#. These can be names of actions within ActionGroups defined elsewhere,
+#. or names of actions the handler interprets itself.
+#. NOTE: The translatable strings for actions are duplicated from
+#. their action definition. Please keep in sync (or refactor to get the string from there)
+#. (action_or_whatever, label)
+#: ../gui/preferenceswindow.py:33
+msgid "No action"
+msgstr "無動作"
+
+#. [0] is the default for the comboboxes
+#: ../gui/preferenceswindow.py:34
+msgid "Menu"
+msgstr "選單"
+
+#: ../gui/preferenceswindow.py:35
+msgid "Toggle Subwindows"
+msgstr "切換顯示子視窗"
+
+#: ../gui/preferenceswindow.py:39
+msgid "Pan"
+msgstr "平移"
+
+#: ../gui/preferenceswindow.py:41
+msgid "Rotate"
+msgstr "旋轉"
+
+#: ../gui/preferenceswindow.py:42
+msgid "Straight Line"
+msgstr "直線"
+
+#: ../gui/preferenceswindow.py:43
+msgid "Sequence of Straight Lines"
+msgstr "連續直線"
+
+#: ../gui/preferenceswindow.py:44
+msgid "Color Changer"
+msgstr "換色器"
+
+#: ../gui/preferenceswindow.py:47
+msgid "Undo"
+msgstr "復原"
+
+#: ../gui/preferenceswindow.py:48
+msgid "Redo"
+msgstr "取消復原"
+
+#. Used for creating the menus,
+#. (pref_name, label)
+#: ../gui/preferenceswindow.py:53
+msgid "Button 1 + Shift"
+msgstr "按鈕 1 + Shift"
+
+#: ../gui/preferenceswindow.py:54
+msgid "Button 1 + Ctrl (or Alt)"
+msgstr "按鈕 1 + Ctrl (或 Alt)"
+
+#: ../gui/preferenceswindow.py:55
+msgid "Button 2"
+msgstr "按鈕 2"
+
+#: ../gui/preferenceswindow.py:56
+msgid "Button 2 + Shift"
+msgstr "按鈕 2 + Shift"
+
+#: ../gui/preferenceswindow.py:57
+msgid "Button 2 + Ctrl (or Alt)"
+msgstr "按鈕 2 + Ctrl (或 Alt)"
+
+#: ../gui/preferenceswindow.py:58
+msgid "Button 3"
+msgstr "按鈕 3"
 
 #: ../gui/preferenceswindow.py:59
+msgid "Button 3 + Shift"
+msgstr "按鈕 3 + Shift"
+
+#: ../gui/preferenceswindow.py:60
+msgid "Button 3 + Ctrl (or Alt)"
+msgstr "按鈕 3 + Ctrl (或 Alt)"
+
+#. TRANSLATORS: Tab label
+#: ../gui/preferenceswindow.py:90
+msgid "Pen Input"
+msgstr "壓感筆輸入"
+
+#: ../gui/preferenceswindow.py:96
+msgid "<b>Input Device</b>"
+msgstr "<b>輸入裝置</b>"
+
+#: ../gui/preferenceswindow.py:103
 msgid ""
-"0.5\n"
-"(mouse button)"
+"Scale input pressure to brush pressure. This is applied to all input "
+"devices. The mouse button has an input pressure of 0.5 when pressed."
+msgstr ""
+"調整輸入壓力與筆刷壓力的對應值。這會套用到所有的輸入裝置。滑鼠按鈕按下時的輸"
+"入壓力值為 0.5。"
+
+#. TRANSLATORS: Graph y-axis label
+#: ../gui/preferenceswindow.py:113
+msgid "Brush Pressure"
+msgstr "筆刷壓力"
+
+#. TRANSLATORS: Graph x-axis label
+#: ../gui/preferenceswindow.py:123
+msgid "Input Pressure"
+msgstr "輸入壓力"
+
+#: ../gui/preferenceswindow.py:132
+msgid "Mode: "
+msgstr "模式: "
+
+#: ../gui/preferenceswindow.py:149
+msgid "Buttons"
+msgstr "按鈕"
+
+#: ../gui/preferenceswindow.py:155
+msgid "<b>Pen and mouse button mappings</b>"
+msgstr "<b>壓感筆和滑鼠按鈕的對應</b>"
+
+#: ../gui/preferenceswindow.py:181
+msgid "Saving"
+msgstr "存檔"
+
+#: ../gui/preferenceswindow.py:187
+msgid "<b>Saving</b>"
+msgstr "<b>存檔</b>"
+
+#: ../gui/preferenceswindow.py:191
+msgid "Default file format:"
+msgstr "預設檔案格式:"
+
+#: ../gui/preferenceswindow.py:206
+msgid "<b>Save Next Scrap</b>"
+msgstr "<b>儲存下一個廢料</b>"
+
+#: ../gui/preferenceswindow.py:210
+msgid "Path and filename prefix:"
+msgstr "路徑和檔名字首"
+
+#: ../gui/preferenceswindow.py:231
+msgid "<b>Default View</b>"
+msgstr "<b>預設檢視</b>"
+
+#: ../gui/preferenceswindow.py:235
+msgid "Default zoom:"
+msgstr "預設縮放:"
+
+#: ../gui/preferenceswindow.py:248
+msgid "High quality zoom (may result in slow scrolling)"
+msgstr "高品質縮放 (可能會造成捲動緩慢)"
+
+#: ../gui/preferenceswindow.py:255
+msgid "<b>Fullscreen</b>"
+msgstr "<b>全螢幕</b>"
+
+#: ../gui/preferenceswindow.py:259
+msgid "Hide menu bar"
+msgstr "隱藏選單列"
+
+#: ../gui/preferenceswindow.py:264
+msgid "Hide toolbar"
+msgstr "隱藏工具列"
+
+#: ../gui/preferenceswindow.py:269
+msgid "Hide tools"
+msgstr "隱藏工具視窗"
+
+#: ../gui/scratchwindow.py:49
+msgid "Load Scratchpad"
+msgstr "載入便條紙"
+
+#: ../gui/scratchwindow.py:51
+msgid "Save Scratchpad as..."
+msgstr "另存便條紙..."
+
+#: ../gui/spinbox.py:32
+msgid "Previous item"
+msgstr "上一項"
+
+#: ../gui/spinbox.py:35
+msgid "Next item"
+msgstr "下一項"
+
+#: ../gui/spinbox.py:97
+msgid "(Nothing to show)"
+msgstr "(無)"
+
+#. Tool windows. No trailing ellipses on these since none of them require
+#. further input before they can do anything: see section 4.3.2.1 of the the
+#. GNOME Human Interface Guidelines version 3.0.
+#: ../gui/stock.py:39
+msgid "Brush List Editor"
+msgstr "筆刷清單編輯器"
+
+#: ../gui/stock.py:40
+msgid "Color Triangle"
+msgstr "顏色三角..."
+
+#: ../gui/stock.py:41
+msgid "Color Sampler"
+msgstr "顏色取樣器"
+
+#: ../gui/stock.py:44
+msgid "Rotate Counterclockwise"
+msgstr "逆時針旋轉"
+
+#: ../gui/stock.py:46
+msgid "Rotate Clockwise"
+msgstr "順時針旋轉"
+
+#: ../gui/stock.py:48
+msgid "Mirror Horizontal"
+msgstr "水平鏡射"
+
+#: ../gui/stock.py:49
+msgid "Mirror Vertical"
+msgstr "垂直鏡射"
+
+#: ../gui/stock.py:50
+msgid "Blend Mode"
+msgstr "混合模式"
+
+#. (internal-name, display-name)
+#: ../gui/stock.py:51 ../lib/layer.py:17
+msgid "Normal"
+msgstr "標準"
+
+#: ../gui/stock.py:53
+msgid "Lock Alpha Channel"
+msgstr "鎖定 Alpha 通道"
+
+#: ../gui/stock.py:55
+msgid "Brush Modifiers Active"
+msgstr ""
+
+#: ../gui/stock.py:56
+msgid "Brush Modifiers Inactive"
+msgstr ""
+
+#: ../gui/toolbar.py:32
+msgid "File handling"
+msgstr "檔案處理"
+
+#: ../gui/toolbar.py:33
+msgid "Scraps switcher"
+msgstr "廢料切換器"
+
+#: ../gui/toolbar.py:34
+msgid "Undo and Redo"
+msgstr "復原與取消復原"
+
+#: ../gui/toolbar.py:35
+msgid "Blend Modes"
+msgstr "混色模式"
+
+#: ../gui/toolbar.py:66
+msgid "MyPaint"
+msgstr ""
+
+#: ../gui/toolbar.py:81
+msgid "Current Color"
+msgstr "目前顏色"
+
+#: ../gui/toolbar.py:83
+msgid "Current Brush"
+msgstr "目前筆刷"
+
+#: ../gui/toolbar.py:85
+msgid "Brush Settings"
+msgstr "筆刷設定值"
+
+#: ../gui/toolbar.py:151
+msgid "Color History and other tools"
+msgstr "顏色記錄和其他工具"
+
+#. Colour changing
+#: ../gui/toolbar.py:174
+msgid "Change Color"
+msgstr "變更顏色"
+
+#. History
+#. Brush history
+#: ../gui/toolbar.py:217 ../gui/toolbar.py:322
+msgid "Recently Used"
+msgstr "最近使用過的"
+
+#: ../gui/toolbar.py:280
+msgid "Brush history etc."
+msgstr "筆刷紀錄"
+
+#. A limited subset of the abailable brush settings.
+#: ../gui/toolbar.py:406
+msgid "Quick Brush Settings"
+msgstr "快速筆刷設定"
+
+#: ../gui/toolbar.py:432
+#, python-format
+msgid "%s:"
 msgstr ""
-"0.5\n"
-"(滑鼠鍵)"
 
-#: ../gui/preferenceswindow.py:70
-msgid "Mode for input devices: "
-msgstr "輸入裝置的模式："
+#: ../gui/toolbar.py:439
+#, python-format
+msgid "Restore '%s' to this brush's saved value"
+msgstr "將 '%s' 還原到該筆刷儲存的值"
+
+#. Access to the brush settings window, and a big reset-all button
+#. aligned with the settings above.
+#: ../gui/toolbar.py:457
+msgid "Detailed Brush Settings"
+msgstr "詳細的筆刷設定"
+
+#: ../gui/toolbar.py:472
+msgid "Restore Saved Settings"
+msgstr "還原儲存的設定值"
+
+#: ../gui/toolbar.py:474
+msgid "Reset all brush settings to the current brush's saved values"
+msgstr "重置所有筆刷的設定值為目前筆刷儲存的值"
+
+#: ../gui/toolbar.py:484
+msgid "Brush Blend Mode"
+msgstr "筆刷混色模式"
+
+#: ../lib/command.py:74
+msgid "Unknown Action"
+msgstr "未知的動作"
+
+#: ../lib/command.py:94
+msgid "Painting"
+msgstr "塗色"
+
+#: ../lib/command.py:110
+msgid "Clear Layer"
+msgstr "清除圖層"
+
+#: ../lib/command.py:123
+msgid "Load Layer"
+msgstr "載入圖層"
+
+#: ../lib/command.py:137
+msgid "Merge Layers"
+msgstr "合併圖層"
+
+#: ../lib/command.py:159
+msgid "Add Layer"
+msgstr "新增圖層"
+
+#: ../lib/command.py:179
+msgid "Remove Layer"
+msgstr "移除圖層"
+
+#: ../lib/command.py:202
+msgid "Select Layer"
+msgstr "選擇圖層"
+
+#: ../lib/command.py:217
+msgid "Move Layer"
+msgstr "移動圖層"
 
-#: ../gui/preferenceswindow.py:81
-msgid "Paths"
-msgstr "路徑"
+#: ../lib/command.py:263
+msgid "Reorder Layer"
+msgstr "重新排列圖層"
 
-#: ../gui/preferenceswindow.py:85
-msgid "<b><span size=\"large\">Save as Scrap</span></b>"
-msgstr "<b><span size=\"large\">另存為廢料</span></b>"
+#: ../lib/command.py:300
+msgid "Make Layer Visible"
+msgstr "圖層可見"
 
-#: ../gui/preferenceswindow.py:87
-msgid "Path and filename prefix for \"Save Next Scrap\""
-msgstr "「儲存下一個廢料」的路徑和檔名字首"
+#: ../lib/command.py:302
+msgid "Make Layer Invisible"
+msgstr "圖層不可見"
+
+#: ../lib/command.py:321
+msgid "Lock Layer"
+msgstr "鎖定圖層"
+
+#: ../lib/command.py:323
+msgid "Unlock Layer"
+msgstr "解除圖層鎖定"
+
+#: ../lib/command.py:326
+msgid "Change Layer Visibility"
+msgstr "變更圖層可見度"
+
+#: ../lib/command.py:350
+msgid "Change Layer Blending Mode"
+msgstr "變更圖層混色模式"
 
 #. add a hint due to a very consfusing error message when there is no space left on device
-#: ../lib/document.py:259
+#: ../lib/document.py:372
 #, python-format
 msgid ""
 "Unable to save: %s\n"
@@ -1317,63 +2406,183 @@ msgstr ""
 "無法儲存：%s\n"
 "裝置上是否剩餘足夠的空間？"
 
-#: ../lib/document.py:261
-#: ../lib/document.py:264
+#: ../lib/document.py:374 ../lib/document.py:377
 #, python-format
 msgid "Unable to save: %s"
 msgstr "無法儲存：%s"
 
-#: ../lib/document.py:269
+#: ../lib/document.py:382
 #, python-format
 msgid "File does not exist: %s"
 msgstr "檔案不存在：%s"
 
-#: ../lib/document.py:271
+#: ../lib/document.py:384
 #, python-format
 msgid "You do not have the necessary permissions to open file: %s"
 msgstr "您沒有足夠的權限來開啟檔案：%s"
 
-#: ../lib/document.py:279
+#: ../lib/document.py:392
 #, python-format
 msgid "Error while loading: GError %s"
 msgstr "載入時發生錯誤：GError %s"
 
-#: ../lib/document.py:282
+#: ../lib/document.py:395
 #, python-format
 msgid "Error while loading: IOError %s"
 msgstr "載入時發生錯誤：IOError %s"
 
-#: ../lib/document.py:288
+#: ../lib/document.py:401
 #, python-format
 msgid "Unknown file format extension: %s"
 msgstr "未知的檔案格式副檔名：%s"
 
+#: ../lib/layer.py:18
+msgid "Multiply"
+msgstr "相乘"
+
+#: ../lib/layer.py:19
+msgid "Burn"
+msgstr "燃燒"
+
+#: ../lib/layer.py:20
+msgid "Dodge"
+msgstr "躲避"
+
+#: ../lib/layer.py:21
+msgid "Screen"
+msgstr "螢幕"
+
+#, fuzzy
+#~ msgid "All settings"
+#~ msgstr "儲存設定值"
+
+#, fuzzy
+#~ msgid "Pick Colour"
+#~ msgstr "點取顏色"
+
+#~ msgid "Toggle Eraser Mode"
+#~ msgstr "切換橡皮擦模式"
+
+#~ msgid "Zoom In (at cursor)"
+#~ msgstr "放大 (於游標處)"
+
+#~ msgid "Preferences..."
+#~ msgstr "偏好設定..."
+
+#~ msgid "Layers..."
+#~ msgstr "圖層..."
+
+#~ msgid "Background..."
+#~ msgstr "背景..."
+
+#~ msgid "Brush List..."
+#~ msgstr "筆刷清單..."
+
+#, fuzzy
+#~ msgid "Brush Editor..."
+#~ msgstr "筆刷清單..."
+
+#~ msgid "brushes, programming"
+#~ msgstr "筆刷、程式"
+
+#~ msgid "Did not save, the canvas is empty."
+#~ msgstr "沒有儲存，畫布是空白的。"
+
+#, fuzzy
+#~ msgid "Layer lock"
+#~ msgstr "圖層單獨顯示"
+
+#~ msgid "opaque"
+#~ msgstr "不透明"
+
+#~ msgid ""
+#~ "This gets multiplied with opaque. It is used for making opaque depend on "
+#~ "pressure (or other inputs)."
+#~ msgstr ""
+#~ "這可得到乘以不透明度的值。它會用於由壓力 (或者其他輸入) 決定產生的不透明"
+#~ "度。"
+
+#~ msgid "add as new"
+#~ msgstr "加入新筆刷"
+
+#~ msgid "settings..."
+#~ msgstr "設定值..."
+
+#~ msgid "save preview"
+#~ msgstr "儲存預覽"
+
+#~ msgid "Right click on group to modify"
+#~ msgstr "用右鍵點擊群組進行修改"
+
+#~ msgid "Select harmonies"
+#~ msgstr "選擇協調色"
+
+#~ msgid "Brush Settings..."
+#~ msgstr "筆刷設定值..."
+
+#~ msgid "Reset (Zoom, Rotation, Mirror)"
+#~ msgstr "重設 (縮放、旋轉、鏡像)"
+
+#~ msgid "Any format (prefer OpenRaster)"
+#~ msgstr "任何格式 (優先使用 OpenRaster)"
+
+#~ msgid "Bug Details"
+#~ msgstr "程式錯誤詳細資訊"
+
+#~ msgid "<b><span size=\"large\">Global Pressure Mapping</span></b>"
+#~ msgstr "<b><span size=\"large\">整體壓力對應</span></b>"
+
+#~ msgid ""
+#~ "0.5\n"
+#~ "(mouse button)"
+#~ msgstr ""
+#~ "0.5\n"
+#~ "(滑鼠鍵)"
+
+#~ msgid "Paths"
+#~ msgstr "路徑"
+
+#~ msgid "<b><span size=\"large\">Save as Scrap</span></b>"
+#~ msgstr "<b><span size=\"large\">另存為廢料</span></b>"
+
 #~ msgid "Settings..."
 #~ msgstr "設定值..."
+
 #~ msgid "Settings"
 #~ msgstr "設定值"
+
 #~ msgid "Name:"
 #~ msgstr "名稱："
+
 #~ msgid "done"
 #~ msgstr "完成"
+
 #~ msgid "R: "
 #~ msgstr "R: "
+
 #~ msgid "G: "
 #~ msgstr "G: "
+
 #~ msgid "B: "
 #~ msgstr "B: "
+
 #~ msgid "H: "
 #~ msgstr "H: "
+
 #~ msgid "S: "
 #~ msgstr "S: "
+
 #~ msgid "V: "
 #~ msgstr "V: "
+
 #~ msgid "V"
 #~ msgstr "V"
+
 #~ msgid "S"
 #~ msgstr "S"
+
 #~ msgid "By <b>%s</b>"
 #~ msgstr "用 <b>%s</b>"
+
 #~ msgid "Revert"
 #~ msgstr "回復"
-