Imported Upstream version 7.3.5upstream/7.3.5

Change-Id: If401ea1da0876f720539b64ea208bc4e47e084fa
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 135 insertions, 138 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1fad20..7d820b0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 6.0.5-b3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-12 22:42+0200\n"
+"POT-Creation-Date: 2017-06-20 19:25+0200\n"
 "PO-Revision-Date: 2014-03-14 00:43+0800\n"
 "Last-Translator: mail6543210 <mail6543210@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -14,6 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -27,7 +28,7 @@ msgid ""
 "All rights reserved.\n"
 "\n"
 msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-2014 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (版本 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (版本 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -35,9 +36,9 @@ msgstr ""
 "\n"
 
 #: dos2unix.c:212 dos2unix.c:249 unix2dos.c:149 unix2dos.c:209
-#, c-format
+#, fuzzy, c-format
 msgid "Binary symbol 0x00%02X found at line %u\n"
-msgstr "找到二進位符號0x00%02X 在第%u 行\n"
+msgstr "找到二進位符號0x00%02X 在第%d 行\n"
 
 #: dos2unix.c:305 dos2unix.c:488 unix2dos.c:261 unix2dos.c:461
 #, c-format
@@ -55,9 +56,9 @@ msgid "using code page %d.\n"
 msgstr "使用 %d 編碼頁。\n"
 
 #: dos2unix.c:395 dos2unix.c:432 unix2dos.c:349 unix2dos.c:409
-#, c-format
+#, fuzzy, c-format
 msgid "Binary symbol 0x%02X found at line %u\n"
-msgstr "找到二進位符號0x%02X 在第%u 行\n"
+msgstr "找到二進位符號0x%02X 在第%d 行\n"
 
 #: dos2unix.c:529 unix2dos.c:502
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
@@ -71,12 +72,22 @@ msgid ""
 "All rights reserved.\n"
 "\n"
 msgstr ""
-"Copyright © 2009-2015 Erwin Waterlander\n"
+"Copyright © 2009-2014 Erwin Waterlander\n"
 "Copyright © 1994-1995 Benjamin Lin\n"
 "保留所有權利。\n"
 "\n"
 
-#: common.c:576
+#: common.c:82
+#, fuzzy, c-format
+msgid "Failed to write to temporary output file %s:"
+msgstr "暫存檔寫入失敗%s：%s\n"
+
+#: common.c:84
+#, fuzzy, c-format
+msgid "Failed to close input file %s:"
+msgstr "暫存檔 %s 開啟失敗\n"
+
+#: common.c:612
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -98,7 +109,7 @@ msgstr ""
 "   the distribution.\n"
 "\n"
 
-#: common.c:586
+#: common.c:622
 msgid ""
 "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
 "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,58 +135,58 @@ msgstr ""
 "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 
-#: common.c:611
+#: common.c:647
 #, c-format
 msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
 msgstr "用法: %s [選項] [file ...] [-n infile outfile ...]\n"
 
-#: common.c:612
+#: common.c:648
 msgid " -ascii                convert only line breaks (default)\n"
 msgstr " -ascii                只轉換換行字元(預設)\n"
 
-#: common.c:613
+#: common.c:649
 msgid " -iso                  conversion between DOS and ISO-8859-1 character set\n"
 msgstr " -iso                  在DOS 和ISO-8859-1 字元集間轉換\n"
 
-#: common.c:614
+#: common.c:650
 msgid "   -1252               use Windows code page 1252 (Western European)\n"
 msgstr "   -1252               使用Windows 1252 編碼頁(西歐)\n"
 
-#: common.c:615
+#: common.c:651
 msgid "   -437                use DOS code page 437 (US) (default)\n"
 msgstr "   -437                使用DOS 437 編碼頁(US) (預設)\n"
 
-#: common.c:616
+#: common.c:652
 msgid "   -850                use DOS code page 850 (Western European)\n"
 msgstr "   -850                使用DOS 850 編碼頁(西歐)\n"
 
-#: common.c:617
+#: common.c:653
 msgid "   -860                use DOS code page 860 (Portuguese)\n"
 msgstr "   -860                使用DOS 860 編碼頁(葡萄牙)\n"
 
-#: common.c:618
+#: common.c:654
 msgid "   -863                use DOS code page 863 (French Canadian)\n"
 msgstr "   -863                使用DOS 863 編碼頁(加拿大法語)\n"
 
-#: common.c:619
+#: common.c:655
 msgid "   -865                use DOS code page 865 (Nordic)\n"
 msgstr "   -865                使用DOS 865 編碼頁(北歐)\n"
 
-#: common.c:620
+#: common.c:656
 msgid " -7                    convert 8 bit characters to 7 bit space\n"
 msgstr " -7                    轉換8 位元字元到7 位元空間\n"
 
-#: common.c:622
+#: common.c:658
 #, fuzzy
 msgid " -b, --keep-bom        keep Byte Order Mark\n"
 msgstr " -m, --add-bom         加入UTF-8 BOM\n"
 
-#: common.c:624
+#: common.c:660
 #, fuzzy
 msgid " -b, --keep-bom        keep Byte Order Mark (default)\n"
 msgstr " -m, --add-bom         加入UTF-8 BOM\n"
 
-#: common.c:625
+#: common.c:661
 msgid ""
 " -c, --convmode        conversion mode\n"
 "   convmode            ascii, 7bit, iso, mac, default to ascii\n"
@@ -183,28 +194,25 @@ msgstr ""
 " -c, --convmode        轉換模式\n"
 "   convmode            ascii, 7bit, iso, mac, 預設為ascii\n"
 
-#: common.c:628
-#, fuzzy
+#: common.c:664
 msgid ""
 " -D, --display-enc     set encoding of displayed text messages\n"
 "   encoding            ansi, unicode, utf8, default to ansi\n"
 msgstr ""
-" -c, --convmode        轉換模式\n"
-"   convmode            ascii, 7bit, iso, mac, 預設為ascii\n"
 
-#: common.c:631
+#: common.c:667
 msgid " -f, --force           force conversion of binary files\n"
 msgstr " -f, --force           強制轉換二進位檔案\n"
 
-#: common.c:634
+#: common.c:670
 msgid " -gb, --gb18030        convert UTF-16 to GB18030\n"
 msgstr ""
 
-#: common.c:637
+#: common.c:673
 msgid " -h, --help            display this help text\n"
 msgstr " -h, --help            顯示本說明文字\n"
 
-#: common.c:638
+#: common.c:674
 #, fuzzy
 msgid ""
 " -i, --info[=FLAGS]    display file information\n"
@@ -213,24 +221,24 @@ msgstr ""
 " -o, --oldfile         寫入原檔案(預設)\n"
 "   file ...            原檔模式中要轉換的檔案\n"
 
-#: common.c:640
+#: common.c:676
 msgid " -k, --keepdate        keep output file date\n"
 msgstr " -k, --keepdate        保留輸出檔時間\n"
 
-#: common.c:641
+#: common.c:677
 msgid " -L, --license         display software license\n"
 msgstr " -L, --license         顯示軟體授權\n"
 
-#: common.c:642
+#: common.c:678
 msgid " -l, --newline         add additional newline\n"
 msgstr " -l, --newline         加入額外的換行\n"
 
-#: common.c:643
+#: common.c:679
 #, fuzzy
 msgid " -m, --add-bom         add Byte Order Mark (default UTF-8)\n"
 msgstr " -m, --add-bom         加入UTF-8 BOM\n"
 
-#: common.c:644
+#: common.c:680
 msgid ""
 " -n, --newfile         write to new file\n"
 "   infile              original file in new-file mode\n"
@@ -240,7 +248,7 @@ msgstr ""
 "   infile              新檔模式中的原始檔案\n"
 "   outfile             新檔模式中的輸出檔案\n"
 
-#: common.c:647
+#: common.c:683
 msgid ""
 " -o, --oldfile         write to old file (default)\n"
 "   file ...            files to convert in old-file mode\n"
@@ -248,45 +256,48 @@ msgstr ""
 " -o, --oldfile         寫入原檔案(預設)\n"
 "   file ...            原檔模式中要轉換的檔案\n"
 
-#: common.c:649
+#: common.c:685
+#, fuzzy
 msgid " -q, --quiet           quiet mode, suppress all warnings\n"
-msgstr " -q, --quiet           安靜模式，抑制所有警告\n"
+msgstr ""
+" -q, --quiet           安靜模式，抑制所有警告\n"
+"                         (標準輸出入模式下永遠啟用)\n"
 
-#: common.c:651
+#: common.c:687
 #, fuzzy
 msgid " -r, --remove-bom      remove Byte Order Mark (default)\n"
 msgstr " -m, --add-bom         加入UTF-8 BOM\n"
 
-#: common.c:653
+#: common.c:689
 #, fuzzy
 msgid " -r, --remove-bom      remove Byte Order Mark\n"
 msgstr " -m, --add-bom         加入UTF-8 BOM\n"
 
-#: common.c:654
+#: common.c:690
 msgid " -s, --safe            skip binary files (default)\n"
 msgstr " -s, --safe            略過二進位檔案(預設)\n"
 
-#: common.c:656
+#: common.c:692
 msgid " -u,  --keep-utf16     keep UTF-16 encoding\n"
 msgstr ""
 
-#: common.c:657
+#: common.c:693
 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
 msgstr " -ul, --assume-utf16le 假設輸入檔格式為UTF-16LE\n"
 
-#: common.c:658
+#: common.c:694
 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
 msgstr " -ub, --assume-utf16be 假設輸入檔格式為UTF-16BE\n"
 
-#: common.c:660
+#: common.c:696
 msgid " -v,  --verbose        verbose operation\n"
 msgstr ""
 
-#: common.c:662
+#: common.c:698
 msgid " -F, --follow-symlink  follow symbolic links and convert the targets\n"
 msgstr " -F, --follow-symlink  依循符號連結轉換其目標檔案\n"
 
-#: common.c:665
+#: common.c:701
 msgid ""
 " -R, --replace-symlink replace symbolic links with converted files\n"
 "                         (original target files remain unchanged)\n"
@@ -294,245 +305,235 @@ msgstr ""
 " -R, --replace-symlink 取代符號連結為轉換後的檔案\n"
 "                         (原連結目標檔案保持不變)\n"
 
-#: common.c:667
+#: common.c:703
 msgid " -S, --skip-symlink    keep symbolic links and targets unchanged (default)\n"
 msgstr " -S, --skip-symlink    保持符號連結及其目標不變(預設)\n"
 
-#: common.c:669
+#: common.c:705
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         顯示版本號碼\n"
 
-#: common.c:681
+#: common.c:717
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "DOS 16 位元版本(WATCOMC)。\n"
 
-#: common.c:683
+#: common.c:719
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "DOS 16 位元版本(TURBOC)。\n"
 
-#: common.c:685
+#: common.c:721
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "DOS 32 位元版本(WATCOMC)。\n"
 
-#: common.c:687
+#: common.c:723
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "DOS 32 位元版本(DJGPP)。\n"
 
-#: common.c:689
+#: common.c:725
 msgid "MSYS version.\n"
 msgstr "MSYS 版本。\n"
 
-#: common.c:691
+#: common.c:727
 msgid "Cygwin version.\n"
 msgstr "Cygwin 版本。\n"
 
-#: common.c:693
+#: common.c:729
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Windows 64 位元版本(MinGW-w64)。\n"
 
-#: common.c:695
+#: common.c:731
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Windows 32 位元版本(WATCOMC)。\n"
 
-#: common.c:697
+#: common.c:733
 msgid "Windows 32 bit version (MinGW-w64).\n"
 msgstr "Windows 32 位元版本(MinGW-w64)。\n"
 
-#: common.c:699
+#: common.c:735
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows 32 位元版本(MinGW)。\n"
 
-#: common.c:701
+#: common.c:737
 #, c-format
 msgid "Windows 64 bit version (MSVC %d).\n"
 msgstr "Windows 64 位元版本(MSVC %d)。\n"
 
-#: common.c:703
+#: common.c:739
 #, c-format
 msgid "Windows 32 bit version (MSVC %d).\n"
 msgstr "Windows 32 位元版本(MSVC %d)。\n"
 
-#: common.c:705
+#: common.c:741
 msgid "OS/2 version (WATCOMC).\n"
 msgstr "OS/2 版本(WATCOMC)。\n"
 
-#: common.c:707
+#: common.c:743
 msgid "OS/2 version (EMX).\n"
 msgstr "OS/2 版本(EMX)。\n"
 
-#: common.c:709
+#: common.c:745
 #, fuzzy, c-format
 msgid "%s version.\n"
 msgstr "MSYS 版本。\n"
 
-#: common.c:715
+#: common.c:751
 msgid "With Unicode UTF-16 support.\n"
 msgstr "有Unicode UTF-16 支援。\n"
 
-#: common.c:717
+#: common.c:753
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "無Unicode UTF-16 支援。\n"
 
-#: common.c:721
+#: common.c:757
 #, fuzzy
 msgid "With Unicode file name support.\n"
 msgstr "有Unicode UTF-16 支援。\n"
 
-#: common.c:723
+#: common.c:759
 #, fuzzy
 msgid "Without Unicode file name support.\n"
 msgstr "無Unicode UTF-16 支援。\n"
 
-#: common.c:727
+#: common.c:763
 msgid "With native language support.\n"
 msgstr "含本地語言支援。\n"
 
-#: common.c:861
+#: common.c:899
 #, fuzzy
 msgid "Path for temporary output file is too long:"
-msgstr "暫存檔寫入失敗%s：%s\n"
+msgstr "暫存檔 %s 開啟失敗\n"
 
-#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175
-#: common.c:1182
+#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213
+#: common.c:1220
 #, c-format
 msgid "Writing %s BOM.\n"
 msgstr ""
 
-#: common.c:1142 common.c:1195 common.c:1718 common.c:1739
+#: common.c:1180 common.c:1233 common.c:1739 common.c:1760
 msgid "UTF-16LE"
 msgstr ""
 
-#: common.c:1149 common.c:1198 common.c:1720 common.c:1741
+#: common.c:1187 common.c:1236 common.c:1741 common.c:1762
 msgid "UTF-16BE"
 msgstr ""
 
-#: common.c:1156 common.c:1175 common.c:1204 common.c:1731
+#: common.c:1194 common.c:1213 common.c:1242 common.c:1752
 msgid "GB18030"
 msgstr ""
 
-#: common.c:1163 common.c:1182 common.c:1201 common.c:1733
+#: common.c:1201 common.c:1220 common.c:1239 common.c:1754
 msgid "UTF-8"
 msgstr ""
 
-#: common.c:1227
+#: common.c:1265
 #, c-format
 msgid "Input file %s has %s BOM.\n"
 msgstr ""
 
-#: common.c:1263 common.c:1306
+#: common.c:1301 common.c:1343
 msgid "Assuming UTF-16LE encoding.\n"
 msgstr ""
 
-#: common.c:1267 common.c:1310
+#: common.c:1305 common.c:1347
 msgid "Assuming UTF-16BE encoding.\n"
 msgstr ""
 
-#: common.c:1455
+#: common.c:1492
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "暫存檔 %s 開啟失敗\n"
 
-#: common.c:1467
+#: common.c:1504
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "使用 %s 作為暫存檔\n"
 
-#: common.c:1499 common.c:2158
-#, fuzzy, c-format
-msgid "Failed to close input file %s:"
-msgstr "暫存檔 %s 開啟失敗\n"
-
-#: common.c:1512
-#, fuzzy, c-format
-msgid "Failed to write to temporary output file %s:"
-msgstr "暫存檔寫入失敗%s：%s\n"
-
-#: common.c:1535
+#: common.c:1556
 #, fuzzy, c-format
 msgid "Failed to change the permissions of temporary output file %s:"
 msgstr "輸出暫存檔 %s 權限變更失敗：%s\n"
 
-#: common.c:1552
+#: common.c:1573
 #, fuzzy, c-format
 msgid "Failed to change the owner and group of temporary output file %s:"
 msgstr "輸出暫存檔 %s 擁有者及群組變更失敗：%s\n"
 
-#: common.c:1599
+#: common.c:1620
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "解析符號連結'%s' 發生問題\n"
 
-#: common.c:1600 common.c:1632
+#: common.c:1621 common.c:1653
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          輸出檔案'%s' 未改變\n"
 
-#: common.c:1626
+#: common.c:1647
 #, fuzzy, c-format
 msgid "problems renaming '%s' to '%s':"
 msgstr "重新命名「%s」到「%s」錯誤：%s\n"
 
-#: common.c:1630
+#: common.c:1651
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          後者為符號連結'%s' 的目標\n"
 
-#: common.c:1693 common.c:1785 common.c:1871
+#: common.c:1714 common.c:1806 common.c:1892
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "略過二進位檔案%s\n"
 
-#: common.c:1696 common.c:1788 common.c:1874
+#: common.c:1717 common.c:1809 common.c:1895
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "未支援%d 編碼頁。\n"
 
-#: common.c:1700 common.c:1792 common.c:1878 common.c:1938
+#: common.c:1721 common.c:1813 common.c:1899 common.c:1959
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "略過 UTF-16 檔案 %s，wchar_t 的大小是 %d 位元組。\n"
 
-#: common.c:1703 common.c:1795 common.c:1881
+#: common.c:1724 common.c:1816 common.c:1902
 #, fuzzy, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
 msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n"
 
-#: common.c:1707 common.c:1799 common.c:1885
+#: common.c:1728 common.c:1820 common.c:1906
 #, fuzzy, c-format
 msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
 msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n"
 
-#: common.c:1773 common.c:1862 common.c:1927
+#: common.c:1794 common.c:1883 common.c:1948
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "略過 %s，不是一個普通檔案。\n"
 
-#: common.c:1776
+#: common.c:1797
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "略過 %s，輸出檔 %s 是一個符號連結。.\n"
 
-#: common.c:1779 common.c:1868 common.c:1932
+#: common.c:1800 common.c:1889 common.c:1953
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "略過符號連結 %s，目標不是一個普通檔案。\n"
 
-#: common.c:1782
+#: common.c:1803
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr "略過 %s，符號連結 %s 目標不是一個普通檔案。\n"
 
-#: common.c:1805
+#: common.c:1826
 #, c-format
 msgid "converting file %s to file %s in Unix format...\n"
 msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
 
-#: common.c:1808
+#: common.c:1829
 #, c-format
 msgid "converting file %s to file %s in Mac format...\n"
 msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
 
-#: common.c:1810
+#: common.c:1831
 #, c-format
 msgid "converting file %s to file %s in DOS format...\n"
 msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
@@ -543,42 +544,42 @@ msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
 #. 3rd %s is encoding of output file.
 #. 4th %s is name of output file.
 #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1821
+#: common.c:1842
 #, fuzzy, c-format
 msgid "converting %s file %s to %s file %s in Unix format...\n"
 msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
 
-#: common.c:1824
+#: common.c:1845
 #, fuzzy, c-format
 msgid "converting %s file %s to %s file %s in Mac format...\n"
 msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
 
-#: common.c:1826
+#: common.c:1847
 #, fuzzy, c-format
 msgid "converting %s file %s to %s file %s in DOS format...\n"
 msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
 
-#: common.c:1832
+#: common.c:1853
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "轉換檔案 %s 到 %s 錯誤\n"
 
-#: common.c:1865
+#: common.c:1886
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "略過符號連結 %s。\n"
 
-#: common.c:1891
+#: common.c:1912
 #, c-format
 msgid "converting file %s to Unix format...\n"
 msgstr "正在轉換 %s 為Unix 格式...\n"
 
-#: common.c:1894
+#: common.c:1915
 #, c-format
 msgid "converting file %s to Mac format...\n"
 msgstr "正在轉換 %s 為Mac 格式...\n"
 
-#: common.c:1896
+#: common.c:1917
 #, c-format
 msgid "converting file %s to DOS format...\n"
 msgstr "正在轉換 %s 為DOS 格式...\n"
@@ -588,82 +589,78 @@ msgstr "正在轉換 %s 為DOS 格式...\n"
 #. 2nd %s is name of input file.
 #. 3rd %s is encoding of output (input file is overwritten).
 #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1906
+#: common.c:1927
 #, fuzzy, c-format
 msgid "converting %s file %s to %s Unix format...\n"
 msgstr "正在轉換 %s 為Unix 格式...\n"
 
-#: common.c:1909
+#: common.c:1930
 #, fuzzy, c-format
 msgid "converting %s file %s to %s Mac format...\n"
 msgstr "正在轉換 %s 為Mac 格式...\n"
 
-#: common.c:1911
+#: common.c:1932
 #, fuzzy, c-format
 msgid "converting %s file %s to %s DOS format...\n"
 msgstr "正在轉換 %s 為DOS 格式...\n"
 
-#: common.c:1917
+#: common.c:1938
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "轉換檔案 %s 錯誤\n"
 
-#: common.c:2039 common.c:2089
+#: common.c:2071 common.c:2121
 #, fuzzy, c-format
 msgid "can not read from input file %s:"
 msgstr "無法寫入輸出檔：%s\n"
 
-#: common.c:2257
+#: common.c:2281
 #, c-format
 msgid "wrong flag '%c' for option -i or --info\n"
 msgstr ""
 
-#: common.c:2382 common.c:2425
+#: common.c:2406 common.c:2449
 #, c-format
 msgid "active code page: %d\n"
 msgstr "作用中編碼頁：%d\n"
 
-#: common.c:2437
+#: common.c:2461
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "指定的轉換模式 %s 不合法\n"
 
-#: common.c:2445 common.c:2475
+#: common.c:2469 common.c:2499
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "選項'%s' 需要一個引數\n"
 
-#: common.c:2467
+#: common.c:2491
 #, fuzzy, c-format
 msgid "invalid %s display encoding specified\n"
 msgstr "指定的轉換模式 %s 不合法\n"
 
-#: common.c:2487 common.c:2500 common.c:2566
+#: common.c:2511 common.c:2524 common.c:2590
 #, c-format
 msgid "target of file %s not specified in new-file mode\n"
 msgstr "新檔模式中未指明檔案 %s 的目的位置\n"
 
-#: common.c:2578
+#: common.c:2602
 #, fuzzy, c-format
 msgid "can not read from input file: %s\n"
 msgstr "無法寫入輸出檔：%s\n"
 
-#: common.c:2588 common.c:2600
+#: common.c:2612 common.c:2624
 #, c-format
 msgid "can not write to output file: %s\n"
 msgstr "無法寫入輸出檔：%s\n"
 
-#: common.c:2675
+#: common.c:2699
 msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
 msgstr ""
 
-#: common.c:2691
+#: common.c:2715
 msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8 or GB18030.\n"
+#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"
 #~ msgstr "略過 UTF-16 檔案 %s，目前語言字元編碼並非UTF-8。\n"
-
-#~ msgid " -m, --add-bom         add UTF-8 Byte Order Mark\n"
-#~ msgstr " -m, --add-bom         加入UTF-8 BOM\n"