diff --git a/po/ChangeLog b/po/ChangeLog
index 2ac3117d4741972b4d7d29f5b33dbe7b9322e9b4..bc285f57facf7fa06f633a4b7565d1a19cf73557 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-09  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_TW.po: Added Plural-Forms header.
+
 2005-04-08  Jordi Mallach  <jordi@gnu.org>
 
 	* ca.po: Updated Catalan translation.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fb0a4c56c887e75294056b24281c0231da69dc43..f3e91bc0e904bde5e801da2be0cdbaa266b04102 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,204 +7,209 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-20 23:36-0500\n"
+"POT-Creation-Date: 2005-04-09 11:38+0200\n"
 "PO-Revision-Date: 2005-04-08 13:22+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.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"
 
-#: src/files.c:308
+#: src/files.c:309
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "已讀取 %1u 列 (轉檔自 DOS 與 Mac 格式)"
 
-#: src/files.c:313
+#: src/files.c:314
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "已讀取 %1u 列 (轉檔自 Mac 格式)"
 
-#: src/files.c:318
+#: src/files.c:319
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "已讀取 %1u 列 (轉檔自 DOS 格式)"
 
-#: src/files.c:323
+#: src/files.c:324
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已讀取 %1u 列"
 
-#: src/files.c:346
+#: src/files.c:347
 msgid "New File"
 msgstr "新檔案"
 
-#: src/files.c:349
+#: src/files.c:350
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:354
+#. Don't open character or block files.  Sorry, /dev/sndstat!
+#: src/files.c:355
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:355
+#: src/files.c:356
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "\"%s\" 是一個裝置檔案"
 
-#: src/files.c:358 src/files.c:366 src/files.c:1399 src/files.c:1465
-#: src/files.c:1522 src/files.c:1621 src/files.c:2560 src/files.c:2576
-#: src/files.c:2635 src/files.c:2844 src/rcfile.c:717
+#. We can't open this dir for some reason.
+#. * Complain.
+#: src/files.c:359 src/files.c:367 src/files.c:1403 src/files.c:1469
+#: src/files.c:1526 src/files.c:1625 src/files.c:2564 src/files.c:2580
+#: src/files.c:2639 src/files.c:2848 src/rcfile.c:717
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
 
-#: src/files.c:370
+#: src/files.c:371
 msgid "Reading File"
 msgstr "正在讀取檔案"
 
-#: src/files.c:448
+#: src/files.c:449
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "無法插入 %s 外部的檔案"
 
-#: src/files.c:522
+#: src/files.c:523
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新緩衝區中執行的命令 [從 %s] "
 
-#: src/files.c:525
+#: src/files.c:526
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "執行的命令 [從 %s] "
 
-#: src/files.c:530
+#: src/files.c:531
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "所要插入新緩衝區的檔案 [從 %s] "
 
-#: src/files.c:533
+#: src/files.c:534
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "所要插入的檔案 [從 %s] "
 
-#: src/files.c:561 src/files.c:1787 src/files.c:2609 src/nano.c:3302
+#: src/files.c:561 src/files.c:1791 src/files.c:2613 src/nano.c:3361
 #: src/search.c:214 src/search.c:938 src/search.c:985
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/files.c:687
+#: src/files.c:697
 msgid "Key illegal in non-multibuffer mode"
 msgstr "非多重緩衝區模式中此按鍵無效"
 
-#: src/files.c:906
+#: src/files.c:916
 msgid "No more open file buffers"
 msgstr "無多餘檔案緩衝區可開啟"
 
-#: src/files.c:922
+#. And indicate the switch on the statusbar.
+#: src/files.c:932
 #, c-format
 msgid "Switched to %s"
 msgstr "切換至 %s"
 
-#: src/files.c:923 src/global.c:258 src/winio.c:2777
+#: src/files.c:933 src/global.c:258 src/winio.c:2783
 msgid "New Buffer"
 msgstr "新緩衝區"
 
-#: src/files.c:1354
+#: src/files.c:1358
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1369
+#: src/files.c:1373
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 設定下，無法前引或附加至符號連結檔"
 
-#: src/files.c:1443 src/files.c:1468 src/files.c:1481 src/files.c:1509
-#: src/files.c:1530 src/files.c:1548 src/files.c:1557 src/files.c:1578
-#: src/files.c:1586 src/files.c:1596 src/files.c:1628 src/files.c:1633
-#: src/files.c:2908 src/files.c:2917
+#: src/files.c:1447 src/files.c:1472 src/files.c:1485 src/files.c:1513
+#: src/files.c:1534 src/files.c:1552 src/files.c:1561 src/files.c:1582
+#: src/files.c:1590 src/files.c:1600 src/files.c:1632 src/files.c:1637
+#: src/files.c:2912 src/files.c:2921
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:1652
+#: src/files.c:1656
 #, c-format
 msgid "Wrote %u line"
 msgid_plural "Wrote %u lines"
 msgstr[0] "已寫入 %u 列"
 
-#: src/files.c:1746
+#: src/files.c:1750
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:1748
+#: src/files.c:1752
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:1753
+#: src/files.c:1757
 msgid " [Backup]"
 msgstr " [備份]"
 
-#: src/files.c:1760
+#: src/files.c:1764
 msgid "Prepend Selection to File"
 msgstr "前引選擇部份於檔案"
 
-#: src/files.c:1762
+#: src/files.c:1766
 msgid "Append Selection to File"
 msgstr "附加選擇部份至檔案"
 
-#: src/files.c:1764
+#: src/files.c:1768
 msgid "Write Selection to File"
 msgstr "寫入選擇部份至檔案"
 
-#: src/files.c:1768
+#: src/files.c:1772
 msgid "File Name to Prepend to"
 msgstr "要前引於的檔案名稱"
 
-#: src/files.c:1770
+#: src/files.c:1774
 msgid "File Name to Append to"
 msgstr "要附加至的檔案名稱"
 
-#: src/files.c:1772
+#: src/files.c:1776
 msgid "File Name to Write"
 msgstr "要寫入的檔案名稱"
 
-#: src/files.c:1846
+#: src/files.c:1850
 msgid "File exists, OVERWRITE ? "
 msgstr "檔案已存在，要覆寫嗎？"
 
-#: src/files.c:1860
+#: src/files.c:1864
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以不同的名稱存檔？"
 
-#: src/files.c:2253
+#: src/files.c:2257
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2541
+#: src/files.c:2545
 msgid "Can't move up a directory"
 msgstr "無法上移一個目錄"
 
-#: src/files.c:2552 src/files.c:2624
+#: src/files.c:2556 src/files.c:2628
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "在限制模式中無法至 %s 外部"
 
-#: src/files.c:2603
+#: src/files.c:2607
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/files.c:2700 src/files.c:2705
+#: src/files.c:2704 src/files.c:2709
 msgid "(dir)"
 msgstr "(目錄)"
 
-#: src/files.c:2847 src/rcfile.c:674
+#: src/files.c:2851 src/rcfile.c:674
 #, c-format
 msgid ""
 "\n"
@@ -237,7 +242,7 @@ msgstr "置換"
 msgid "Go To Line"
 msgstr "跳列"
 
-#: src/global.c:239 src/winio.c:3673
+#: src/global.c:239 src/winio.c:3685
 msgid "Cancel"
 msgstr "取消"
 
@@ -509,38 +514,55 @@ msgstr "跳至目錄"
 msgid "Close"
 msgstr "關閉"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:401
 msgid "WriteOut"
 msgstr "寫入"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:406
 msgid "Justify"
 msgstr "對齊"
 
+#. We allow inserting files in view mode if multibuffers are
+#. * available, so that we can view multiple files.
+#. If we're using restricted mode, inserting files is disabled since
+#. * it allows reading from or writing to files not specified on the
+#. * command line.
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:422
 msgid "Read File"
 msgstr "讀檔"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:434
 msgid "Where Is"
 msgstr "搜尋"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:449
 msgid "Cut Text"
 msgstr "剪下文字"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:455
 msgid "UnJustify"
 msgstr "還原對齊"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:460
 msgid "UnCut Txt"
 msgstr "還原剪下"
 
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:465
 msgid "Cur Pos"
 msgstr "游標位置"
 
+#. If we're using restricted mode, spell checking is disabled
+#. * because it allows reading from or writing to files not specified
+#. * on the command line.
+#. Translators: try to keep this string under 10 characters long
 #: src/global.c:473
 msgid "To Spell"
 msgstr "拼字檢查"
@@ -621,6 +643,7 @@ msgstr "原形輸入"
 msgid "Find Other Bracket"
 msgstr "尋找其他括號"
 
+#. Translators: try to keep this string under 12 characters long
 #: src/global.c:709
 msgid "No Replace"
 msgstr "不置換"
@@ -657,6 +680,7 @@ msgstr "外部命令"
 msgid "Insert File"
 msgstr "插入檔案"
 
+#. Translators: try to keep this string under 22 characters long
 #: src/global.c:1010
 msgid "Go To Dir"
 msgstr "跳至目錄"
@@ -701,7 +725,7 @@ msgstr "不從 DOS/Mac 格式轉檔"
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1112 src/nano.c:987
+#: src/global.c:1112 src/nano.c:1040
 msgid "Smooth scrolling"
 msgstr "平滑式捲動畫面"
 
@@ -747,36 +771,42 @@ msgstr ""
 msgid "Window size is too small for nano...\n"
 msgstr "視窗尺寸對 nano 而言太小了...\n"
 
-#: src/nano.c:283
+#: src/nano.c:286
+#, fuzzy
 msgid ""
 "Search Command Help Text\n"
 "\n"
-" Enter the words or characters you would like to search for, then hit "
+" Enter the words or characters you would like to search for, and then press "
 "Enter.  If there is a match for the text you entered, the screen will be "
 "updated to the location of the nearest match for the search string.\n"
 "\n"
 " The previous search string will be shown in brackets after the search "
 "prompt.  Hitting Enter without entering any text will perform the previous "
-"search.  If you have selected text with the mark and then search to replace, "
-"only matches in the selected text will be replaced.\n"
-"\n"
-" The following function keys are available in Search mode:\n"
-"\n"
+"search.  "
 msgstr ""
 "搜尋命令輔助說明\n"
 "\n"
-" 首先輸入你想要搜尋的字串或字元，然後按下輸入鍵 (Enter)。如果存在著符合 "
-"你所輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
+" 首先輸入你想要搜尋的字串或字元，然後按下輸入鍵 (Enter)。如果存在著符合 你所"
+"輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
 "\n"
-" 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字而 "
-"直接按下輸入鍵則會履行前次的搜尋。如果你已經用標記選擇了一段文字並進行 "
-"搜尋替換，就只有在選擇文字中符合者將會被替換。\n"
+" 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字而 直接按"
+"下輸入鍵則會履行前次的搜尋。如果你已經用標記選擇了一段文字並進行 搜尋替換，就"
+"只有在選擇文字中符合者將會被替換。\n"
 "\n"
 " 以下的功能鍵可用於搜尋模式: \n"
 "\n"
 
 #: src/nano.c:295
 msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+
+#: src/nano.c:301
+msgid ""
 "Go To Line Help Text\n"
 "\n"
 " Enter the line number that you wish to go to and hit Enter.  If there are "
@@ -788,13 +818,14 @@ msgid ""
 msgstr ""
 "跳列輔助說明\n"
 "\n"
-" 首先輸入你想去的列數編號並按下輸入鍵 (Enter)。如果文章中的列數比你所輸 "
-"入要少，你將會被帶至檔案的最後一列。\n"
+" 首先輸入你想去的列數編號並按下輸入鍵 (Enter)。如果文章中的列數比你所輸 入要"
+"少，你將會被帶至檔案的最後一列。\n"
 "\n"
 " 以下的功能鍵可用於跳列模式: \n"
 "\n"
 
-#: src/nano.c:302
+#: src/nano.c:310
+#, fuzzy
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -802,33 +833,38 @@ msgid ""
 "the current cursor location.\n"
 "\n"
 " If you have compiled nano with multiple file buffer support, and enable "
-"multiple buffers with the -F or --multibuffer command line flags, the Meta-F "
-"toggle, or a nanorc file, inserting a file will cause it to be loaded into a "
-"separate buffer (use Meta-< and > to switch between file buffers). If you "
-"need another blank buffer, do not enter any filename, or type in a "
-"nonexistent filename at the prompt and press Enter.\n"
-"\n"
-" The following function keys are available in Insert File mode:\n"
-"\n"
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
+"into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 "插入檔案輔助說明\n"
 "\n"
 " 先把檔案的名稱鍵入，它將會插入在目前緩衝區的游標所在之處。\n"
 "\n"
-" 如果你所編譯的 nano 支援多重檔案緩衝區，並且將此功能以命令列旗標 -F 或 "
-"--multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 "
-"將會被載入另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。如果 "
-"你需要另一個空的緩衝區，那就不要輸入任何檔名，或是在提示符號後鍵入一個 "
-"不存在的檔名，然後按下輸入鍵。\n"
+" 如果你所編譯的 nano 支援多重檔案緩衝區，並且將此功能以命令列旗標 -F 或 --"
+"multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 將會被載入"
+"另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。如果 你需要另一個空的緩"
+"衝區，那就不要輸入任何檔名，或是在提示符號後鍵入一個 不存在的檔名，然後按下輸"
+"入鍵。\n"
 "\n"
 " 以下的功能鍵可用於插入檔案模式: \n"
 "\n"
 
-#: src/nano.c:315
+#: src/nano.c:319
+msgid ""
+"If you need another blank buffer, do not enter any filename, or type in a "
+"nonexistent filename at the prompt and press Enter.\n"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+
+#: src/nano.c:325
+#, fuzzy
 msgid ""
 "Write File Help Text\n"
 "\n"
-" Type the name that you wish to save the current file as and hit Enter to "
+" Type the name that you wish to save the current file as and press Enter to "
 "save the file.\n"
 "\n"
 " If you have selected text with the mark, you will be prompted to save only "
@@ -843,14 +879,14 @@ msgstr ""
 "\n"
 " 先鍵入你想要以此來儲存目前檔案的名稱，並按下輸入鍵來儲存檔案。\n"
 "\n"
-" 如果已經用標記選擇了文字，那麼你將會被提示，只儲存標記部份到另外的檔 "
-"案。為了降低目前檔案只被其中部份覆寫的機會，在此模式下，目前的檔名不會 "
-"成為預設值。\n"
+" 如果已經用標記選擇了文字，那麼你將會被提示，只儲存標記部份到另外的檔 案。為"
+"了降低目前檔案只被其中部份覆寫的機會，在此模式下，目前的檔名不會 成為預設"
+"值。\n"
 "\n"
 " 以下的功能鍵可用於寫入檔案模式: \n"
 "\n"
 
-#: src/nano.c:326
+#: src/nano.c:339
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -865,14 +901,14 @@ msgid ""
 msgstr ""
 "檔案選單輔助說明\n"
 "\n"
-" 檔案選單是用來視覺化瀏覽目錄結構，以選取要讀出或寫入的檔案。你可以 "
-"使用上下左右鍵或上頁/下頁來瀏覽，並用 S 或輸入鍵來選取所要的檔案或者 "
-"進入所選的目錄。要跳到上層時，選擇在檔案列表頂端名為 \"..\" 的目錄。\n"
+" 檔案選單是用來視覺化瀏覽目錄結構，以選取要讀出或寫入的檔案。你可以 使用上下"
+"左右鍵或上頁/下頁來瀏覽，並用 S 或輸入鍵來選取所要的檔案或者 進入所選的目錄。"
+"要跳到上層時，選擇在檔案列表頂端名為 \"..\" 的目錄。\n"
 "\n"
 " 以下的功能鍵可用於檔案選單: \n"
 "\n"
 
-#: src/nano.c:337
+#: src/nano.c:352
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -888,13 +924,13 @@ msgstr ""
 "\n"
 " 先輸入你想要瀏覽的目錄名稱。\n"
 "\n"
-" 如果跳格補正的功能沒有被關閉，你可以利用跳格鍵 (TAB) 去 (嘗試) "
-"自動補正目錄名稱。\n"
+" 如果跳格補正的功能沒有被關閉，你可以利用跳格鍵 (TAB) 去 (嘗試) 自動補正目錄"
+"名稱。\n"
 "\n"
 " 以下的功能鍵可用於跳至目錄模式: \n"
 "\n"
 
-#: src/nano.c:346
+#: src/nano.c:365
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -909,34 +945,36 @@ msgid ""
 msgstr ""
 "拼字檢查輔助說明\n"
 "\n"
-" 拼字檢查程式會檢查目前檔案中所有文字的拼法。當遇到一個未知的字，它會 "
-"被標記起來，並讓你編輯替代文字。對於目前檔案中每一個拼錯的字，都會顯示 "
-"置換的提示；或者，如果已經用標記選擇了文字的話，那就只作用於選取的文字 "
-"之中。\n"
+" 拼字檢查程式會檢查目前檔案中所有文字的拼法。當遇到一個未知的字，它會 被標記"
+"起來，並讓你編輯替代文字。對於目前檔案中每一個拼錯的字，都會顯示 置換的提示；"
+"或者，如果已經用標記選擇了文字的話，那就只作用於選取的文字 之中。\n"
 "\n"
 " 以下的功能鍵可用於拼字檢查模式: \n"
 "\n"
 
-#: src/nano.c:358
+#: src/nano.c:380
+#, fuzzy
 msgid ""
-"External Command Help Text\n"
+"Execute Command Help Text\n"
 "\n"
 " This menu allows you to insert the output of a command run by the shell "
-"into the current buffer (or a new buffer in multibuffer mode). If you need "
-"another blank buffer, do not enter any command.\n"
+"into the current buffer (or a new buffer in multiple file buffer mode). If "
+"you need another blank buffer, do not enter any command.\n"
 "\n"
-" The following keys are available in this mode:\n"
+" The following keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
 "外部命令輔助說明\n"
 "\n"
-" 本選單允許你將 shell 執行的命令輸出結果，插入目前的緩衝區 (或是多重緩衝 "
-"區模式下的新緩衝區)。如果你需要另一個空白緩衝區，就不要輸入任何命令。\n"
+" 本選單允許你將 shell 執行的命令輸出結果，插入目前的緩衝區 (或是多重緩衝 區模"
+"式下的新緩衝區)。如果你需要另一個空白緩衝區，就不要輸入任何命令。\n"
 "\n"
 " 以下的功能鍵可用於外部命令模式: \n"
 "\n"
 
-#: src/nano.c:367
+#. Default to the main help list.
+#: src/nano.c:393
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -945,49 +983,57 @@ msgid ""
 "top line shows the program version, the current filename being edited, and "
 "whether or not the file has been modified.  Next is the main editor window "
 "showing the file being edited.  The status line is the third line from the "
-"bottom and shows important messages. The bottom two lines show the most "
+"bottom and shows important messages.  The bottom two lines show the most "
 "commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Esc key twice.  Escape-key sequences are notated "
-"with the Meta (M) symbol and can be entered using either the Esc, Alt or "
-"Meta key depending on your keyboard setup.  Also, pressing Esc twice and "
-"then typing a three-digit decimal number from 000 to 255 will enter the "
-"character with the corresponding value.  The following keystrokes are "
-"available in the main editor window.  Alternative keys are shown in "
-"parentheses:\n"
-"\n"
+" "
 msgstr ""
 "nano 輔助說明\n"
 "\n"
-" nano 編輯器是設計來在功能性及易用性方面，模仿華盛頓大學的 Pico 文字 "
-"編輯器。它含有四個主要部份:頂列顯示程式版本、目前被編輯的檔案名稱， "
-"以及是否這檔案已經更動過。接著是主要編輯區，顯示正在編輯的檔案。狀態 "
-"列位於倒數第三列，用來顯示重要的訊息。底部的兩列則顯示編輯器中最常用 "
-"到的快捷鍵。\n"
+" nano 編輯器是設計來在功能性及易用性方面，模仿華盛頓大學的 Pico 文字 編輯器。"
+"它含有四個主要部份:頂列顯示程式版本、目前被編輯的檔案名稱， 以及是否這檔案已"
+"經更動過。接著是主要編輯區，顯示正在編輯的檔案。狀態 列位於倒數第三列，用來顯"
+"示重要的訊息。底部的兩列則顯示編輯器中最常用 到的快捷鍵。\n"
 "\n"
-" 快捷鍵的記號如以下所定義：控制鍵組 (Control-key) 序列是以一個 \"帽子\" "
-"(caret, ^) 符號來表示，它可以藉由控制鍵 (Ctrl) 或是按兩次脫離鍵 (Esc) "
-"來輸入。脫離鍵組 (Escape-key) 序列是以 \"中介\" (Meta, M) 符號表示，它 "
-"可以依照你的鍵盤設定，利用 Esc，Alt 或 Meta 來輸入。另外，按 Esc 兩次 "
-"之後再鍵入從 000 到 255 之間的三位數字，則會輸入該 ASCII 碼對應的字 "
-"元。下列按鍵組合可用於主要編輯區，替代按鍵則顯示於括弧內: \n"
+" 快捷鍵的記號如以下所定義：控制鍵組 (Control-key) 序列是以一個 \"帽子"
+"\" (caret, ^) 符號來表示，它可以藉由控制鍵 (Ctrl) 或是按兩次脫離鍵 (Esc) 來輸"
+"入。脫離鍵組 (Escape-key) 序列是以 \"中介\" (Meta, M) 符號表示，它 可以依照你"
+"的鍵盤設定，利用 Esc，Alt 或 Meta 來輸入。另外，按 Esc 兩次 之後再鍵入從 000 "
+"到 255 之間的三位數字，則會輸入該 ASCII 碼對應的字 元。下列按鍵組合可用於主要"
+"編輯區，替代按鍵則顯示於括弧內: \n"
+"\n"
+
+#: src/nano.c:404
+msgid ""
+"The notation for shortcuts is as follows: Control-key sequences are notated "
+"with a caret (^) symbol and can be entered either by using the Control "
+"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
+"notated with the Meta (M) symbol and can be entered using either the Esc, "
+"Alt, or Meta key depending on your keyboard setup.  "
+msgstr ""
+
+#: src/nano.c:411
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
 "\n"
+msgstr ""
 
-#: src/nano.c:402 src/nano.c:528
+#: src/nano.c:441 src/nano.c:572
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
-#: src/nano.c:433 src/winio.c:2946
+#: src/nano.c:477 src/winio.c:2958
 msgid "Up"
 msgstr "Up"
 
-#: src/nano.c:441 src/nano.c:477
+#: src/nano.c:485 src/nano.c:521
 msgid "Space"
 msgstr "Space"
 
-#: src/nano.c:953
+#: src/nano.c:1006
 #, c-format
 msgid ""
 "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
@@ -996,12 +1042,12 @@ msgstr ""
 "用法: nano [+列數] [GNU 長選項] [選項] [檔案名稱]\n"
 "\n"
 
-#: src/nano.c:954
+#: src/nano.c:1007
 #, c-format
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "選項\t\tGNU 長選項\t\t意義\n"
 
-#: src/nano.c:956
+#: src/nano.c:1009
 #, c-format
 msgid ""
 "Usage: nano [+LINE] [option] [file]\n"
@@ -1010,210 +1056,210 @@ msgstr ""
 "用法: nano [+列數] [選項] [檔案名稱]\n"
 "\n"
 
-#: src/nano.c:957
+#: src/nano.c:1010
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "選項\t\t意義\n"
 
-#: src/nano.c:960
+#: src/nano.c:1013
 msgid "Show this message"
 msgstr "顯示此訊息"
 
-#: src/nano.c:961
+#: src/nano.c:1014
 msgid "+LINE"
 msgstr "+列數"
 
-#: src/nano.c:961
+#: src/nano.c:1014
 msgid "Start at line number LINE"
 msgstr "從所指列數開始"
 
-#: src/nano.c:963
+#: src/nano.c:1016
 msgid "Enable smart home key"
 msgstr "開啟智慧型 HOME 按鍵功能"
 
-#: src/nano.c:964
+#: src/nano.c:1017
 msgid "Backup existing files on save"
 msgstr "儲存時備份原始檔案"
 
-#: src/nano.c:965
+#: src/nano.c:1018
 msgid "-E [dir]"
 msgstr "-E [目錄]"
 
-#: src/nano.c:965
+#: src/nano.c:1018
 msgid "--backupdir=[dir]"
 msgstr "--backupdir=[目錄]"
 
-#: src/nano.c:965
+#: src/nano.c:1018
 msgid "Directory for writing backup files"
 msgstr "寫入備份檔案的目錄"
 
-#: src/nano.c:968
+#: src/nano.c:1021
 msgid "Enable multiple file buffers"
 msgstr "開啟多重檔案緩衝區功能"
 
-#: src/nano.c:972
+#: src/nano.c:1025
 msgid "Log & read search/replace string history"
 msgstr "記錄與讀取 搜尋/置換 的歷史字串"
 
-#: src/nano.c:974
+#: src/nano.c:1027
 msgid "Don't look at nanorc files"
 msgstr "不要參考 nanorc 檔案"
 
-#: src/nano.c:977
+#: src/nano.c:1030
 msgid "Don't convert files from DOS/Mac format"
 msgstr "不要從 DOS/Mac 格式轉檔"
 
-#: src/nano.c:979
+#: src/nano.c:1032
 msgid "Use more space for editing"
 msgstr "編輯時使用更多空間"
 
-#: src/nano.c:981
+#: src/nano.c:1034
 msgid "-Q [str]"
 msgstr "-Q [字串]"
 
-#: src/nano.c:981
+#: src/nano.c:1034
 msgid "--quotestr=[str]"
 msgstr "--quotestr=[字串]"
 
-#: src/nano.c:981
+#: src/nano.c:1034
 msgid "Quoting string, default \"> \""
 msgstr "引用字串，預設 \"> \""
 
-#: src/nano.c:984
+#: src/nano.c:1037
 msgid "Do regular expression searches"
 msgstr "以正規表示式搜尋"
 
-#: src/nano.c:989
+#: src/nano.c:1042
 msgid "-T [#cols]"
 msgstr "-T [#行數]"
 
-#: src/nano.c:989
+#: src/nano.c:1042
 msgid "--tabsize=[#cols]"
 msgstr "--tabsize=[#行數]"
 
-#: src/nano.c:989
+#: src/nano.c:1042
 msgid "Set width of a tab in cols to #cols"
 msgstr "設定跳格寬度為 #行數"
 
-#: src/nano.c:990
+#: src/nano.c:1043
 msgid "Print version information and exit"
 msgstr "顯示版本資訊並離開"
 
-#: src/nano.c:992
+#: src/nano.c:1045
 msgid "-Y [str]"
 msgstr "-Y [字串]"
 
-#: src/nano.c:992
+#: src/nano.c:1045
 msgid "--syntax=[str]"
 msgstr "--syntax=[字串]"
 
-#: src/nano.c:992
+#: src/nano.c:1045
 msgid "Syntax definition to use"
 msgstr "字串做為語法定義"
 
-#: src/nano.c:994
+#: src/nano.c:1047
 msgid "Restricted mode"
 msgstr "限制模式"
 
-#: src/nano.c:995
+#: src/nano.c:1048
 msgid "Constantly show cursor position"
 msgstr "持續顯示游標位置"
 
-#: src/nano.c:997
+#: src/nano.c:1049
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正 退格鍵/刪除鍵 混淆問題"
 
-#: src/nano.c:998
+#: src/nano.c:1051
 msgid "Automatically indent new lines"
 msgstr "自動縮排新列"
 
-#: src/nano.c:999
+#: src/nano.c:1052
 msgid "Cut from cursor to end of line"
 msgstr "從游標剪下至列尾"
 
-#: src/nano.c:1001
+#: src/nano.c:1054
 msgid "Don't follow symbolic links, overwrite"
 msgstr "不要依照符號連結，而是覆寫"
 
-#: src/nano.c:1003
+#: src/nano.c:1056
 msgid "Enable mouse"
 msgstr "開啟滑鼠功能"
 
-#: src/nano.c:1006
+#: src/nano.c:1059
 msgid "-o [dir]"
 msgstr "-o [目錄]"
 
-#: src/nano.c:1006
+#: src/nano.c:1059
 msgid "--operatingdir=[dir]"
 msgstr "--operatingdir=[目錄]"
 
-#: src/nano.c:1006
+#: src/nano.c:1059
 msgid "Set operating directory"
 msgstr "設定操作目錄"
 
-#: src/nano.c:1008
+#: src/nano.c:1061
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "保留 XON (^Q) 和 XOFF (^S) 按鍵"
 
-#: src/nano.c:1010
+#: src/nano.c:1063
 msgid "-r [#cols]"
 msgstr "-r [#行數]"
 
-#: src/nano.c:1010
+#: src/nano.c:1063
 msgid "--fill=[#cols]"
 msgstr "--fill=[#行數]    "
 
-#: src/nano.c:1010
+#: src/nano.c:1063
 msgid "Set fill cols to (wrap lines at) #cols"
 msgstr "設定行數填滿 (換列) 於 #行數"
 
-#: src/nano.c:1013
+#: src/nano.c:1066
 msgid "-s [prog]"
 msgstr "-s [程式]"
 
-#: src/nano.c:1013
+#: src/nano.c:1066
 msgid "--speller=[prog]"
 msgstr "--speller=[程式]"
 
-#: src/nano.c:1013
+#: src/nano.c:1066
 msgid "Enable alternate speller"
 msgstr "啟用替代的拼字檢查程式"
 
-#: src/nano.c:1015
+#: src/nano.c:1068
 msgid "Auto save on exit, don't prompt"
 msgstr "離開時自動儲存，不要提示"
 
-#: src/nano.c:1016
+#: src/nano.c:1069
 msgid "View (read only) mode"
 msgstr "觀看 (唯讀) 模式"
 
-#: src/nano.c:1018
+#: src/nano.c:1071
 msgid "Don't wrap long lines"
 msgstr "不要自動換列"
 
-#: src/nano.c:1020
+#: src/nano.c:1073
 msgid "Don't show help window"
 msgstr "不要顯示輔助區"
 
-#: src/nano.c:1021
+#: src/nano.c:1074
 msgid "Enable suspend"
 msgstr "開啟暫停功能"
 
-#: src/nano.c:1024
+#: src/nano.c:1078
 msgid "(ignored, for Pico compatibility)"
 msgstr "(忽略，為了與 Pico 相容)"
 
-#: src/nano.c:1031
+#: src/nano.c:1085
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
 
-#: src/nano.c:1034
+#: src/nano.c:1088
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 電子郵件: nano@nano-editor.org\t\t網頁: http://www.nano-editor.org/"
 
-#: src/nano.c:1035
+#: src/nano.c:1089
 #, c-format
 msgid ""
 "\n"
@@ -1222,125 +1268,125 @@ msgstr ""
 "\n"
 " 編譯選項:"
 
-#: src/nano.c:1104
+#: src/nano.c:1158
 msgid "Sorry, support for this function has been disabled"
 msgstr "抱歉，已經關閉此功能的支援"
 
-#: src/nano.c:1132
+#: src/nano.c:1186
 msgid "Could not pipe"
 msgstr "管線功能無效"
 
-#: src/nano.c:1154 src/nano.c:2033 src/nano.c:2178
+#: src/nano.c:1208 src/nano.c:2088 src/nano.c:2233
 msgid "Could not fork"
 msgstr "執行功能無效"
 
-#: src/nano.c:1208
+#: src/nano.c:1263
 msgid "Verbatim input"
 msgstr "原形輸入"
 
-#: src/nano.c:1547
+#: src/nano.c:1602
 msgid "Mark Set"
 msgstr "標記設定"
 
-#: src/nano.c:1551
+#: src/nano.c:1606
 msgid "Mark UNset"
 msgstr "標記解除"
 
-#: src/nano.c:1858
+#: src/nano.c:1913
 msgid "Edit a replacement"
 msgstr "編輯替代文字"
 
-#: src/nano.c:1940
+#: src/nano.c:1995
 msgid "Could not create pipe"
 msgstr "無法建立管線功能"
 
-#: src/nano.c:1942
+#: src/nano.c:1997
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立錯字列表，請稍待..."
 
-#: src/nano.c:2039
+#: src/nano.c:2094
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩衝區大小"
 
-#: src/nano.c:2090
+#: src/nano.c:2145
 msgid "Error invoking \"spell\""
 msgstr "呼叫 \"spell\" 錯誤"
 
-#: src/nano.c:2093
+#: src/nano.c:2148
 msgid "Error invoking \"sort -f\""
 msgstr "呼叫 \"sort -f\" 錯誤"
 
-#: src/nano.c:2096
+#: src/nano.c:2151
 msgid "Error invoking \"uniq\""
 msgstr "呼叫 \"uniq\" 錯誤"
 
-#: src/nano.c:2186
+#: src/nano.c:2241
 #, c-format
 msgid "Could not invoke \"%s\""
 msgstr "無法呼叫 \"%s\""
 
-#: src/nano.c:2300
+#: src/nano.c:2358
 #, c-format
 msgid "Could not create temp file: %s"
 msgstr "無法建立暫存檔案: %s"
 
-#: src/nano.c:2312
+#: src/nano.c:2370
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
 
-#: src/nano.c:2329
+#: src/nano.c:2387
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/nano.c:2332
+#: src/nano.c:2390
 msgid "Finished checking spelling"
 msgstr "拼字檢查結束"
 
-#: src/nano.c:2871
+#: src/nano.c:2929
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "不良引用字串 %s: %s"
 
-#: src/nano.c:3190
+#: src/nano.c:3249
 msgid "Can now UnJustify!"
 msgstr "現在可以還原對齊！"
 
-#: src/nano.c:3289
+#: src/nano.c:3348
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "儲存更動過的緩衝區嗎 (回答 \"No\" 會撤銷修改)？"
 
-#: src/nano.c:3348
+#: src/nano.c:3407
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:3355
+#: src/nano.c:3414
 msgid "Use \"fg\" to return to nano"
 msgstr "利用 \"fg\" 來回到 nano"
 
-#: src/nano.c:3514
+#: src/nano.c:3573
 msgid "enabled"
 msgstr "é–‹å•Ÿ"
 
-#: src/nano.c:3514
+#: src/nano.c:3573
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:3689
+#: src/nano.c:3748
 msgid "XON ignored, mumble mumble."
 msgstr "忽略 XON，嗯嗯"
 
-#: src/nano.c:3692
+#: src/nano.c:3751
 msgid "XOFF ignored, mumble mumble."
 msgstr "忽略 XOFF，嗯嗯"
 
-#: src/nano.c:4079 src/rcfile.c:644
+#: src/nano.c:4138 src/rcfile.c:644
 #, c-format
 msgid "Requested tab size %s invalid"
 msgstr "所要求的跳格寬度 %s 無效"
 
-#: src/nano.c:4128 src/rcfile.c:577
+#: src/nano.c:4187 src/rcfile.c:577
 #, c-format
 msgid "Requested fill size %s invalid"
 msgstr "所要求的填滿行數 %s 無效"
@@ -1445,14 +1491,20 @@ msgstr "找不到 \"%.*s%s\""
 msgid "Search"
 msgstr "搜尋"
 
+#. This string is just a modifier for the search prompt; no
+#. * grammar is implied.
 #: src/search.c:175
 msgid " [Case Sensitive]"
 msgstr " [符合大小寫]"
 
+#. This string is just a modifier for the search prompt; no
+#. * grammar is implied.
 #: src/search.c:182
 msgid " [Regexp]"
 msgstr " [正規表示式]"
 
+#. This string is just a modifier for the search prompt; no
+#. * grammar is implied.
 #: src/search.c:189
 msgid " [Backwards]"
 msgstr " [向後搜尋]"
@@ -1503,91 +1555,101 @@ msgstr "別這樣，理性一點"
 msgid "Not a bracket"
 msgstr "並非一個括號"
 
+#. Didn't find either a left or right bracket.
 #: src/search.c:1115
 msgid "No matching bracket"
 msgstr "無對應括號"
 
-#: src/utils.c:287 src/utils.c:297
+#: src/utils.c:294 src/utils.c:304
 msgid "nano is out of memory!"
 msgstr "nano 已耗盡記憶體！"
 
-#: src/winio.c:2754 src/winio.c:2759
+#: src/winio.c:2758 src/winio.c:2763
 msgid "Modified"
 msgstr "已更動"
 
-#: src/winio.c:2756
+#: src/winio.c:2760
 msgid "View"
 msgstr "觀看"
 
-#: src/winio.c:2773
+#: src/winio.c:2779
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2780
+#: src/winio.c:2786
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:3127
+#: src/winio.c:3139
 msgid "Refusing zero-length regex match"
 msgstr "拒絕符合長度為零的正規表示式"
 
-#: src/winio.c:3645
+#. String of yes characters accepted.
+#. Same for no.
+#. And all, surprise!
+#. yesstr, nostr, and allstr are strings of any length.  Each string
+#. * consists of all characters accepted as a valid character for that
+#. * value.  The first value will be the one displayed in the
+#. * shortcuts.  Translators: if possible, specify both the shortcuts
+#. * for your language and English.  For example, in French: "OoYy"
+#. * for "Oui".
+#: src/winio.c:3657
 msgid "Yy"
 msgstr "Yy"
 
-#: src/winio.c:3646
+#: src/winio.c:3658
 msgid "Nn"
 msgstr "Nn"
 
-#: src/winio.c:3647
+#: src/winio.c:3659
 msgid "Aa"
 msgstr "Aa"
 
-#: src/winio.c:3660
+#: src/winio.c:3672
 msgid "Yes"
 msgstr "是"
 
-#: src/winio.c:3665
+#: src/winio.c:3677
 msgid "All"
 msgstr "全部"
 
-#: src/winio.c:3670
+#: src/winio.c:3682
 msgid "No"
 msgstr "否"
 
-#: src/winio.c:3811
+#: src/winio.c:3823
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 msgstr "列 %ld/%ld (%d%%), 行 %lu/%lu (%d%%), 字元 %lu/%ld (%d%%)"
 
-#: src/winio.c:4118
+#: src/winio.c:4130
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:4119
+#: src/winio.c:4131
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:4120
+#: src/winio.c:4132
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:4121
+#: src/winio.c:4133
 msgid "Special thanks to:"
 msgstr "特別感謝:"
 
-#: src/winio.c:4122
+#: src/winio.c:4134
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:4123
+#: src/winio.c:4135
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:4124
+#: src/winio.c:4136
 msgid "and anyone else we forgot..."
 msgstr "以及其他我們不記得的人..."
 
-#: src/winio.c:4125
+#: src/winio.c:4137
 msgid "Thank you for using nano!"
 msgstr "謝謝你使用 nano！"