From: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Wed, 14 Jul 2010 11:28:34 +0000 (+0800)
Subject: Updated Traditional Chinese translation(Hong Kong and Taiwan)
X-Git-Tag: 2.25.12~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e0121dfe0a9377cd35c9d4b90c477b96d56c43f;p=platform%2Fupstream%2Fglib.git

Updated Traditional Chinese translation(Hong Kong and Taiwan)
---

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 57dc6cc..f0f59a7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2005-07.
 msgid ""
 msgstr ""
-"Project-Id-Version: glib 2.24.1\n"
+"Project-Id-Version: glib 2.25.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 21:37-0400\n"
-"PO-Revision-Date: 2010-03-27 20:50+0800\n"
+"POT-Creation-Date: 2010-07-14 19:27+0800\n"
+"PO-Revision-Date: 2010-07-14 19:28+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,1571 +18,1616 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: glib/gbookmarkfile.c:737
+#: ../glib/gbookmarkfile.c:780
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "元件「%2$s」中有未預期的屬性「%1$s」"
 
-#: glib/gbookmarkfile.c:748 glib/gbookmarkfile.c:819 glib/gbookmarkfile.c:829
-#: glib/gbookmarkfile.c:936
+#: ../glib/gbookmarkfile.c:791 ../glib/gbookmarkfile.c:862
+#: ../glib/gbookmarkfile.c:872 ../glib/gbookmarkfile.c:979
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "找不到元件「%2$s」中的屬性「%1$s」"
 
-#: glib/gbookmarkfile.c:1106 glib/gbookmarkfile.c:1171
-#: glib/gbookmarkfile.c:1235 glib/gbookmarkfile.c:1245
+#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1214
+#: ../glib/gbookmarkfile.c:1278 ../glib/gbookmarkfile.c:1288
 #, c-format
 msgid "Unexpected tag '%s', tag '%s' expected"
 msgstr "未預期的標籤「%s」，應為標籤「%s」"
 
-#: glib/gbookmarkfile.c:1131 glib/gbookmarkfile.c:1145
-#: glib/gbookmarkfile.c:1213 glib/gbookmarkfile.c:1265
+#: ../glib/gbookmarkfile.c:1174 ../glib/gbookmarkfile.c:1188
+#: ../glib/gbookmarkfile.c:1256 ../glib/gbookmarkfile.c:1308
 #, c-format
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "「%2$s」中有未預期的標籤「%1$s」"
 
-#: glib/gbookmarkfile.c:1793
+#: ../glib/gbookmarkfile.c:1836
 msgid "No valid bookmark file found in data dirs"
 msgstr "在資料目錄中找不到有效的書籤檔案"
 
-#: glib/gbookmarkfile.c:1994
+#: ../glib/gbookmarkfile.c:2037
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "URI「%s」的書籤已經存在"
 
-#: glib/gbookmarkfile.c:2040 glib/gbookmarkfile.c:2198
-#: glib/gbookmarkfile.c:2283 glib/gbookmarkfile.c:2363
-#: glib/gbookmarkfile.c:2448 glib/gbookmarkfile.c:2531
-#: glib/gbookmarkfile.c:2609 glib/gbookmarkfile.c:2688
-#: glib/gbookmarkfile.c:2730 glib/gbookmarkfile.c:2827
-#: glib/gbookmarkfile.c:2953 glib/gbookmarkfile.c:3143
-#: glib/gbookmarkfile.c:3219 glib/gbookmarkfile.c:3384
-#: glib/gbookmarkfile.c:3473 glib/gbookmarkfile.c:3563
-#: glib/gbookmarkfile.c:3691
+#: ../glib/gbookmarkfile.c:2083 ../glib/gbookmarkfile.c:2241
+#: ../glib/gbookmarkfile.c:2326 ../glib/gbookmarkfile.c:2406
+#: ../glib/gbookmarkfile.c:2491 ../glib/gbookmarkfile.c:2574
+#: ../glib/gbookmarkfile.c:2652 ../glib/gbookmarkfile.c:2731
+#: ../glib/gbookmarkfile.c:2773 ../glib/gbookmarkfile.c:2870
+#: ../glib/gbookmarkfile.c:2996 ../glib/gbookmarkfile.c:3186
+#: ../glib/gbookmarkfile.c:3262 ../glib/gbookmarkfile.c:3427
+#: ../glib/gbookmarkfile.c:3516 ../glib/gbookmarkfile.c:3606
+#: ../glib/gbookmarkfile.c:3734
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "找不到 URI「%s」的書籤"
 
-#: glib/gbookmarkfile.c:2372
+#: ../glib/gbookmarkfile.c:2415
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有定義 MIME 類型"
 
-#: glib/gbookmarkfile.c:2457
+#: ../glib/gbookmarkfile.c:2500
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有私有旗幟"
 
-#: glib/gbookmarkfile.c:2836
+#: ../glib/gbookmarkfile.c:2879
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有設定羣組"
 
-#: glib/gbookmarkfile.c:3237 glib/gbookmarkfile.c:3394
+#: ../glib/gbookmarkfile.c:3280 ../glib/gbookmarkfile.c:3437
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "沒有名為「%s」的應用程式註冊書籤「%s」"
 
-#: glib/gbookmarkfile.c:3417
+#: ../glib/gbookmarkfile.c:3460
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "以 URI‘%2$s’ 展開 exec 行‘%1$s’失敗"
 
-#: glib/gconvert.c:437 glib/gconvert.c:515 glib/giochannel.c:1404
-#: gio/gcharsetconverter.c:459
+#: ../glib/gconvert.c:436 ../glib/gconvert.c:514 ../glib/giochannel.c:1403
+#: ../gio/gcharsetconverter.c:458
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "不支援將字符集‘%s’轉換成‘%s’"
 
-#: glib/gconvert.c:441 glib/gconvert.c:519 gio/gcharsetconverter.c:463
+#: ../glib/gconvert.c:440 ../glib/gconvert.c:518
+#: ../gio/gcharsetconverter.c:462
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "無法將‘%s’轉換至‘%s’"
 
-#: glib/gconvert.c:638 glib/gconvert.c:1031 glib/giochannel.c:1576
-#: glib/giochannel.c:1618 glib/giochannel.c:2462 glib/gutf8.c:989
-#: glib/gutf8.c:1444 gio/gcharsetconverter.c:346
+#: ../glib/gconvert.c:637 ../glib/gconvert.c:1030 ../glib/giochannel.c:1575
+#: ../glib/giochannel.c:1617 ../glib/giochannel.c:2461 ../glib/gutf8.c:988
+#: ../glib/gutf8.c:1443 ../gio/gcharsetconverter.c:345
 msgid "Invalid byte sequence in conversion input"
 msgstr "轉換輸入資料時遇到不正確的位元組組合"
 
-#: glib/gconvert.c:646 glib/gconvert.c:956 glib/giochannel.c:1583
-#: glib/giochannel.c:2474 gio/gcharsetconverter.c:351
+#: ../glib/gconvert.c:645 ../glib/gconvert.c:955 ../glib/giochannel.c:1582
+#: ../glib/giochannel.c:2473 ../gio/gcharsetconverter.c:350
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "轉換時發生錯誤：%s"
 
-#: glib/gconvert.c:678 glib/gutf8.c:985 glib/gutf8.c:1195 glib/gutf8.c:1336
-#: glib/gutf8.c:1440
+#: ../glib/gconvert.c:677 ../glib/gutf8.c:984 ../glib/gutf8.c:1194
+#: ../glib/gutf8.c:1335 ../glib/gutf8.c:1439
 msgid "Partial character sequence at end of input"
 msgstr "輸入資料結束時字符仍未完整"
 
-#: glib/gconvert.c:928
+#: ../glib/gconvert.c:927
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "無法將後備字串‘%s’的字符集轉換成‘%s’"
 
-#: glib/gconvert.c:1751
+#: ../glib/gconvert.c:1750
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "URI‘%s’不是使用“file”格式的絕對 URI"
 
-#: glib/gconvert.c:1761
+#: ../glib/gconvert.c:1760
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "本機檔案的 URI‘%s’不應含有‘#’"
 
-#: glib/gconvert.c:1778
+#: ../glib/gconvert.c:1777
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URI‘%s’無效"
 
-#: glib/gconvert.c:1790
+#: ../glib/gconvert.c:1789
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "URI‘%s’中的主機名稱無效"
 
-#: glib/gconvert.c:1806
+#: ../glib/gconvert.c:1805
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "URI‘%s’含有「不正確跳出」的字符"
 
-#: glib/gconvert.c:1901
+#: ../glib/gconvert.c:1900
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "路徑名稱‘%s’不是絕對路徑"
 
-#: glib/gconvert.c:1911
+#: ../glib/gconvert.c:1910
 msgid "Invalid hostname"
 msgstr "主機名稱無效"
 
-#: glib/gdir.c:112 glib/gdir.c:135
+#: ../glib/gdir.c:111 ../glib/gdir.c:134
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "開啟目錄‘%s’時發生錯誤：%s"
 
-#: glib/gfileutils.c:536 glib/gfileutils.c:624
+#: ../glib/gfileutils.c:535 ../glib/gfileutils.c:623
 #, c-format
 msgid "Could not allocate %lu bytes to read file \"%s\""
 msgstr "無法配置 %lu 位元來讀取檔案“%s”"
 
-#: glib/gfileutils.c:551
+#: ../glib/gfileutils.c:550
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "讀取檔案‘%s’時發生錯誤：%s"
 
-#: glib/gfileutils.c:565
+#: ../glib/gfileutils.c:564
 #, c-format
 msgid "File \"%s\" is too large"
 msgstr "檔案「%s」太過巨大"
 
-#: glib/gfileutils.c:648
+#: ../glib/gfileutils.c:647
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "讀取檔案‘%s’失敗：%s"
 
-#: glib/gfileutils.c:699 glib/gfileutils.c:786
+#: ../glib/gfileutils.c:698 ../glib/gfileutils.c:785
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "開啟檔案「%s」失敗：%s"
 
-#: glib/gfileutils.c:716 glib/gmappedfile.c:170
+#: ../glib/gfileutils.c:715 ../glib/gmappedfile.c:169
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "獲取檔案‘%s’的屬性失敗：fstat() 失敗：%s"
 
-#: glib/gfileutils.c:750
+#: ../glib/gfileutils.c:749
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "開啟檔案‘%s’失敗：fdopen() 失敗：%s"
 
-#: glib/gfileutils.c:858
+#: ../glib/gfileutils.c:857
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "檔案名稱由‘%s’改為‘%s’失敗：g_rename() 失敗：%s"
 
-#: glib/gfileutils.c:900 glib/gfileutils.c:1366
+#: ../glib/gfileutils.c:899 ../glib/gfileutils.c:1365
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "建立檔案‘%s’失敗：%s"
 
-#: glib/gfileutils.c:914
+#: ../glib/gfileutils.c:913
 #, c-format
 msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 msgstr "開啟檔案‘%s’作寫入失敗：fdopen() 失敗：%s"
 
-#: glib/gfileutils.c:939
+#: ../glib/gfileutils.c:938
 #, c-format
 msgid "Failed to write file '%s': fwrite() failed: %s"
 msgstr "寫入檔案‘%s’失敗：fwrite() 失敗：%s"
 
-#: glib/gfileutils.c:958
+#: ../glib/gfileutils.c:957
 #, c-format
 msgid "Failed to write file '%s': fflush() failed: %s"
 msgstr "無法寫入檔案「%s」：fflush() 失敗：%s"
 
-#: glib/gfileutils.c:987
+#: ../glib/gfileutils.c:986
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "無法寫入檔案「%s」：fsync() 失敗：%s"
 
-#: glib/gfileutils.c:1006
+#: ../glib/gfileutils.c:1005
 #, c-format
 msgid "Failed to close file '%s': fclose() failed: %s"
 msgstr "關閉檔案‘%s’失敗：fclose() 失敗：%s"
 
-#: glib/gfileutils.c:1124
+#: ../glib/gfileutils.c:1123
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "現存檔案‘%s’無法移除：g_unlink() 失敗：%s"
 
-#: glib/gfileutils.c:1328
+#: ../glib/gfileutils.c:1327
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "樣式‘%s’無效，不應含有‘%s’"
 
 # (Abel) this is file template for mktemp/mkstemp
-#: glib/gfileutils.c:1341
+#: ../glib/gfileutils.c:1340
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "檔案樣式‘%s’沒有包含 XXXXXX"
 
-#: glib/gfileutils.c:1774
+#: ../glib/gfileutils.c:1773
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 位元組"
 
-#: glib/gfileutils.c:1782
+#: ../glib/gfileutils.c:1781
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: glib/gfileutils.c:1787
+#: ../glib/gfileutils.c:1786
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: glib/gfileutils.c:1792
+#: ../glib/gfileutils.c:1791
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: glib/gfileutils.c:1797
+#: ../glib/gfileutils.c:1796
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: glib/gfileutils.c:1802
+#: ../glib/gfileutils.c:1801
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: glib/gfileutils.c:1807
+#: ../glib/gfileutils.c:1806
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: glib/gfileutils.c:1850
+#: ../glib/gfileutils.c:1849
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "讀取符號連結‘%s’失敗：%s"
 
-#: glib/gfileutils.c:1871
+#: ../glib/gfileutils.c:1870
 msgid "Symbolic links not supported"
 msgstr "不支援符號連結"
 
-#: glib/giochannel.c:1408
+#: ../glib/giochannel.c:1407
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "無法開啟將‘%s’轉換至‘%s’的轉換器：%s"
 
-#: glib/giochannel.c:1753
+#: ../glib/giochannel.c:1752
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "在 g_io_channel_read_line_string 中無法讀取原始資料"
 
-#: glib/giochannel.c:1800 glib/giochannel.c:2058 glib/giochannel.c:2145
+#: ../glib/giochannel.c:1799 ../glib/giochannel.c:2057
+#: ../glib/giochannel.c:2144
 msgid "Leftover unconverted data in read buffer"
 msgstr "用來讀取資料的緩衝區中仍有未轉換的資料"
 
-#: glib/giochannel.c:1881 glib/giochannel.c:1958
+#: ../glib/giochannel.c:1880 ../glib/giochannel.c:1957
 msgid "Channel terminates in a partial character"
 msgstr "在字符未完整之前，輸入管道已經結束"
 
-#: glib/giochannel.c:1944
+#: ../glib/giochannel.c:1943
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end 中無法讀取原始資料"
 
-#: glib/gmappedfile.c:151
+#: ../glib/gmappedfile.c:150
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "開啟檔案‘%s’失敗：open() 失敗：%s"
 
-#: glib/gmappedfile.c:230
+#: ../glib/gmappedfile.c:229
 #, c-format
 msgid "Failed to map file '%s': mmap() failed: %s"
 msgstr "對應檔案‘%s’失敗：mmap() 失敗：%s"
 
-#: glib/gmarkup.c:303 glib/gmarkup.c:343
+#: ../glib/gmarkup.c:302 ../glib/gmarkup.c:342
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "第 %d 行第 %d 個字發生錯誤："
 
-#: glib/gmarkup.c:363 glib/gmarkup.c:441
+#: ../glib/gmarkup.c:362 ../glib/gmarkup.c:440
 #, c-format
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "名稱中無效的 UTF-8 編碼文字 - 不是合法的「%s」"
 
-#: glib/gmarkup.c:374
+#: ../glib/gmarkup.c:373
 #, c-format
 msgid "'%s' is not a valid name "
 msgstr "「%s」不是一個有效的名稱"
 
-#: glib/gmarkup.c:390
+#: ../glib/gmarkup.c:389
 #, c-format
 msgid "'%s' is not a valid name: '%c' "
 msgstr "「%s」不是一個有效的名稱：「%c」"
 
-#: glib/gmarkup.c:494
+#: ../glib/gmarkup.c:493
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "第 %d 行發生錯誤：%s"
 
-#: glib/gmarkup.c:578
+#: ../glib/gmarkup.c:577
 #, c-format
 msgid ""
 "Failed to parse '%-.*s', which should have been a digit inside a character "
 "reference (&#234; for example) - perhaps the digit is too large"
 msgstr "無法解析‘%-.*s’，字符參引內應該含有數字（例如 &#234;）─ 可能是數字太大"
 
-#: glib/gmarkup.c:590
+#: ../glib/gmarkup.c:589
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
-msgstr ""
-"字符參引的結束部分不是分號；很可能你想使用 & 字符但未將它變為實體 ─ 請將 & 轉"
-"換為 &amp;"
+msgstr "字符參引的結束部分不是分號；很可能你想使用 & 字符但未將它變為實體 ─ 請將 & 轉換為 &amp;"
 
-#: glib/gmarkup.c:616
+#: ../glib/gmarkup.c:615
 #, c-format
 msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "字符參引‘%-.*s’無法表示任何能接受的字符"
 
-#: glib/gmarkup.c:654
+#: ../glib/gmarkup.c:653
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr "出現空白的實體‘&;’；可用的實體為：&amp; &quot; &lt; &gt; &apos;"
 
-#: glib/gmarkup.c:662
+#: ../glib/gmarkup.c:661
 #, c-format
 msgid "Entity name '%-.*s' is not known"
 msgstr "實體名稱 '%-.*s' 意義不明"
 
-#: glib/gmarkup.c:667
+#: ../glib/gmarkup.c:666
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
-msgstr ""
-"實體的結束部分不是分號；很可能你想使用 & 字符但未將它變為實體 ─ 請將 & 轉換"
-"為 &amp;"
+msgstr "實體的結束部分不是分號；很可能你想使用 & 字符但未將它變為實體 ─ 請將 & 轉換為 &amp;"
 
-#: glib/gmarkup.c:1014
+#: ../glib/gmarkup.c:1013
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "文件開始必須為一元素（例如 <book>）"
 
-#: glib/gmarkup.c:1054
+#: ../glib/gmarkup.c:1053
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
 msgstr "‘<’字符後的‘%s’不是有效的字符；這樣不可能是元素名稱的開始部份"
 
-#: glib/gmarkup.c:1122
+#: ../glib/gmarkup.c:1121
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag '%"
 "s'"
 msgstr "字符「%s」只有一半，空元素標籤「%s」的結尾應該以‘>’字符結束"
 
-#: glib/gmarkup.c:1206
+#: ../glib/gmarkup.c:1205
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr "不尋常的字符‘%s’，屬性名稱‘%s’（屬於元素‘%s’）後應該是‘=’字符"
 
-#: glib/gmarkup.c:1247
+#: ../glib/gmarkup.c:1246
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
 "element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
-msgstr ""
-"不尋常的字符‘%s’，元素‘%s’的開始標籤應該以‘>’或‘/’字符終結，也可以是屬性；或"
-"許你在屬性名稱中使用了無效的字符"
+msgstr "不尋常的字符‘%s’，元素‘%s’的開始標籤應該以‘>’或‘/’字符終結，也可以是屬性；或許你在屬性名稱中使用了無效的字符"
 
-#: glib/gmarkup.c:1291
+#: ../glib/gmarkup.c:1290
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
 "giving value for attribute '%s' of element '%s'"
-msgstr ""
-"不尋常的字符‘%s’，當指定屬性‘%s’的值（屬於元素‘%s’）時，等號後應該出現開引號"
+msgstr "不尋常的字符‘%s’，當指定屬性‘%s’的值（屬於元素‘%s’）時，等號後應該出現開引號"
 
-#: glib/gmarkup.c:1425
+#: ../glib/gmarkup.c:1424
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr "‘</’字符後的‘%s’不是有效的字符；‘%s’不可能是元素名稱的開始部份"
 
-#: glib/gmarkup.c:1461
+#: ../glib/gmarkup.c:1460
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
 msgstr "字符‘%s’是無效的（位置在關閉元素‘%s’末端）；允許的字符為「>」"
 
-#: glib/gmarkup.c:1472
+#: ../glib/gmarkup.c:1471
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "元素‘%s’已關閉，沒有開啟中的元素"
 
-#: glib/gmarkup.c:1481
+#: ../glib/gmarkup.c:1480
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "元素‘%s’已關閉，但開啟中的元素是‘%s’"
 
-#: glib/gmarkup.c:1648
+#: ../glib/gmarkup.c:1647
 msgid "Document was empty or contained only whitespace"
 msgstr "文件完全空白或只含有空白字符"
 
-#: glib/gmarkup.c:1662
+#: ../glib/gmarkup.c:1661
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "文件在尖角括號‘<’後突然終止"
 
-#: glib/gmarkup.c:1670 glib/gmarkup.c:1715
+#: ../glib/gmarkup.c:1669 ../glib/gmarkup.c:1714
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr "在仍然有開啟中的元素時，文件突然結束 ─‘%s’是最後一個開啟的元素"
 
-#: glib/gmarkup.c:1678
+#: ../glib/gmarkup.c:1677
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
 msgstr "文件突然結束，本來應該出現用來關閉標籤 <%s/> 的尖角括號"
 
-#: glib/gmarkup.c:1684
+#: ../glib/gmarkup.c:1683
 msgid "Document ended unexpectedly inside an element name"
 msgstr "在元素的名稱內，文件突然結束"
 
-#: glib/gmarkup.c:1690
+#: ../glib/gmarkup.c:1689
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "在屬性名稱內，文件突然結束"
 
-#: glib/gmarkup.c:1695
+#: ../glib/gmarkup.c:1694
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "在元素的開啟標籤內，文件突然結束"
 
-#: glib/gmarkup.c:1701
+#: ../glib/gmarkup.c:1700
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr "在屬性名稱的等號後，文件突然結束；沒有屬性值"
 
-#: glib/gmarkup.c:1708
+#: ../glib/gmarkup.c:1707
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "在屬性值內，文件突然結束"
 
-#: glib/gmarkup.c:1724
+#: ../glib/gmarkup.c:1723
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "在元素‘%s’的關閉標籤內，文件突然結束"
 
-#: glib/gmarkup.c:1730
+#: ../glib/gmarkup.c:1729
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "在註解或處理指示內，文件突然結束"
 
-#: glib/gregex.c:131
+#: ../glib/gregex.c:130
 msgid "corrupted object"
 msgstr "損毀的物件"
 
-#: glib/gregex.c:133
+#: ../glib/gregex.c:132
 msgid "internal error or corrupted object"
 msgstr "內部錯誤或損毀的物件"
 
-#: glib/gregex.c:135
+#: ../glib/gregex.c:134
 msgid "out of memory"
 msgstr "記憶體耗盡"
 
-#: glib/gregex.c:140
+#: ../glib/gregex.c:139
 msgid "backtracking limit reached"
 msgstr "已達回溯上限"
 
-#: glib/gregex.c:152 glib/gregex.c:160
+#: ../glib/gregex.c:151 ../glib/gregex.c:159
 msgid "the pattern contains items not supported for partial matching"
 msgstr "此模式包含了不支援部分比對的項目"
 
-#: glib/gregex.c:154 gio/glocalfile.c:2110
+#: ../glib/gregex.c:153 ../gio/glocalfile.c:2109
 msgid "internal error"
 msgstr "內部的錯誤"
 
-#: glib/gregex.c:162
+#: ../glib/gregex.c:161
 msgid "back references as conditions are not supported for partial matching"
 msgstr "部分比對不支援以反向參照為條件"
 
-#: glib/gregex.c:171
+#: ../glib/gregex.c:170
 msgid "recursion limit reached"
 msgstr "已達遞廻上限"
 
-#: glib/gregex.c:173
+#: ../glib/gregex.c:172
 msgid "workspace limit for empty substrings reached"
 msgstr "已達空白子字串的工作區上限"
 
-#: glib/gregex.c:175
+#: ../glib/gregex.c:174
 msgid "invalid combination of newline flags"
 msgstr "無效的換行旗標組合"
 
-#: glib/gregex.c:179
+#: ../glib/gregex.c:178
 msgid "unknown error"
 msgstr "不明的錯誤"
 
-#: glib/gregex.c:199
+#: ../glib/gregex.c:198
 msgid "\\ at end of pattern"
 msgstr "\\ 於模式結尾"
 
-#: glib/gregex.c:202
+#: ../glib/gregex.c:201
 msgid "\\c at end of pattern"
 msgstr "\\c 於模式結尾"
 
-#: glib/gregex.c:205
+#: ../glib/gregex.c:204
 msgid "unrecognized character follows \\"
 msgstr "無法辨識的字符接着 \\"
 
-#: glib/gregex.c:212
+#: ../glib/gregex.c:211
 msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
 msgstr "這裏不允許使用改變大小寫的轉義符(\\l, \\L, \\u, \\U)"
 
-#: glib/gregex.c:215
+#: ../glib/gregex.c:214
 msgid "numbers out of order in {} quantifier"
 msgstr "{} 裏的數字次序顛倒了"
 
-#: glib/gregex.c:218
+#: ../glib/gregex.c:217
 msgid "number too big in {} quantifier"
 msgstr "{} 裏的數字太大了"
 
-#: glib/gregex.c:221
+#: ../glib/gregex.c:220
 msgid "missing terminating ] for character class"
 msgstr "字符類別缺少結束的 ]"
 
-#: glib/gregex.c:224
+#: ../glib/gregex.c:223
 msgid "invalid escape sequence in character class"
 msgstr "字符類別中無效的跳脫序列"
 
-#: glib/gregex.c:227
+#: ../glib/gregex.c:226
 msgid "range out of order in character class"
 msgstr "字符類別的範圍次序顛倒"
 
-#: glib/gregex.c:230
+#: ../glib/gregex.c:229
 msgid "nothing to repeat"
 msgstr "沒有東西可重複"
 
-#: glib/gregex.c:233
+#: ../glib/gregex.c:232
 msgid "unrecognized character after (?"
 msgstr "在 (? 後有無法辨識的字符"
 
-#: glib/gregex.c:237
+#: ../glib/gregex.c:236
 msgid "unrecognized character after (?<"
 msgstr "在 (?< 後有無法辨識的字符"
 
-#: glib/gregex.c:241
+#: ../glib/gregex.c:240
 msgid "unrecognized character after (?P"
 msgstr "在 (?P 後有無法辨識的字符"
 
-#: glib/gregex.c:244
+#: ../glib/gregex.c:243
 msgid "POSIX named classes are supported only within a class"
 msgstr "POSIX 命名類別只在單一類別中支援"
 
-#: glib/gregex.c:247
+#: ../glib/gregex.c:246
 msgid "missing terminating )"
 msgstr "缺少結束的 )"
 
-#: glib/gregex.c:251
+#: ../glib/gregex.c:250
 msgid ") without opening ("
 msgstr ") 沒有開頭的 ("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: glib/gregex.c:258
+#: ../glib/gregex.c:257
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "(?R 或 (?[+-]數字必須接着 )"
 
-#: glib/gregex.c:261
+#: ../glib/gregex.c:260
 msgid "reference to non-existent subpattern"
 msgstr "參照不存在的子模式"
 
-#: glib/gregex.c:264
+#: ../glib/gregex.c:263
 msgid "missing ) after comment"
 msgstr "註解後缺少 )"
 
-#: glib/gregex.c:267
+#: ../glib/gregex.c:266
 msgid "regular expression too large"
 msgstr "正規表示式太長"
 
-#: glib/gregex.c:270
+#: ../glib/gregex.c:269
 msgid "failed to get memory"
 msgstr "取得記憶體失敗"
 
-#: glib/gregex.c:273
+#: ../glib/gregex.c:272
 msgid "lookbehind assertion is not fixed length"
 msgstr "lookbehind 判斷提示(assertion) 不是固定的長度"
 
-#: glib/gregex.c:276
+#: ../glib/gregex.c:275
 msgid "malformed number or name after (?("
 msgstr "(?( 之後有格式不正確的數字或名稱"
 
-#: glib/gregex.c:279
+#: ../glib/gregex.c:278
 msgid "conditional group contains more than two branches"
 msgstr "條件式羣組包含了兩個以上的分支"
 
-#: glib/gregex.c:282
+#: ../glib/gregex.c:281
 msgid "assertion expected after (?("
 msgstr "(?( 後應該有判斷提示(assertion)"
 
-#: glib/gregex.c:285
+#: ../glib/gregex.c:284
 msgid "unknown POSIX class name"
 msgstr "未知的 POSIX 類別名稱"
 
-#: glib/gregex.c:288
+#: ../glib/gregex.c:287
 msgid "POSIX collating elements are not supported"
 msgstr "不支援 POSIX 整理元件"
 
-#: glib/gregex.c:291
+#: ../glib/gregex.c:290
 msgid "character value in \\x{...} sequence is too large"
 msgstr "\\x{...} 序列中的字符值太大"
 
-#: glib/gregex.c:294
+#: ../glib/gregex.c:293
 msgid "invalid condition (?(0)"
 msgstr "無效的條件 (?(0)"
 
-#: glib/gregex.c:297
+#: ../glib/gregex.c:296
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "在 lookbehind 判斷提示(assertion) 中不支援\\C"
 
-#: glib/gregex.c:300
+#: ../glib/gregex.c:299
 msgid "recursive call could loop indefinitely"
 msgstr "遞廻呼叫可能變成無限廻圈"
 
-#: glib/gregex.c:303
+#: ../glib/gregex.c:302
 msgid "missing terminator in subpattern name"
 msgstr "子模式名稱中缺少結束字符"
 
-#: glib/gregex.c:306
+#: ../glib/gregex.c:305
 msgid "two named subpatterns have the same name"
 msgstr "兩個命名的子模式具有相同的名稱"
 
-#: glib/gregex.c:309
+#: ../glib/gregex.c:308
 msgid "malformed \\P or \\p sequence"
 msgstr "格式不正確的 \\P 或 \\p 序列"
 
-#: glib/gregex.c:312
+#: ../glib/gregex.c:311
 msgid "unknown property name after \\P or \\p"
 msgstr "在 \\P 或 \\p 後有未知的屬性名稱"
 
-#: glib/gregex.c:315
+#: ../glib/gregex.c:314
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "子模式名稱太長（最多 32 字符）"
 
-#: glib/gregex.c:318
+#: ../glib/gregex.c:317
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "太多命名的子模式（最大值 10,000）"
 
-#: glib/gregex.c:321
+#: ../glib/gregex.c:320
 msgid "octal value is greater than \\377"
 msgstr "8 進位值大於 \\377"
 
-#: glib/gregex.c:324
+#: ../glib/gregex.c:323
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE 羣組包含一個以上的分支"
 
-#: glib/gregex.c:327
+#: ../glib/gregex.c:326
 msgid "repeating a DEFINE group is not allowed"
 msgstr "不允許重複 DEFINE 羣組"
 
-#: glib/gregex.c:330
+#: ../glib/gregex.c:329
 msgid "inconsistent NEWLINE options"
 msgstr "不一致的 NEWLINE 選項"
 
-#: glib/gregex.c:333
+#: ../glib/gregex.c:332
 msgid ""
 "\\g is not followed by a braced name or an optionally braced non-zero number"
 msgstr "\\g 並未隨着具有大括弧的名稱或選用的具大括弧的非零數值"
 
-#: glib/gregex.c:338
+#: ../glib/gregex.c:337
 msgid "unexpected repeat"
 msgstr "未預期的重複"
 
-#: glib/gregex.c:342
+#: ../glib/gregex.c:341
 msgid "code overflow"
 msgstr "程式碼溢流"
 
-#: glib/gregex.c:346
+#: ../glib/gregex.c:345
 msgid "overran compiling workspace"
 msgstr "編譯工作區超出範圍"
 
-#: glib/gregex.c:350
+#: ../glib/gregex.c:349
 msgid "previously-checked referenced subpattern not found"
 msgstr "找不到預先核取的參照子字串"
 
-#: glib/gregex.c:522 glib/gregex.c:1639
+#: ../glib/gregex.c:521 ../glib/gregex.c:1638
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "比對正規表示式 %s 發生錯誤：%s"
 
-#: glib/gregex.c:1094
+#: ../glib/gregex.c:1093
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE 程式庫並未編譯對 UTF8 的支援"
 
-#: glib/gregex.c:1103
+#: ../glib/gregex.c:1102
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE 程式庫並未編譯對 UTF8 屬性的支援"
 
-#: glib/gregex.c:1157
+#: ../glib/gregex.c:1156
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "編譯正規表示式 %s 時於第 %d 個字發生錯誤：%s"
 
-#: glib/gregex.c:1193
+#: ../glib/gregex.c:1192
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "最佳化正規表示式 %s 時發生錯誤：%s"
 
-#: glib/gregex.c:2067
+#: ../glib/gregex.c:2066
 msgid "hexadecimal digit or '}' expected"
 msgstr "應為 16 進位數字或「}」"
 
-#: glib/gregex.c:2083
+#: ../glib/gregex.c:2082
 msgid "hexadecimal digit expected"
 msgstr "應為 16 進位數字"
 
-#: glib/gregex.c:2123
+#: ../glib/gregex.c:2122
 msgid "missing '<' in symbolic reference"
 msgstr "在符號參照中缺少「<」"
 
-#: glib/gregex.c:2132
+#: ../glib/gregex.c:2131
 msgid "unfinished symbolic reference"
 msgstr "未完成的符號參照"
 
-#: glib/gregex.c:2139
+#: ../glib/gregex.c:2138
 msgid "zero-length symbolic reference"
 msgstr "零-長度的符號參照"
 
-#: glib/gregex.c:2150
+#: ../glib/gregex.c:2149
 msgid "digit expected"
 msgstr "預期數字"
 
-#: glib/gregex.c:2168
+#: ../glib/gregex.c:2167
 msgid "illegal symbolic reference"
 msgstr "不合法的符號參照"
 
-#: glib/gregex.c:2230
+#: ../glib/gregex.c:2229
 msgid "stray final '\\'"
 msgstr "缺少最後的「\\」"
 
-#: glib/gregex.c:2234
+#: ../glib/gregex.c:2233
 msgid "unknown escape sequence"
 msgstr "不明的跳脫序列"
 
-#: glib/gregex.c:2244
+#: ../glib/gregex.c:2243
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
-msgstr "當分析於字符 %2$lu 的取代文字「%1$s」時發生錯誤：%3$s"
+msgstr "當解析於字符 %2$lu 的取代文字「%1$s」時發生錯誤：%3$s"
 
-#: glib/gshell.c:92
+#: ../glib/gshell.c:91
 msgid "Quoted text doesn't begin with a quotation mark"
 msgstr "應該用引號括起來的文字不是以括號為開始"
 
-#: glib/gshell.c:182
+#: ../glib/gshell.c:181
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr "指令列或其它標為指令的字串內有不對稱的引號"
 
-#: glib/gshell.c:560
+#: ../glib/gshell.c:559
 #, c-format
 msgid "Text ended just after a '\\' character. (The text was '%s')"
 msgstr "文字在‘\\’字符後就終止了。（文字為‘%s’）"
 
-#: glib/gshell.c:567
+#: ../glib/gshell.c:566
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
 msgstr "字串完結前仍沒有對應於 %c 的引號（字串為‘%s’）"
 
-#: glib/gshell.c:579
+#: ../glib/gshell.c:578
 msgid "Text was empty (or contained only whitespace)"
 msgstr "文字是空白的（或只含有空白字符）"
 
-#: glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:282
 msgid "Failed to read data from child process"
 msgstr "無法從副進程讀取資料"
 
-#: glib/gspawn-win32.c:300 glib/gspawn.c:1480
+#: ../glib/gspawn-win32.c:299 ../glib/gspawn.c:1479
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "無法建立管道來和副進程溝通 (%s)"
 
-#: glib/gspawn-win32.c:339 glib/gspawn-win32.c:347 glib/gspawn.c:1139
+#: ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346 ../glib/gspawn.c:1138
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "無法從管道讀取資料 (%s)"
 
-#: glib/gspawn-win32.c:370 glib/gspawn.c:1346
+#: ../glib/gspawn-win32.c:369 ../glib/gspawn.c:1345
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "無法進入目錄‘%s’(%s)"
 
-#: glib/gspawn-win32.c:376 glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:375 ../glib/gspawn-win32.c:494
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "無法執行副進程 (%s)"
 
-#: glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:444
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "程式名稱無效：%s"
 
-#: glib/gspawn-win32.c:455 glib/gspawn-win32.c:723 glib/gspawn-win32.c:1279
+#: ../glib/gspawn-win32.c:454 ../glib/gspawn-win32.c:722
+#: ../glib/gspawn-win32.c:1278
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "第 %d 個引數中含無效的字串：%s"
 
-#: glib/gspawn-win32.c:466 glib/gspawn-win32.c:738 glib/gspawn-win32.c:1312
+#: ../glib/gspawn-win32.c:465 ../glib/gspawn-win32.c:737
+#: ../glib/gspawn-win32.c:1311
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "環境變數中的字串無效：%s"
 
-#: glib/gspawn-win32.c:719 glib/gspawn-win32.c:1260
+#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1259
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "無效的工作目錄：%s"
 
-#: glib/gspawn-win32.c:784
+#: ../glib/gspawn-win32.c:783
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "無法執行協助程式 (%s)"
 
-#: glib/gspawn-win32.c:998
+#: ../glib/gspawn-win32.c:997
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
 msgstr "當 g_io_channel_win32_poll() 從副進程讀取資料時發生無法預計的錯誤"
 
-#: glib/gspawn.c:190
+#: ../glib/gspawn.c:189
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "無法從副進程讀取資料 (%s)"
 
-#: glib/gspawn.c:329
+#: ../glib/gspawn.c:328
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "當 select() 從子程序讀取資料時發生未預期的錯誤 (%s)"
 
-#: glib/gspawn.c:414
+#: ../glib/gspawn.c:413
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() 發生未預期的錯誤 (%s)"
 
-#: glib/gspawn.c:1206
+#: ../glib/gspawn.c:1205
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "無法衍生進程 (%s)"
 
-#: glib/gspawn.c:1356
+#: ../glib/gspawn.c:1355
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "無法執行副進程“%s”(%s)"
 
-#: glib/gspawn.c:1366
+#: ../glib/gspawn.c:1365
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "無法將副進程的輸出或輸入重新導向 (%s)"
 
-#: glib/gspawn.c:1375
+#: ../glib/gspawn.c:1374
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "無法衍生副進程 (%s)"
 
-#: glib/gspawn.c:1383
+#: ../glib/gspawn.c:1382
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "執行副進程“%s”時發生不明的錯誤"
 
-#: glib/gspawn.c:1407
+#: ../glib/gspawn.c:1406
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "無法從 child pid pipe 讀取足夠的資料 (%s)"
 
-#: glib/gutf8.c:1063
+#: ../glib/gutf8.c:1062
 msgid "Character out of range for UTF-8"
 msgstr "字符不在 UTF-8 範圍之內"
 
-#: glib/gutf8.c:1163 glib/gutf8.c:1172 glib/gutf8.c:1304 glib/gutf8.c:1313
-#: glib/gutf8.c:1454 glib/gutf8.c:1550
+#: ../glib/gutf8.c:1162 ../glib/gutf8.c:1171 ../glib/gutf8.c:1303
+#: ../glib/gutf8.c:1312 ../glib/gutf8.c:1453 ../glib/gutf8.c:1549
 msgid "Invalid sequence in conversion input"
 msgstr "轉換輸入資料時出現無效的字符次序"
 
-#: glib/gutf8.c:1465 glib/gutf8.c:1561
+#: ../glib/gutf8.c:1464 ../glib/gutf8.c:1560
 msgid "Character out of range for UTF-16"
 msgstr "字符不在 UTF-16 範圍之內"
 
-#: glib/goption.c:755
+#: ../glib/goption.c:754
 msgid "Usage:"
 msgstr "用法："
 
-#: glib/goption.c:755
+#: ../glib/goption.c:754
 msgid "[OPTION...]"
 msgstr "[選項...]"
 
-#: glib/goption.c:861
+#: ../glib/goption.c:860
 msgid "Help Options:"
 msgstr "說明選項："
 
-#: glib/goption.c:862
+#: ../glib/goption.c:861
 msgid "Show help options"
 msgstr "顯示說明的選項"
 
-#: glib/goption.c:868
+#: ../glib/goption.c:867
 msgid "Show all help options"
 msgstr "顯示所有的說明選項"
 
-#: glib/goption.c:930
+#: ../glib/goption.c:929
 msgid "Application Options:"
 msgstr "應用程式選項："
 
-#: glib/goption.c:992 glib/goption.c:1062
+#: ../glib/goption.c:991 ../glib/goption.c:1061
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "無法給 %2$s 解析整數值‘%1$s’"
 
-#: glib/goption.c:1002 glib/goption.c:1070
+#: ../glib/goption.c:1001 ../glib/goption.c:1069
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "%2$s 的整數值‘%1$s’超出範圍"
 
-#: glib/goption.c:1027
+#: ../glib/goption.c:1026
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "無法給 %2$s 解析雙精度浮點數‘%1$s’"
 
-#: glib/goption.c:1035
+#: ../glib/goption.c:1034
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "%2$s 的雙精度浮點數‘%1$s’超出範圍"
 
-#: glib/goption.c:1298 glib/goption.c:1377
+#: ../glib/goption.c:1297 ../glib/goption.c:1376
 #, c-format
 msgid "Error parsing option %s"
 msgstr "解析 %s 選項時發生錯誤"
 
-#: glib/goption.c:1408 glib/goption.c:1522
+#: ../glib/goption.c:1407 ../glib/goption.c:1521
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺少 %s 的參數"
 
-#: glib/goption.c:1917
+#: ../glib/goption.c:1916
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的選項 %s"
 
-#: glib/gkeyfile.c:363
+#: ../glib/gkeyfile.c:362
 msgid "Valid key file could not be found in search dirs"
 msgstr "在資料目錄中找不到有效的設定鍵檔案"
 
-#: glib/gkeyfile.c:398
+#: ../glib/gkeyfile.c:397
 msgid "Not a regular file"
 msgstr "不是正規的檔案"
 
-#: glib/gkeyfile.c:406
+#: ../glib/gkeyfile.c:405
 msgid "File is empty"
 msgstr "檔案是空白的"
 
-#: glib/gkeyfile.c:765
+#: ../glib/gkeyfile.c:764
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
 msgstr "設定鍵檔案中‘%s’行並非設定鍵值配對、羣組或註解"
 
-#: glib/gkeyfile.c:825
+#: ../glib/gkeyfile.c:824
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "無效的羣組名稱：%s"
 
-#: glib/gkeyfile.c:847
+#: ../glib/gkeyfile.c:846
 msgid "Key file does not start with a group"
 msgstr "設定鍵檔案並非以羣組開頭"
 
-#: glib/gkeyfile.c:873
+#: ../glib/gkeyfile.c:872
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "無效的設定鍵名稱：%s"
 
-#: glib/gkeyfile.c:900
+#: ../glib/gkeyfile.c:899
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "設定鍵檔案包含不支援的編碼‘%s’"
 
-#: glib/gkeyfile.c:1116 glib/gkeyfile.c:1278 glib/gkeyfile.c:2657
-#: glib/gkeyfile.c:2723 glib/gkeyfile.c:2858 glib/gkeyfile.c:2991
-#: glib/gkeyfile.c:3144 glib/gkeyfile.c:3331 glib/gkeyfile.c:3392
+#: ../glib/gkeyfile.c:1115 ../glib/gkeyfile.c:1277 ../glib/gkeyfile.c:2656
+#: ../glib/gkeyfile.c:2722 ../glib/gkeyfile.c:2857 ../glib/gkeyfile.c:2990
+#: ../glib/gkeyfile.c:3143 ../glib/gkeyfile.c:3330 ../glib/gkeyfile.c:3391
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "設定鍵檔案沒有羣組‘%s’"
 
-#: glib/gkeyfile.c:1290
+#: ../glib/gkeyfile.c:1289
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "設定鍵檔案沒有設定鍵‘%s’"
 
-#: glib/gkeyfile.c:1397 glib/gkeyfile.c:1512
+#: ../glib/gkeyfile.c:1396 ../glib/gkeyfile.c:1511
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr "設定鍵檔案包含的設定鍵‘%s’（數值為‘%s’）並非 UTF-8"
 
-#: glib/gkeyfile.c:1417 glib/gkeyfile.c:1911
+#: ../glib/gkeyfile.c:1416 ../glib/gkeyfile.c:1910
 #, c-format
 msgid "Key file contains key '%s' which has value that cannot be interpreted."
 msgstr "設定鍵檔案包含的設定鍵‘%s’的數值無法解譯。"
 
-#: glib/gkeyfile.c:1532
+#: ../glib/gkeyfile.c:1531
 #, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "設定鍵檔案包含的設定鍵「%s」的數值無法解譯。"
 
-#: glib/gkeyfile.c:2126 glib/gkeyfile.c:2488
+#: ../glib/gkeyfile.c:2125 ../glib/gkeyfile.c:2487
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
 "interpreted."
 msgstr "設定鍵檔案包含的羣組‘%2$s’中設定鍵‘%1$s’數值無法解譯"
 
-#: glib/gkeyfile.c:2672 glib/gkeyfile.c:2873 glib/gkeyfile.c:3403
+#: ../glib/gkeyfile.c:2671 ../glib/gkeyfile.c:2872 ../glib/gkeyfile.c:3402
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "設定鍵檔案的羣組‘%2$s’中沒有設定鍵‘%1$s’"
 
-#: glib/gkeyfile.c:3637
+#: ../glib/gkeyfile.c:3636
 msgid "Key file contains escape character at end of line"
 msgstr "設定鍵檔案在行尾包含跳出字符"
 
-#: glib/gkeyfile.c:3659
+#: ../glib/gkeyfile.c:3658
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "設定鍵檔案含有不正確的「跳出字符」‘%s’"
 
-#: glib/gkeyfile.c:3801
+#: ../glib/gkeyfile.c:3800
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "數值‘%s’不能被解譯為數字。"
 
-#: glib/gkeyfile.c:3815
+#: ../glib/gkeyfile.c:3814
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "整數值‘%s’超出範圍"
 
-#: glib/gkeyfile.c:3848
+#: ../glib/gkeyfile.c:3847
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "數值‘%s’不能被解譯為浮點數。"
 
-#: glib/gkeyfile.c:3872
+#: ../glib/gkeyfile.c:3871
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "數值‘%s’不能被解譯為邏輯值。"
 
-#: gio/gbufferedinputstream.c:415 gio/gbufferedinputstream.c:496
-#: gio/ginputstream.c:186 gio/ginputstream.c:318 gio/ginputstream.c:557
-#: gio/ginputstream.c:682 gio/goutputstream.c:198 gio/goutputstream.c:721
+#: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492
+#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317
+#: ../gio/ginputstream.c:556 ../gio/ginputstream.c:681
+#: ../gio/goutputstream.c:197 ../gio/goutputstream.c:720
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "傳給 %s 的計數值太大"
 
-#: gio/gbufferedinputstream.c:883 gio/ginputstream.c:892 gio/giostream.c:305
-#: gio/goutputstream.c:1196
+#: ../gio/gbufferedinputstream.c:881 ../gio/ginputstream.c:891
+#: ../gio/giostream.c:304 ../gio/goutputstream.c:1195
 msgid "Stream is already closed"
 msgstr "串流已經關閉"
 
-#: gio/gcancellable.c:433 gio/gdbusconnection.c:1212
-#: gio/gdbusconnection.c:1300 gio/gdbusconnection.c:1472 gio/glocalfile.c:2103
-#: gio/gsimpleasyncresult.c:651 gio/gsimpleasyncresult.c:677
+#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1415
+#: ../gio/gdbusconnection.c:1503 ../gio/gdbusconnection.c:1678
+#: ../gio/glocalfile.c:2102 ../gio/gsimpleasyncresult.c:650
+#: ../gio/gsimpleasyncresult.c:676
 msgid "Operation was cancelled"
 msgstr "操作已被取消"
 
-#: gio/gcharsetconverter.c:264
+#: ../gio/gcharsetconverter.c:263
 msgid "Invalid object, not initialized"
 msgstr "無效的物件，尚未初始化"
 
-#: gio/gcharsetconverter.c:285 gio/gcharsetconverter.c:313
+#: ../gio/gcharsetconverter.c:284 ../gio/gcharsetconverter.c:312
 msgid "Incomplete multibyte sequence in input"
 msgstr "在輸入中出現不完整的多位元組次序"
 
-#: gio/gcharsetconverter.c:319 gio/gcharsetconverter.c:328
+#: ../gio/gcharsetconverter.c:318 ../gio/gcharsetconverter.c:327
 msgid "Not enough space in destination"
 msgstr "在目的端中沒有足夠的空間"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:804
+#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:803
 msgid "Cancellable initialization not supported"
 msgstr "不支援可取消的初始化"
 
-#: gio/gcontenttype.c:180
+#: ../gio/gcontenttype.c:179
 msgid "Unknown type"
 msgstr "不明的類型"
 
-#: gio/gcontenttype.c:181
+#: ../gio/gcontenttype.c:180
 #, c-format
 msgid "%s filetype"
 msgstr "%s 檔案類型"
 
-#: gio/gcontenttype.c:681
+#: ../gio/gcontenttype.c:679
 #, c-format
 msgid "%s type"
 msgstr "%s 類型"
 
-#: gio/gcredentials.c:203 gio/gcredentials.c:338
+#: ../gio/gcredentials.c:204 ../gio/gcredentials.c:339
 msgid "GCredentials is not implemented on this OS"
-msgstr ""
+msgstr "GCredentials 沒有在這個 OS 上實作"
 
-#: gio/gcredentials.c:296
+#: ../gio/gcredentials.c:297
 msgid "There is no GCredentials support for your platform"
-msgstr ""
+msgstr "你的平台沒有 GCredentials 支援"
 
-#: gio/gdatainputstream.c:311
+#: ../gio/gdatainputstream.c:310
 msgid "Unexpected early end-of-stream"
 msgstr "未預期的串流過早結束"
 
-#: gio/gdbusaddress.c:135 gio/gdbusaddress.c:226 gio/gdbusaddress.c:300
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:140 ../gio/gdbusaddress.c:231
+#: ../gio/gdbusaddress.c:305
+#, c-format
 msgid "Unsupported key `%s' in address entry `%s'"
-msgstr "不支援的 socket 位址"
+msgstr "位址項目「%2$s」有不支援的設定鍵「%1$s」"
 
-#: gio/gdbusaddress.c:165
+#: ../gio/gdbusaddress.c:170
 #, c-format
 msgid ""
 "Address `%s' is invalid (need exactly one of path, tmpdir or abstract keys)"
-msgstr ""
+msgstr "位址「%s」是無效的（需要有明確的 path、tmpdir 或 abstract 設定鍵之一）"
 
-#: gio/gdbusaddress.c:178
+#: ../gio/gdbusaddress.c:183
 #, c-format
 msgid "Meaningless key/value pair combination in address entry `%s'"
-msgstr ""
+msgstr "在位址項「%s」有無意義的設定鍵/數值組合配對"
 
-#: gio/gdbusaddress.c:241 gio/gdbusaddress.c:315
+#: ../gio/gdbusaddress.c:246 ../gio/gdbusaddress.c:320
 #, c-format
 msgid "Error in address `%s' - the port attribute is malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - port 屬性的格式不良"
 
-#: gio/gdbusaddress.c:252 gio/gdbusaddress.c:326
+#: ../gio/gdbusaddress.c:257 ../gio/gdbusaddress.c:331
 #, c-format
 msgid "Error in address `%s' - the family attribute is malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - family 屬性的格式不良"
 
-#: gio/gdbusaddress.c:428
+#: ../gio/gdbusaddress.c:435
 #, c-format
 msgid "Address element `%s', does not contain a colon (:)"
-msgstr ""
+msgstr "位址元素「%s」，並未包含分號 (:)"
 
-#: gio/gdbusaddress.c:449
+#: ../gio/gdbusaddress.c:456
 #, c-format
 msgid ""
 "Key/Value pair %d, `%s', in address element `%s', does not contain an equal "
 "sign"
-msgstr ""
+msgstr "設定鍵/數值配對 %d，「%s」，於位址元素「%s」，並未包含等於符號"
 
-#: gio/gdbusaddress.c:523
+#: ../gio/gdbusaddress.c:536
 #, c-format
 msgid ""
 "Error in address `%s' - the unix transport requires exactly one of the keys "
 "`path' or `abstract' to be set"
-msgstr ""
+msgstr "位址「%s」有錯誤 - unix 傳輸需要明確的設定一個「path」或「abstract」設定鍵"
 
-#: gio/gdbusaddress.c:559
+#: ../gio/gdbusaddress.c:572
 #, c-format
 msgid "Error in address `%s' - the host attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - host 屬性遺失或格式不良"
 
-#: gio/gdbusaddress.c:573
+#: ../gio/gdbusaddress.c:586
 #, c-format
 msgid "Error in address `%s' - the port attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - port 屬性遺失或格式不良"
 
-#: gio/gdbusaddress.c:587
+#: ../gio/gdbusaddress.c:600
 #, c-format
 msgid "Error in address `%s' - the noncefile attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - noncefile 屬性遺失或格式不良"
+
+#: ../gio/gdbusaddress.c:621
+msgid "Error auto-launching: "
+msgstr "自動執行失敗："
 
-#: gio/gdbusaddress.c:601
+#: ../gio/gdbusaddress.c:629
 #, c-format
 msgid "Unknown or unsupported transport `%s' for address `%s'"
-msgstr ""
+msgstr "位址「%2$s」有不明或不支援的傳輸「%1$s」"
 
-#: gio/gdbusaddress.c:635
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:663
+#, c-format
 msgid "Error reading nonce file `%s':"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "讀取臨時檔案「%s」時發生錯誤："
 
-#: gio/gdbusaddress.c:646
-msgid "The nonce-file `%s' was %"
-msgstr ""
+#: ../gio/gdbusaddress.c:675
+#, c-format
+msgid "The nonce-file `%s' was %lu bytes. Expected 16 bytes."
+msgstr "nonce-file「%s」有 %lu 位元組。預期應為 16 位元組。"
 
-#: gio/gdbusaddress.c:662
+#: ../gio/gdbusaddress.c:691
 #, c-format
 msgid "Error write contents of nonce file `%s' to stream:"
-msgstr ""
+msgstr "寫入臨時檔案「%s」的內容到串流時發生錯誤："
+
+#: ../gio/gdbusaddress.c:915
+msgid "The given address is empty"
+msgstr "指定的位址是空白的"
 
-#: gio/gdbusaddress.c:978
+#: ../gio/gdbusaddress.c:984
+msgid "Cannot spawn a message bus without a machine-id: "
+msgstr "沒有 machine-id 不能產生訊息匯流排："
+
+#: ../gio/gdbusaddress.c:1021
 #, c-format
-msgid ""
-"Cannot determine session bus address (TODO: run dbus-launch to find out)"
-msgstr ""
+msgid "Error spawning command line `%s': "
+msgstr "產生命令列「%s」時出現錯誤："
 
-#: gio/gdbusaddress.c:1002 gio/gdbusconnection.c:5309
+#: ../gio/gdbusaddress.c:1032
+#, c-format
+msgid "Abnormal program termination spawning command line `%s': %s"
+msgstr "不正常的程式中止產生命令列「%s」：%s"
+
+#: ../gio/gdbusaddress.c:1046
+#, c-format
+msgid "Command line `%s' exited with non-zero exit status %d: %s"
+msgstr "命令列「%s」以非零結束狀態 %d 結束：%s"
+
+#: ../gio/gdbusaddress.c:1119
+#, c-format
+msgid "Cannot determine session bus address (not implemented for this OS)"
+msgstr "不能判斷作業階段匯流排位址（沒有在這個 OS 實作）"
+
+#: ../gio/gdbusaddress.c:1218 ../gio/gdbusconnection.c:5787
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "- unknown value `%s'"
-msgstr ""
+msgstr "不能從 DBUS_STARTER_BUS_TYPE 環境變數判斷匯流排位址 - 不明的數值「%s」"
 
-#: gio/gdbusaddress.c:1011 gio/gdbusconnection.c:5318
+#: ../gio/gdbusaddress.c:1227 ../gio/gdbusconnection.c:5796
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
-msgstr ""
+msgstr "不能判斷匯流排位址，因為尚未設定 DBUS_STARTER_BUS_TYPE 環境變數"
 
-#: gio/gdbusaddress.c:1021
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:1237
+#, c-format
 msgid "Unknown bus type %d"
-msgstr "不明的類型"
+msgstr "不明的匯流排類型 %d"
 
-#: gio/gdbusauth.c:289
+#: ../gio/gdbusauth.c:288
 msgid "Unexpected lack of content trying to read a line"
-msgstr ""
+msgstr "未預期的內容缺乏嘗試讀取行"
 
-#: gio/gdbusauth.c:333
+#: ../gio/gdbusauth.c:332
 msgid "Unexpected lack of content trying to (safely) read a line"
-msgstr ""
+msgstr "未預期的內容缺乏嘗試（安全的）讀取行"
 
-#: gio/gdbusauth.c:504
+#: ../gio/gdbusauth.c:503
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
-msgstr ""
+msgstr "竭盡所有可用的驗證機制 (已嘗試：%s) (可用：%s)"
 
-#: gio/gdbusauth.c:1146
+#: ../gio/gdbusauth.c:1149
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
-msgstr ""
+msgstr "已透過 GDBusAuthObserver::authorize-authenticated-peer 取消"
 
-#: gio/gdbusauthmechanismsha1.c:264
+#: ../gio/gdbusauthmechanismsha1.c:266
 #, fuzzy, c-format
 msgid "Error statting directory `%s': %s"
-msgstr "開啟目錄‘%s’時發生錯誤：%s"
+msgstr "建立目錄時發生錯誤"
 
-#: gio/gdbusauthmechanismsha1.c:276
+#: ../gio/gdbusauthmechanismsha1.c:278
 #, c-format
 msgid ""
 "Permissions on directory `%s' are malformed. Expected mode 0700, got 0%o"
-msgstr ""
+msgstr "目錄「%s」的權限格式下良。預期的模式為 0700，卻得到 0%o"
 
-#: gio/gdbusauthmechanismsha1.c:295
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:299
+#, c-format
 msgid "Error creating directory `%s': %s"
-msgstr "建立目錄發生錯誤：%s"
+msgstr "建立目錄「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:378
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:382
+#, c-format
 msgid "Error opening keyring `%s' for reading: "
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "開啟密碼匙圈「%s」讀取時發生錯誤："
 
-#: gio/gdbusauthmechanismsha1.c:402 gio/gdbusauthmechanismsha1.c:711
+#: ../gio/gdbusauthmechanismsha1.c:406 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid "Line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的密碼匙圈第 %1$d 行格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:416 gio/gdbusauthmechanismsha1.c:725
+#: ../gio/gdbusauthmechanismsha1.c:420 ../gio/gdbusauthmechanismsha1.c:729
 #, c-format
 msgid ""
 "First token of line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的密碼匙圈第 %1$d 行第一記號格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:739
+#: ../gio/gdbusauthmechanismsha1.c:434 ../gio/gdbusauthmechanismsha1.c:743
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的密碼匙圈第 %1$d 行第二記號格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:454
+#: ../gio/gdbusauthmechanismsha1.c:458
 #, c-format
 msgid "Didn't find cookie with id %d in the keyring at `%s'"
-msgstr ""
+msgstr "在「%2$s」密碼匙圈找不到 id %1$d 的 cookie"
 
-#: gio/gdbusauthmechanismsha1.c:531
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:535
+#, c-format
 msgid "Error deleting stale lock-file `%s': %s"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "刪除舊的鎖定檔案「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:562
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:566
+#, c-format
 msgid "Error creating lock-file `%s': %s"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "建立鎖定檔案「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:592
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:596
+#, c-format
 msgid "Error closing (unlinked) lock-file `%s': %s"
-msgstr "關閉檔案時發生錯誤：%s"
+msgstr "關閉（取消連結）鎖定檔案時發生錯誤「%s」：%s"
 
-#: gio/gdbusauthmechanismsha1.c:602
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:606
+#, c-format
 msgid "Error unlinking lock-file `%s': %s"
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "取消連結鎖定檔案時發生錯誤「%s」：%s"
 
-#: gio/gdbusauthmechanismsha1.c:678
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:682
+#, c-format
 msgid "Error opening keyring `%s' for writing: "
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "開啟密碼匙圈「%s」寫入時發生錯誤："
 
-#: gio/gdbusauthmechanismsha1.c:873
+#: ../gio/gdbusauthmechanismsha1.c:877
 #, c-format
 msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
-msgstr ""
+msgstr "(另外，釋放「%s」的鎖定失敗：%s)"
 
-#: gio/gdbusconnection.c:1001 gio/gdbusconnection.c:1311
-#, fuzzy
+#: ../gio/gdbusconnection.c:1047 ../gio/gdbusconnection.c:1198
+#: ../gio/gdbusconnection.c:1514
 msgid "The connection is closed"
-msgstr "加入的 socket 已經關閉"
+msgstr "這個連線已關閉"
 
-#: gio/gdbusconnection.c:1256
+#: ../gio/gdbusconnection.c:1459
 msgid "Timeout was reached"
-msgstr ""
+msgstr "已達逾時時間"
 
-#: gio/gdbusconnection.c:1757
+#: ../gio/gdbusconnection.c:2013
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
-msgstr ""
+msgstr "當建立客戶端連線時遇到不支援的旗標"
+
+#: ../gio/gdbusconnection.c:3399 ../gio/gdbusconnection.c:3715
+#, c-format
+msgid ""
+"No such interface `org.freedesktop.DBus.Properties' on object at path %s"
+msgstr "在路徑 %s 的物件沒有「org.freedesktop.DBus.Properties」這個介面"
 
-#: gio/gdbusconnection.c:3158
+#: ../gio/gdbusconnection.c:3470
 #, c-format
 msgid "Error setting property `%s': Expected type `%s' but got `%s'"
-msgstr ""
+msgstr "設定屬性「%s」錯誤：預期的類型為「%s」但得到「%s」"
 
-#: gio/gdbusconnection.c:3250
+#: ../gio/gdbusconnection.c:3564
 #, c-format
 msgid "No such property `%s'"
-msgstr ""
+msgstr "沒有這個屬性「%s」"
 
-#: gio/gdbusconnection.c:3262
-#, fuzzy, c-format
+#: ../gio/gdbusconnection.c:3576
+#, c-format
 msgid "Property `%s' is not readable"
-msgstr "類型 %s 尚未歸類"
+msgstr "屬性「%s」無法讀取"
 
-#: gio/gdbusconnection.c:3273
-#, fuzzy, c-format
+#: ../gio/gdbusconnection.c:3587
+#, c-format
 msgid "Property `%s' is not writable"
-msgstr "類型 %s 尚未歸類"
+msgstr "屬性「%s」無法寫入"
 
-#: gio/gdbusconnection.c:3341 gio/gdbusconnection.c:4768
+#: ../gio/gdbusconnection.c:3657 ../gio/gdbusconnection.c:5235
 #, c-format
 msgid "No such interface `%s'"
-msgstr ""
+msgstr "沒有這個介面「%s」"
 
-#: gio/gdbusconnection.c:3504
+#: ../gio/gdbusconnection.c:3842
 msgid "No such interface"
-msgstr ""
+msgstr "沒有這個介面"
 
-#: gio/gdbusconnection.c:3748
+#: ../gio/gdbusconnection.c:4058 ../gio/gdbusconnection.c:5737
+#, c-format
+msgid "No such interface `%s' on object at path %s"
+msgstr "在路徑 %2$s 的物件沒有「%1$s」這個介面"
+
+#: ../gio/gdbusconnection.c:4110
 #, c-format
 msgid "No such method `%s'"
-msgstr ""
+msgstr "沒有這個方法「%s」"
 
-#: gio/gdbusconnection.c:3779
+#: ../gio/gdbusconnection.c:4141
 #, c-format
 msgid "Type of message, `%s', does not match expected type `%s'"
-msgstr ""
+msgstr "訊息的類型，「%s」，不符合預期的類型「%s」"
 
-#: gio/gdbusconnection.c:3993
+#: ../gio/gdbusconnection.c:4359
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
-msgstr ""
+msgstr "有物件已為介面 %s 匯出於 %s"
 
-#: gio/gdbusconnection.c:4173
+#: ../gio/gdbusconnection.c:4553
 #, c-format
 msgid "Method `%s' returned type `%s', but expected `%s'"
-msgstr ""
+msgstr "方法「%s」傳回類型「%s」，但預期為「%s」"
 
-#: gio/gdbusconnection.c:4866
+#: ../gio/gdbusconnection.c:5337
 #, c-format
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
-msgstr ""
+msgstr "介面「%2$s」簽署「%3$s」的方法「%1$s」不存在"
 
-#: gio/gdbusconnection.c:4981
-#, fuzzy, c-format
-msgid "A subtree is already exported for %s"
-msgstr "聽取程式已經關閉"
-
-#: gio/gdbusconnection.c:5089
+#: ../gio/gdbusconnection.c:5452
 #, c-format
-msgid "Unable to load /var/lib/dbus/machine-id: %s"
-msgstr ""
+msgid "A subtree is already exported for %s"
+msgstr "子樹狀目錄已為 %s 匯出"
 
-#: gio/gdbusconnection.c:5259
+#: ../gio/gdbusmessage.c:754
 #, c-format
-msgid "No such interface `%s' on object at path %s"
-msgstr ""
+msgid "Wanted to read %lu bytes but got EOF"
+msgstr "嘗試讀取 %lu 位元組卻得到 EOF"
 
-#: gio/gdbusmessage.c:723
-msgid "Wanted to read %"
-msgstr ""
-
-#: gio/gdbusmessage.c:744
+#: ../gio/gdbusmessage.c:775
 #, c-format
 msgid "Expected NUL byte after the string `%s' but found `%c' (%d)"
-msgstr ""
+msgstr "預期在字串「%s」之後為 NUL 位元組，但是發現「%c」(%d)"
 
-#: gio/gdbusmessage.c:927
+#: ../gio/gdbusmessage.c:974
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus object path"
-msgstr ""
+msgstr "已解析數值「%s」不是有效的 D-Bus 物件路徑"
 
-#: gio/gdbusmessage.c:953
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:1000
+#, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "已解析數值「%s」不是一個有效的 D-Bus 簽署"
 
-#: gio/gdbusmessage.c:979
-msgid "Encountered array of length %"
-msgstr ""
+#: ../gio/gdbusmessage.c:1041
+#, c-format
+msgid "Encountered array of length %u bytes. Maximum length is 2<<26 bytes."
+msgstr "遇到長度為 %u 位元組的陣列。最大長度為 2<<26 位元組。"
 
-#: gio/gdbusmessage.c:1116
+#: ../gio/gdbusmessage.c:1202
 #, c-format
 msgid "Parsed value `%s' for variant is not a valid D-Bus signature"
 msgstr ""
 
-#: gio/gdbusmessage.c:1141
+#: ../gio/gdbusmessage.c:1229
 #, c-format
 msgid ""
 "Error deserializing GVariant with type-string `%s' from the D-Bus wire format"
 msgstr ""
 
-#: gio/gdbusmessage.c:1286
+#: ../gio/gdbusmessage.c:1409
 #, c-format
 msgid "Invalid endianness value. Expected 'l' or 'B' but found '%c' (%d)"
-msgstr ""
+msgstr "無效的位元組順序數值。預期為「I」或「B」卻得到「%c」(%d)"
 
-#: gio/gdbusmessage.c:1300
+#: ../gio/gdbusmessage.c:1423
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
-msgstr ""
+msgstr "無效的主通訊協定版本。預期為 1 但找到 %d"
 
-#: gio/gdbusmessage.c:1342
+#: ../gio/gdbusmessage.c:1480
 #, c-format
 msgid "Signature header with signature `%s' found but message body is empty"
-msgstr ""
+msgstr "發現簽署「%s」的簽署標頭但訊息主體是空的"
 
-#: gio/gdbusmessage.c:1356
+#: ../gio/gdbusmessage.c:1494
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature (for body)"
-msgstr ""
+msgstr "已解析數值「%s」不是有效的 D-Bus 簽署 (於主體)"
 
-#: gio/gdbusmessage.c:1385
-msgid "No signature header in message but the message body is %"
-msgstr ""
+#: ../gio/gdbusmessage.c:1524
+#, c-format
+msgid "No signature header in message but the message body is %u bytes"
+msgstr "在訊息中沒有簽署標頭但訊息主體有 %u 位元組"
 
-#: gio/gdbusmessage.c:1694
+#: ../gio/gdbusmessage.c:1841
 #, c-format
 msgid ""
 "Error serializing GVariant with type-string `%s' to the D-Bus wire format"
 msgstr ""
 
-#: gio/gdbusmessage.c:1823
+#: ../gio/gdbusmessage.c:1974
 #, c-format
 msgid "Message has %d fds but the header field indicates %d fds"
-msgstr ""
+msgstr "訊息有 %d fds 但標頭欄位表示有 %d fds"
 
-#: gio/gdbusmessage.c:1869
+#: ../gio/gdbusmessage.c:2020
 #, c-format
 msgid "Message body has signature `%s' but there is no signature header"
-msgstr ""
+msgstr "訊息主體有簽署「%s」但是沒有簽署標頭"
 
-#: gio/gdbusmessage.c:1879
+#: ../gio/gdbusmessage.c:2030
 #, c-format
 msgid ""
 "Message body has type signature `%s' but signature in the header field is `%"
 "s'"
-msgstr ""
+msgstr "訊息主體有類型簽署「%s」但是標頭欄位中的簽署為「%s」"
 
-#: gio/gdbusmessage.c:1895
+#: ../gio/gdbusmessage.c:2046
 #, c-format
 msgid "Message body is empty but signature in the header field is `(%s)'"
-msgstr ""
+msgstr "訊息主體是空的但是標頭欄位中的簽署為「%s」"
 
-#: gio/gdbusmessage.c:2448
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:2600
+#, c-format
 msgid "Error return with body of type `%s'"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "傳回類型「%s」主體時發生錯誤"
 
-#: gio/gdbusmessage.c:2456
+#: ../gio/gdbusmessage.c:2608
 msgid "Error return with empty body"
-msgstr ""
+msgstr "傳回空白主體錯誤"
 
-#: gio/gdbusmethodinvocation.c:357
+#: ../gio/gdbusmethodinvocation.c:375
 #, c-format
 msgid "Type of return value is incorrect, got `%s', expected `%s'"
-msgstr ""
+msgstr "回傳值的類型是不正確的，得到「%s」，預期為「%s」"
 
-#: gio/gdbusmethodinvocation.c:371 gio/gsocket.c:2859 gio/gsocket.c:2940
+#: ../gio/gdbusmethodinvocation.c:389 ../gio/gsocket.c:2867
+#: ../gio/gsocket.c:2948
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
-#: gio/gdbusprivate.c:775
+#: ../gio/gdbusprivate.c:885
 msgid "Error writing first 16 bytes of message to socket: "
-msgstr ""
+msgstr "當寫入訊息的頭 16 位元組到 socket 時發生錯誤："
 
-#: gio/gdbusproxy.c:633
+#: ../gio/gdbusprivate.c:1406
+msgid "Unable to load /var/lib/dbus/machine-id: "
+msgstr "無法載入 /var/lib/dbus/machine-id："
+
+#: ../gio/gdbusproxy.c:703
 #, c-format
 msgid ""
 "Trying to set property %s of type %s but according to the expected interface "
 "the type is %s"
-msgstr ""
+msgstr "正在嘗試設定類型 %2$s 的屬性 %1$s 但是根據預期的介面這個類型應該是 %3$s"
 
-#: gio/gdbusserver.c:669
-#, fuzzy
+#: ../gio/gdbusproxy.c:1224
+#, c-format
+msgid "Error calling StartServiceByName for %s: "
+msgstr "呼叫 %s StartServiceByName 時發生錯誤："
+
+#: ../gio/gdbusproxy.c:1245
+#, c-format
+msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
+msgstr "來自 StartServiceByName(\"%2$s\") 方法的未預期回應 %1$d"
+
+#: ../gio/gdbusserver.c:703
 msgid "Abstract name space not supported"
-msgstr "不支援回收筒"
+msgstr "不支援抽象命名空間"
 
-#: gio/gdbusserver.c:759
+#: ../gio/gdbusserver.c:793
 msgid "Cannot specify nonce file when creating a server"
-msgstr ""
+msgstr "當建立伺服器時不能指定臨時檔案"
 
-#: gio/gdbusserver.c:836
-#, fuzzy, c-format
+#: ../gio/gdbusserver.c:870
+#, c-format
 msgid "Error writing nonce file at `%s': %s"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "在「%s」寫入臨時檔案時發生錯誤：%s"
 
-#: gio/gdbusserver.c:988
-#, fuzzy, c-format
+#: ../gio/gdbusserver.c:1026
+#, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "字串「%s」不是一個有效的 D-Bus GUID"
 
-#: gio/gdbusserver.c:1028
+#: ../gio/gdbusserver.c:1066
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
-msgstr ""
+msgstr "不能聽取不支援的傳輸「%s」"
 
-#: gio/gdbus-tool.c:87 gio/gsettings-tool.c:38
+#: ../gio/gdbus-tool.c:87 ../gio/gsettings-tool.c:76
 msgid "COMMAND"
-msgstr ""
+msgstr "指令"
 
-#: gio/gdbus-tool.c:92
+#: ../gio/gdbus-tool.c:92
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1593,231 +1638,244 @@ msgid ""
 "\n"
 "Use \"%s COMMAND --help\" to get help on each command.\n"
 msgstr ""
+"指令：\n"
+"  help         顯示這個資訊\n"
+"  introspect   檢查遠端物件\n"
+"  monitor      監控遠端物件\n"
+"  call         呼叫遠端物件的方法\n"
+"\n"
+"使用「%s COMMAND --help」來取得每個指令的求助資訊。\n"
 
-#: gio/gdbus-tool.c:160 gio/gdbus-tool.c:216 gio/gdbus-tool.c:288
-#: gio/gdbus-tool.c:312 gio/gdbus-tool.c:814 gio/gdbus-tool.c:1322
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:160 ../gio/gdbus-tool.c:216 ../gio/gdbus-tool.c:288
+#: ../gio/gdbus-tool.c:312 ../gio/gdbus-tool.c:814 ../gio/gdbus-tool.c:1324
+#, c-format
 msgid "Error: %s\n"
-msgstr "第 %d 行發生錯誤：%s"
+msgstr "錯誤：%s\n"
 
-#: gio/gdbus-tool.c:171 gio/gdbus-tool.c:229 gio/gdbus-tool.c:1332
+#: ../gio/gdbus-tool.c:171 ../gio/gdbus-tool.c:229 ../gio/gdbus-tool.c:1340
 #, fuzzy, c-format
 msgid "Error parsing introspection XML: %s\n"
-msgstr "解析 %s 選項時發生錯誤"
+msgstr "解析指令時出現錯誤"
 
-#: gio/gdbus-tool.c:346
+#: ../gio/gdbus-tool.c:346
 msgid "Connect to the system bus"
-msgstr ""
+msgstr "連線到系統匯流排"
 
-#: gio/gdbus-tool.c:347
+#: ../gio/gdbus-tool.c:347
 msgid "Connect to the session bus"
-msgstr ""
+msgstr "連線到作業階段匯流排"
 
-#: gio/gdbus-tool.c:348
-#, fuzzy
+#: ../gio/gdbus-tool.c:348
 msgid "Connect to given D-Bus address"
-msgstr "連線進行中"
+msgstr "連線到指定的 D-Bus 位址"
 
-#: gio/gdbus-tool.c:358
-#, fuzzy
+#: ../gio/gdbus-tool.c:358
 msgid "Connection Endpoint Options:"
-msgstr "連線進行中"
+msgstr "連線端點選項："
 
-#: gio/gdbus-tool.c:359
+#: ../gio/gdbus-tool.c:359
 msgid "Options specifying the connection endpoint"
-msgstr ""
+msgstr "指定連線端點的選項"
 
-#: gio/gdbus-tool.c:379
+#: ../gio/gdbus-tool.c:379
 #, c-format
 msgid "No connection endpoint specified"
-msgstr ""
+msgstr "沒有指定連線端點"
 
-#: gio/gdbus-tool.c:389
+#: ../gio/gdbus-tool.c:389
 #, c-format
 msgid "Multiple connection endpoints specified"
-msgstr ""
+msgstr "指定了多重連線端點"
 
-#: gio/gdbus-tool.c:459
+#: ../gio/gdbus-tool.c:459
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface `%s' does not exist\n"
-msgstr ""
+msgstr "警告：根據檢討資料，介面「%s」不存在\n"
 
-#: gio/gdbus-tool.c:468
+#: ../gio/gdbus-tool.c:468
 #, c-format
 msgid ""
 "Warning: According to introspection data, method `%s' does not exist on "
 "interface `%s'\n"
-msgstr ""
+msgstr "警告：根據檢討資料，介面「%2$s」的方法「%1$s」不存在\n"
 
-#: gio/gdbus-tool.c:530
+#: ../gio/gdbus-tool.c:530
 msgid "Destination name to invoke method on"
-msgstr ""
+msgstr "要呼叫方法的目的端名稱"
 
-#: gio/gdbus-tool.c:531
+#: ../gio/gdbus-tool.c:531
 msgid "Object path to invoke method on"
-msgstr ""
+msgstr "要呼叫方法的物件路徑"
 
-#: gio/gdbus-tool.c:532
+#: ../gio/gdbus-tool.c:532
 msgid "Method and interface name"
-msgstr ""
+msgstr "方法和介面名稱"
 
-#: gio/gdbus-tool.c:571
+#: ../gio/gdbus-tool.c:571
 msgid "Invoke a method on a remote object."
-msgstr ""
+msgstr "呼叫遠端物件的方法。"
 
-#: gio/gdbus-tool.c:626 gio/gdbus-tool.c:1243 gio/gdbus-tool.c:1495
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:626 ../gio/gdbus-tool.c:1245 ../gio/gdbus-tool.c:1504
+#, c-format
 msgid "Error connecting: %s\n"
-msgstr "連線錯誤：%s"
+msgstr "連線錯誤：%s\n"
 
-#: gio/gdbus-tool.c:646 gio/gdbus-tool.c:1262 gio/gdbus-tool.c:1514
+#: ../gio/gdbus-tool.c:646 ../gio/gdbus-tool.c:1264 ../gio/gdbus-tool.c:1523
 #, c-format
 msgid "Error: Destination is not specified\n"
-msgstr ""
+msgstr "錯誤：尚未指定目的端\n"
 
-#: gio/gdbus-tool.c:667 gio/gdbus-tool.c:1281
+#: ../gio/gdbus-tool.c:667 ../gio/gdbus-tool.c:1283
 #, c-format
 msgid "Error: Object path is not specified\n"
-msgstr ""
+msgstr "錯誤：沒有指定物件路徑\n"
 
-#: gio/gdbus-tool.c:687 gio/gdbus-tool.c:1301 gio/gdbus-tool.c:1554
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:687 ../gio/gdbus-tool.c:1303 ../gio/gdbus-tool.c:1563
+#, c-format
 msgid "Error: %s is not a valid object path\n"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "錯誤：%s 不是有效的物件路徑\n"
 
-#: gio/gdbus-tool.c:702
+#: ../gio/gdbus-tool.c:702
 #, c-format
 msgid "Error: Method name is not specified\n"
-msgstr ""
+msgstr "錯誤：沒有指定方法名稱\n"
 
-#: gio/gdbus-tool.c:713
+#: ../gio/gdbus-tool.c:713
 #, c-format
 msgid "Error: Method name `%s' is invalid\n"
-msgstr ""
+msgstr "錯誤：方法名稱「%s」是無效的\n"
 
-#: gio/gdbus-tool.c:778
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:778
+#, c-format
 msgid "Error parsing parameter %d of type `%s': %s\n"
-msgstr "開啟目錄‘%s’時發生錯誤：%s"
+msgstr "解析類型「%2$s」的參數 %1$d 時發生錯誤：%3$s\n"
 
-#: gio/gdbus-tool.c:786
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:786
+#, c-format
 msgid "Error parsing parameter %d: %s\n"
-msgstr "解析 %s 選項時發生錯誤"
+msgstr "解析參數 %d 時發生錯誤：%s\n"
 
-#: gio/gdbus-tool.c:1161
+#: ../gio/gdbus-tool.c:1162
+#, fuzzy
 msgid "Destination name to introspect"
-msgstr ""
+msgstr "用來識別本面板的名稱"
 
-#: gio/gdbus-tool.c:1162
+#: ../gio/gdbus-tool.c:1163
+#, fuzzy
 msgid "Object path to introspect"
-msgstr ""
+msgstr "「cvs」 指令的路徑"
 
-#: gio/gdbus-tool.c:1195
+#: ../gio/gdbus-tool.c:1164
+msgid "Print XML"
+msgstr "顯示 XML"
+
+#: ../gio/gdbus-tool.c:1197
+#, fuzzy
 msgid "Introspect a remote object."
-msgstr ""
+msgstr "讀出物件助記符(_K)"
 
-#: gio/gdbus-tool.c:1413
+#: ../gio/gdbus-tool.c:1422
 msgid "Destination name to monitor"
-msgstr ""
+msgstr "要監控的目的端名稱"
 
-#: gio/gdbus-tool.c:1414
+#: ../gio/gdbus-tool.c:1423
 msgid "Object path to monitor"
-msgstr ""
+msgstr "要監控的物件路徑"
 
-#: gio/gdbus-tool.c:1447
-#, fuzzy
+#: ../gio/gdbus-tool.c:1456
 msgid "Monitor a remote object."
-msgstr "損毀的物件"
+msgstr "監控遠端物件。"
 
-#: gio/gdesktopappinfo.c:468 gio/gwin32appinfo.c:222
+#: ../gio/gdesktopappinfo.c:467 ../gio/gwin32appinfo.c:221
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: gio/gdesktopappinfo.c:742
+#: ../gio/gdesktopappinfo.c:751
 msgid "Desktop file didn't specify Exec field"
 msgstr "桌面(Desktop)檔案未指定 Exec 欄位"
 
-#: gio/gdesktopappinfo.c:935
+#: ../gio/gdesktopappinfo.c:944
 msgid "Unable to find terminal required for application"
 msgstr "無法找到應用程式要求的終端機"
 
-#: gio/gdesktopappinfo.c:1144
+#: ../gio/gdesktopappinfo.c:1153
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "不能建立使用者應用程式組態資料夾 %s：%s"
 
-#: gio/gdesktopappinfo.c:1148
+#: ../gio/gdesktopappinfo.c:1157
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "不能建立使用者 MIME 組態資料夾 %s：%s"
 
-#: gio/gdesktopappinfo.c:1556
+#: ../gio/gdesktopappinfo.c:1565
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "不能建立使用者桌面檔案 %s"
 
-#: gio/gdesktopappinfo.c:1670
+#: ../gio/gdesktopappinfo.c:1679
 #, c-format
 msgid "Custom definition for %s"
 msgstr "自選 %s 的定義"
 
-#: gio/gdrive.c:364
+#: ../gio/gdrive.c:363
 msgid "drive doesn't implement eject"
 msgstr "裝置無法實作退出功能(eject)"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gdrive.c:444
+#: ../gio/gdrive.c:443
 msgid "drive doesn't implement eject or eject_with_operation"
 msgstr "裝置無法實作退出功能(eject) 或 eject_with_operation"
 
-#: gio/gdrive.c:521
+#: ../gio/gdrive.c:520
 msgid "drive doesn't implement polling for media"
 msgstr "裝置無法實作媒體的輪詢"
 
-#: gio/gdrive.c:726
+#: ../gio/gdrive.c:725
 msgid "drive doesn't implement start"
 msgstr "裝置無法實作啟動功能(start)"
 
-#: gio/gdrive.c:828
+#: ../gio/gdrive.c:827
 msgid "drive doesn't implement stop"
 msgstr "裝置無法實作停止功能(stop)"
 
-#: gio/gemblem.c:325
+#: ../gio/gemblem.c:324
 #, c-format
 msgid "Can't handle version %d of GEmblem encoding"
 msgstr "不能處理版本為 %d 的 GEmblem 編碼"
 
-#: gio/gemblem.c:335
+#: ../gio/gemblem.c:334
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "GEmblem 編碼中記號 (%d) 的數量格式不正確"
 
-#: gio/gemblemedicon.c:296
+#: ../gio/gemblemedicon.c:295
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr "不能處理版本為 %d 的 GEmblemedIcon 編碼"
 
-#: gio/gemblemedicon.c:306
+#: ../gio/gemblemedicon.c:305
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "GEmblemedIcon 編碼中記號 (%d) 的數量格式不正確"
 
-#: gio/gemblemedicon.c:329
+#: ../gio/gemblemedicon.c:328
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "預期為 GEmblemedIcon 的 GEmblem"
 
-#: gio/gfile.c:871 gio/gfile.c:1101 gio/gfile.c:1236 gio/gfile.c:1472
-#: gio/gfile.c:1526 gio/gfile.c:1583 gio/gfile.c:1666 gio/gfile.c:1721
-#: gio/gfile.c:1781 gio/gfile.c:1835 gio/gfile.c:3304 gio/gfile.c:3358
-#: gio/gfile.c:3490 gio/gfile.c:3530 gio/gfile.c:3857 gio/gfile.c:4259
-#: gio/gfile.c:4345 gio/gfile.c:4434 gio/gfile.c:4532 gio/gfile.c:4619
-#: gio/gfile.c:4712 gio/gfile.c:5042 gio/gfile.c:5322 gio/gfile.c:5391
-#: gio/gfile.c:6982 gio/gfile.c:7072 gio/gfile.c:7158
-#: gio/win32/gwinhttpfile.c:441
+#: ../gio/gfile.c:870 ../gio/gfile.c:1100 ../gio/gfile.c:1235
+#: ../gio/gfile.c:1471 ../gio/gfile.c:1525 ../gio/gfile.c:1582
+#: ../gio/gfile.c:1665 ../gio/gfile.c:1720 ../gio/gfile.c:1780
+#: ../gio/gfile.c:1834 ../gio/gfile.c:3304 ../gio/gfile.c:3358
+#: ../gio/gfile.c:3490 ../gio/gfile.c:3530 ../gio/gfile.c:3857
+#: ../gio/gfile.c:4259 ../gio/gfile.c:4345 ../gio/gfile.c:4434
+#: ../gio/gfile.c:4532 ../gio/gfile.c:4619 ../gio/gfile.c:4712
+#: ../gio/gfile.c:5042 ../gio/gfile.c:5322 ../gio/gfile.c:5391
+#: ../gio/gfile.c:6982 ../gio/gfile.c:7072 ../gio/gfile.c:7158
+#: ../gio/win32/gwinhttpfile.c:439
 msgid "Operation not supported"
 msgstr "不支援的操作"
 
@@ -1829,137 +1887,137 @@ msgstr "不支援的操作"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: gio/gfile.c:1357 gio/glocalfile.c:1060 gio/glocalfile.c:1071
-#: gio/glocalfile.c:1084
+#: ../gio/gfile.c:1356 ../gio/glocalfile.c:1059 ../gio/glocalfile.c:1070
+#: ../gio/glocalfile.c:1083
 msgid "Containing mount does not exist"
 msgstr "包含了不存在的掛載點"
 
-#: gio/gfile.c:2409 gio/glocalfile.c:2259
+#: ../gio/gfile.c:2408 ../gio/glocalfile.c:2258
 msgid "Can't copy over directory"
 msgstr "不能複製整個目錄"
 
-#: gio/gfile.c:2469
+#: ../gio/gfile.c:2469
 msgid "Can't copy directory over directory"
 msgstr "不能將目錄複製到目錄上"
 
-#: gio/gfile.c:2477 gio/glocalfile.c:2268
+#: ../gio/gfile.c:2477 ../gio/glocalfile.c:2267
 msgid "Target file exists"
 msgstr "目標檔案已存在"
 
-#: gio/gfile.c:2495
+#: ../gio/gfile.c:2495
 msgid "Can't recursively copy directory"
 msgstr "不能遞廻複製目錄"
 
-#: gio/gfile.c:2755
+#: ../gio/gfile.c:2755
 msgid "Splice not supported"
 msgstr "不支援拼接"
 
-#: gio/gfile.c:2759
+#: ../gio/gfile.c:2759
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "拼接檔案時發生錯誤：%s"
 
-#: gio/gfile.c:2906
+#: ../gio/gfile.c:2906
 msgid "Can't copy special file"
 msgstr "不能複製特殊的檔案"
 
-#: gio/gfile.c:3480
+#: ../gio/gfile.c:3480
 msgid "Invalid symlink value given"
 msgstr "提供了無效的符號連結值"
 
-#: gio/gfile.c:3573
+#: ../gio/gfile.c:3573
 msgid "Trash not supported"
 msgstr "不支援回收筒"
 
-#: gio/gfile.c:3622
+#: ../gio/gfile.c:3622
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "檔案名稱不能包含「%c」"
 
-#: gio/gfile.c:6039 gio/gvolume.c:331
+#: ../gio/gfile.c:6039 ../gio/gvolume.c:330
 msgid "volume doesn't implement mount"
 msgstr "儲存區尚未實作掛載功能"
 
-#: gio/gfile.c:6150
+#: ../gio/gfile.c:6150
 msgid "No application is registered as handling this file"
 msgstr "沒有應用程式註冊為用以處理這個檔案"
 
-#: gio/gfileenumerator.c:206
+#: ../gio/gfileenumerator.c:205
 msgid "Enumerator is closed"
 msgstr "檔案列舉器(enumerator)已關閉"
 
-#: gio/gfileenumerator.c:213 gio/gfileenumerator.c:272
-#: gio/gfileenumerator.c:372 gio/gfileenumerator.c:481
+#: ../gio/gfileenumerator.c:212 ../gio/gfileenumerator.c:271
+#: ../gio/gfileenumerator.c:371 ../gio/gfileenumerator.c:480
 msgid "File enumerator has outstanding operation"
 msgstr "檔案列舉器(enumerator)有異常操作"
 
-#: gio/gfileenumerator.c:362 gio/gfileenumerator.c:471
+#: ../gio/gfileenumerator.c:361 ../gio/gfileenumerator.c:470
 msgid "File enumerator is already closed"
 msgstr "檔案列舉器(enumerator)已經關閉"
 
-#: gio/gfileicon.c:237
+#: ../gio/gfileicon.c:236
 #, c-format
 msgid "Can't handle version %d of GFileIcon encoding"
 msgstr "不能處理版本為 %d 的 GFileIcon 編碼"
 
-#: gio/gfileicon.c:247
+#: ../gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "給 GFileIcon 的輸入資料格式不良"
 
-#: gio/gfileinputstream.c:155 gio/gfileinputstream.c:422
-#: gio/gfileiostream.c:171 gio/gfileoutputstream.c:170
-#: gio/gfileoutputstream.c:525
+#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:421
+#: ../gio/gfileiostream.c:170 ../gio/gfileoutputstream.c:169
+#: ../gio/gfileoutputstream.c:524
 msgid "Stream doesn't support query_info"
 msgstr "串流不支援 query_info"
 
-#: gio/gfileinputstream.c:337 gio/gfileiostream.c:389
-#: gio/gfileoutputstream.c:383
+#: ../gio/gfileinputstream.c:336 ../gio/gfileiostream.c:388
+#: ../gio/gfileoutputstream.c:382
 msgid "Seek not supported on stream"
 msgstr "不支援在串流中搜尋"
 
-#: gio/gfileinputstream.c:381
+#: ../gio/gfileinputstream.c:380
 msgid "Truncate not allowed on input stream"
 msgstr "在輸入串流中不允許截短(truncate)"
 
-#: gio/gfileiostream.c:465 gio/gfileoutputstream.c:459
+#: ../gio/gfileiostream.c:464 ../gio/gfileoutputstream.c:458
 msgid "Truncate not supported on stream"
 msgstr "在串流中不支援截短(truncate)"
 
-#: gio/gicon.c:286
+#: ../gio/gicon.c:285
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "記號數量 (%d) 錯誤"
 
-#: gio/gicon.c:306
+#: ../gio/gicon.c:305
 #, c-format
 msgid "No type for class name %s"
 msgstr "類別名稱 %s 沒有類型"
 
-#: gio/gicon.c:316
+#: ../gio/gicon.c:315
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "類型 %s 沒有實作 GIcon 介面"
 
-#: gio/gicon.c:327
+#: ../gio/gicon.c:326
 #, c-format
 msgid "Type %s is not classed"
 msgstr "類型 %s 尚未歸類"
 
-#: gio/gicon.c:341
+#: ../gio/gicon.c:340
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "格式不良的版本號碼：%s"
 
-#: gio/gicon.c:355
+#: ../gio/gicon.c:354
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "類型 %s 沒有實作 GIcon 介面的 from_tokens()"
 
-#: gio/gicon.c:431
+#: ../gio/gicon.c:430
 msgid "Can't handle the supplied version the icon encoding"
 msgstr "不能處理提供的圖示編碼版本"
 
-#: gio/ginputstream.c:195
+#: ../gio/ginputstream.c:194
 msgid "Input stream doesn't implement read"
 msgstr "輸入串流尚未實作讀取"
 
@@ -1969,461 +2027,474 @@ msgstr "輸入串流尚未實作讀取"
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: gio/ginputstream.c:902 gio/giostream.c:315 gio/goutputstream.c:1206
+#: ../gio/ginputstream.c:901 ../gio/giostream.c:314
+#: ../gio/goutputstream.c:1205
 msgid "Stream has outstanding operation"
 msgstr "串流有異常操作"
 
-#: gio/ginetsocketaddress.c:182 gio/ginetsocketaddress.c:199
-#: gio/gunixsocketaddress.c:222
+#: ../gio/ginetsocketaddress.c:181 ../gio/ginetsocketaddress.c:198
+#: ../gio/gunixsocketaddress.c:221
 msgid "Not enough space for socket address"
 msgstr "socket 位址沒有足夠的空間"
 
-#: gio/ginetsocketaddress.c:212
+#: ../gio/ginetsocketaddress.c:211
 msgid "Unsupported socket address"
 msgstr "不支援的 socket 位址"
 
-#: gio/glocaldirectorymonitor.c:288
+#: ../gio/glocaldirectorymonitor.c:287
 msgid "Unable to find default local directory monitor type"
 msgstr "無法找到預設的本地端目錄監視器類型"
 
-#: gio/glocalfile.c:594 gio/win32/gwinhttpfile.c:424
+#: ../gio/glocalfile.c:593 ../gio/win32/gwinhttpfile.c:422
 #, c-format
 msgid "Invalid filename %s"
 msgstr "無效的檔案名稱 %s"
 
-#: gio/glocalfile.c:968
+#: ../gio/glocalfile.c:967
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "取得檔案系統資訊時發生錯誤：%s"
 
-#: gio/glocalfile.c:1106
+#: ../gio/glocalfile.c:1105
 msgid "Can't rename root directory"
 msgstr "不能重新命名根目錄"
 
-#: gio/glocalfile.c:1126 gio/glocalfile.c:1152
+#: ../gio/glocalfile.c:1125 ../gio/glocalfile.c:1151
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "重新命名檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1135
+#: ../gio/glocalfile.c:1134
 msgid "Can't rename file, filename already exist"
 msgstr "不能重新命名檔案，該檔案名稱已存在"
 
-#: gio/glocalfile.c:1148 gio/glocalfile.c:2132 gio/glocalfile.c:2161
-#: gio/glocalfile.c:2321 gio/glocalfileoutputstream.c:570
-#: gio/glocalfileoutputstream.c:623 gio/glocalfileoutputstream.c:668
-#: gio/glocalfileoutputstream.c:1150
+#: ../gio/glocalfile.c:1147 ../gio/glocalfile.c:2131 ../gio/glocalfile.c:2160
+#: ../gio/glocalfile.c:2320 ../gio/glocalfileoutputstream.c:571
+#: ../gio/glocalfileoutputstream.c:624 ../gio/glocalfileoutputstream.c:669
+#: ../gio/glocalfileoutputstream.c:1151
 msgid "Invalid filename"
 msgstr "無效的檔案名稱"
 
-#: gio/glocalfile.c:1309
+#: ../gio/glocalfile.c:1308
 #, c-format
 msgid "Error opening file: %s"
 msgstr "開啓檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1319
+#: ../gio/glocalfile.c:1318
 msgid "Can't open directory"
 msgstr "不能開啟目錄"
 
-#: gio/glocalfile.c:1444
+#: ../gio/glocalfile.c:1443
 #, c-format
 msgid "Error removing file: %s"
 msgstr "移除檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1811
+#: ../gio/glocalfile.c:1810
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "移動檔案至回收筒時發生錯誤：%s"
 
-#: gio/glocalfile.c:1834
+#: ../gio/glocalfile.c:1833
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "無法建立回收筒目錄 %s：%s"
 
-#: gio/glocalfile.c:1855
+#: ../gio/glocalfile.c:1854
 msgid "Unable to find toplevel directory for trash"
 msgstr "無法找到回收筒的頂端層級目錄"
 
-#: gio/glocalfile.c:1934 gio/glocalfile.c:1954
+#: ../gio/glocalfile.c:1933 ../gio/glocalfile.c:1953
 msgid "Unable to find or create trash directory"
 msgstr "無法找到或建立回收筒目錄"
 
-#: gio/glocalfile.c:1988
+#: ../gio/glocalfile.c:1987
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "無法建立回收筒資訊檔案：%s"
 
-#: gio/glocalfile.c:2017 gio/glocalfile.c:2022 gio/glocalfile.c:2102
-#: gio/glocalfile.c:2109
+#: ../gio/glocalfile.c:2016 ../gio/glocalfile.c:2021 ../gio/glocalfile.c:2101
+#: ../gio/glocalfile.c:2108
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "無法將檔案移至回收筒：%s"
 
-#: gio/glocalfile.c:2136
+#: ../gio/glocalfile.c:2135
 #, c-format
 msgid "Error creating directory: %s"
 msgstr "建立目錄發生錯誤：%s"
 
-#: gio/glocalfile.c:2165
+#: ../gio/glocalfile.c:2164
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "檔案系統不支援符號連結"
 
-#: gio/glocalfile.c:2169
+#: ../gio/glocalfile.c:2168
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "建立符號連結時發生錯誤：%s"
 
-#: gio/glocalfile.c:2231 gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2230 ../gio/glocalfile.c:2324
 #, c-format
 msgid "Error moving file: %s"
 msgstr "移動檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:2254
+#: ../gio/glocalfile.c:2253
 msgid "Can't move directory over directory"
 msgstr "不能將目錄移動至目錄上"
 
-#: gio/glocalfile.c:2281 gio/glocalfileoutputstream.c:948
-#: gio/glocalfileoutputstream.c:962 gio/glocalfileoutputstream.c:977
-#: gio/glocalfileoutputstream.c:993 gio/glocalfileoutputstream.c:1007
+#: ../gio/glocalfile.c:2280 ../gio/glocalfileoutputstream.c:949
+#: ../gio/glocalfileoutputstream.c:963 ../gio/glocalfileoutputstream.c:978
+#: ../gio/glocalfileoutputstream.c:994 ../gio/glocalfileoutputstream.c:1008
 msgid "Backup file creation failed"
 msgstr "建立備份檔案失敗"
 
-#: gio/glocalfile.c:2300
+#: ../gio/glocalfile.c:2299
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目標檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:2314
+#: ../gio/glocalfile.c:2313
 msgid "Move between mounts not supported"
 msgstr "不支援在掛載點之間移動"
 
-#: gio/glocalfileinfo.c:721
+#: ../gio/glocalfileinfo.c:720
 msgid "Attribute value must be non-NULL"
 msgstr "屬性數值必須為非-NULL"
 
-#: gio/glocalfileinfo.c:728
+#: ../gio/glocalfileinfo.c:727
 msgid "Invalid attribute type (string expected)"
 msgstr "無效的屬性類型（應為字串值）"
 
-#: gio/glocalfileinfo.c:735
+#: ../gio/glocalfileinfo.c:734
 msgid "Invalid extended attribute name"
 msgstr "無效的延伸屬性名稱"
 
-#: gio/glocalfileinfo.c:775
+#: ../gio/glocalfileinfo.c:774
 #, c-format
 msgid "Error setting extended attribute '%s': %s"
 msgstr "設定延伸屬性「%s」時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1479 gio/glocalfileoutputstream.c:832
+#: ../gio/glocalfileinfo.c:1483 ../gio/glocalfileoutputstream.c:833
 #, c-format
 msgid "Error stating file '%s': %s"
 msgstr "取得檔案「%s」狀態時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1552
+#: ../gio/glocalfileinfo.c:1567
 msgid " (invalid encoding)"
 msgstr "（無效的編碼）"
 
-#: gio/glocalfileinfo.c:1750
+#: ../gio/glocalfileinfo.c:1769
 #, c-format
 msgid "Error stating file descriptor: %s"
 msgstr "取得檔案描述狀態時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1795
+#: ../gio/glocalfileinfo.c:1814
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "無效的屬性類型（應為 uint32 值）"
 
-#: gio/glocalfileinfo.c:1813
+#: ../gio/glocalfileinfo.c:1832
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "無效的屬性類型（應為 uint64 值）"
 
-#: gio/glocalfileinfo.c:1832 gio/glocalfileinfo.c:1851
+#: ../gio/glocalfileinfo.c:1851 ../gio/glocalfileinfo.c:1870
 msgid "Invalid attribute type (byte string expected)"
 msgstr "無效的屬性類型（應為 byte string 值）"
 
-#: gio/glocalfileinfo.c:1886
+#: ../gio/glocalfileinfo.c:1905
 msgid "Cannot set permissions on symlinks"
 msgstr "不能設定符號連結的權限"
 
-#: gio/glocalfileinfo.c:1902
+#: ../gio/glocalfileinfo.c:1921
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "設定權限時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1953
+#: ../gio/glocalfileinfo.c:1972
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "設定擁有者時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1976
+#: ../gio/glocalfileinfo.c:1995
 msgid "symlink must be non-NULL"
 msgstr "符號連結必須為非-NULL"
 
-#: gio/glocalfileinfo.c:1986 gio/glocalfileinfo.c:2005
-#: gio/glocalfileinfo.c:2016
+#: ../gio/glocalfileinfo.c:2005 ../gio/glocalfileinfo.c:2024
+#: ../gio/glocalfileinfo.c:2035
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "設定符號連結時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1995
+#: ../gio/glocalfileinfo.c:2014
 msgid "Error setting symlink: file is not a symlink"
 msgstr "設定符號連結時發生錯誤：檔案不是符號連結"
 
-#: gio/glocalfileinfo.c:2121
+#: ../gio/glocalfileinfo.c:2140
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "設定修改或存取時刻時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:2144
+#: ../gio/glocalfileinfo.c:2163
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux 關聯必須為非-NULL"
 
-#: gio/glocalfileinfo.c:2159
+#: ../gio/glocalfileinfo.c:2178
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "設定 SELinux 關聯時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:2166
+#: ../gio/glocalfileinfo.c:2185
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux 在這個系統上並未啟用"
 
-#: gio/glocalfileinfo.c:2258
+#: ../gio/glocalfileinfo.c:2277
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "不支援設定屬性 %s"
 
-#: gio/glocalfileinputstream.c:184 gio/glocalfileoutputstream.c:721
+#: ../gio/glocalfileinputstream.c:185 ../gio/glocalfileoutputstream.c:722
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "從檔案讀取時發生錯誤：%s"
 
-#: gio/glocalfileinputstream.c:215 gio/glocalfileinputstream.c:227
-#: gio/glocalfileinputstream.c:339 gio/glocalfileoutputstream.c:469
-#: gio/glocalfileoutputstream.c:1025
+#: ../gio/glocalfileinputstream.c:216 ../gio/glocalfileinputstream.c:228
+#: ../gio/glocalfileinputstream.c:340 ../gio/glocalfileoutputstream.c:470
+#: ../gio/glocalfileoutputstream.c:1026
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "在檔案中搜尋時發生錯誤：%s"
 
-#: gio/glocalfileinputstream.c:260 gio/glocalfileoutputstream.c:255
-#: gio/glocalfileoutputstream.c:350
+#: ../gio/glocalfileinputstream.c:261 ../gio/glocalfileoutputstream.c:256
+#: ../gio/glocalfileoutputstream.c:351
 #, c-format
 msgid "Error closing file: %s"
 msgstr "關閉檔案時發生錯誤：%s"
 
-#: gio/glocalfilemonitor.c:213
+#: ../gio/glocalfilemonitor.c:212
 msgid "Unable to find default local file monitor type"
 msgstr "無法找到預設的本地端檔案監視器類型"
 
-#: gio/glocalfileoutputstream.c:201 gio/glocalfileoutputstream.c:234
-#: gio/glocalfileoutputstream.c:742
+#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:235
+#: ../gio/glocalfileoutputstream.c:743
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "寫入至檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:282
+#: ../gio/glocalfileoutputstream.c:283
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "移除舊備份連結時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:296 gio/glocalfileoutputstream.c:309
+#: ../gio/glocalfileoutputstream.c:297 ../gio/glocalfileoutputstream.c:310
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "建立備份複本時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:327
+#: ../gio/glocalfileoutputstream.c:328
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "重新命名暫存檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:515 gio/glocalfileoutputstream.c:1076
+#: ../gio/glocalfileoutputstream.c:516 ../gio/glocalfileoutputstream.c:1077
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "截短檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:576 gio/glocalfileoutputstream.c:629
-#: gio/glocalfileoutputstream.c:674 gio/glocalfileoutputstream.c:814
-#: gio/glocalfileoutputstream.c:1057 gio/glocalfileoutputstream.c:1156
+#: ../gio/glocalfileoutputstream.c:577 ../gio/glocalfileoutputstream.c:630
+#: ../gio/glocalfileoutputstream.c:675 ../gio/glocalfileoutputstream.c:815
+#: ../gio/glocalfileoutputstream.c:1058 ../gio/glocalfileoutputstream.c:1157
 #, c-format
 msgid "Error opening file '%s': %s"
 msgstr "開啟檔案「%s」時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:845
+#: ../gio/glocalfileoutputstream.c:846
 msgid "Target file is a directory"
 msgstr "目標檔案是一個目錄"
 
-#: gio/glocalfileoutputstream.c:850
+#: ../gio/glocalfileoutputstream.c:851
 msgid "Target file is not a regular file"
 msgstr "目標檔案不是正規的檔案"
 
-#: gio/glocalfileoutputstream.c:862
+#: ../gio/glocalfileoutputstream.c:863
 msgid "The file was externally modified"
 msgstr "該檔案已被外部程式修改過"
 
-#: gio/glocalfileoutputstream.c:1041
+#: ../gio/glocalfileoutputstream.c:1042
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "移除舊檔案時發生錯誤：%s"
 
-#: gio/gmemoryinputstream.c:487 gio/gmemoryoutputstream.c:718
+#: ../gio/gmemoryinputstream.c:486 ../gio/gmemoryoutputstream.c:717
 msgid "Invalid GSeekType supplied"
 msgstr "提供了無效的 GSeek 類型"
 
-#: gio/gmemoryinputstream.c:497
+#: ../gio/gmemoryinputstream.c:496
 msgid "Invalid seek request"
 msgstr "無效的搜尋要求"
 
-#: gio/gmemoryinputstream.c:521
+#: ../gio/gmemoryinputstream.c:520
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "不能截短 GMemoryInputStream"
 
-#: gio/gmemoryoutputstream.c:468
+#: ../gio/gmemoryoutputstream.c:467
 msgid "Memory output stream not resizable"
 msgstr "記憶體輸出串流不能改變大小"
 
-#: gio/gmemoryoutputstream.c:484
+#: ../gio/gmemoryoutputstream.c:483
 msgid "Failed to resize memory output stream"
 msgstr "改變記憶體輸出串流的大小失敗"
 
-#: gio/gmemoryoutputstream.c:572
+#: ../gio/gmemoryoutputstream.c:571
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
 msgstr "進行寫入所需的記憶體總額大於可用的位址空間"
 
-#: gio/gmemoryoutputstream.c:728
+#: ../gio/gmemoryoutputstream.c:727
 msgid "Requested seek before the beginning of the stream"
 msgstr "在串流的開頭之前要求的搜索"
 
-#: gio/gmemoryoutputstream.c:737
+#: ../gio/gmemoryoutputstream.c:736
 msgid "Requested seek beyond the end of the stream"
 msgstr "在串流的開頭之後要求的搜索"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: gio/gmount.c:364
+#: ../gio/gmount.c:363
 msgid "mount doesn't implement \"unmount\""
 msgstr "掛載點尚未實作卸載(umount)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: gio/gmount.c:443
+#: ../gio/gmount.c:442
 msgid "mount doesn't implement \"eject\""
 msgstr "掛載點尚未實作退出(eject)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: gio/gmount.c:523
+#: ../gio/gmount.c:522
 msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
 msgstr "掛載點尚未實作卸載(umount)或「umount_with_operation」"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gmount.c:610
+#: ../gio/gmount.c:609
 msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
 msgstr "掛載點尚未實作退出(eject)或「eject_with_operation」"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: gio/gmount.c:699
+#: ../gio/gmount.c:698
 msgid "mount doesn't implement \"remount\""
 msgstr "掛載點尚未實作重新掛載(remount)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:783
+#: ../gio/gmount.c:782
 msgid "mount doesn't implement content type guessing"
 msgstr "掛載點尚未實作內容類型預測"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:872
+#: ../gio/gmount.c:871
 msgid "mount doesn't implement synchronous content type guessing"
 msgstr "掛載點尚未實作同步內容類型預測"
 
-#: gio/gnetworkaddress.c:295
+#: ../gio/gnetworkaddress.c:294
 #, c-format
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主機名稱「%s」含有 '[' but not ']'"
 
-#: gio/goutputstream.c:207 gio/goutputstream.c:408
+#: ../gio/goutputstream.c:206 ../gio/goutputstream.c:407
 msgid "Output stream doesn't implement write"
 msgstr "輸出串流尚未實作寫入"
 
-#: gio/goutputstream.c:369 gio/goutputstream.c:845
+#: ../gio/goutputstream.c:368 ../gio/goutputstream.c:844
 msgid "Source stream is already closed"
 msgstr "來源串流已經關閉"
 
-#: gio/gresolver.c:736
+#: ../gio/gresolver.c:735
 #, c-format
 msgid "Error resolving '%s': %s"
 msgstr "解析「%s」時發生錯誤：%s"
 
-#: gio/gresolver.c:786
+#: ../gio/gresolver.c:785
 #, c-format
 msgid "Error reverse-resolving '%s': %s"
 msgstr "反向解析「%s」時發生錯誤：%s"
 
-#: gio/gresolver.c:821 gio/gresolver.c:899
+#: ../gio/gresolver.c:820 ../gio/gresolver.c:898
 #, c-format
 msgid "No service record for '%s'"
 msgstr "沒有「%s」的服務紀錄"
 
-#: gio/gresolver.c:826 gio/gresolver.c:904
+#: ../gio/gresolver.c:825 ../gio/gresolver.c:903
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr "暫時無法解析「%s」"
 
-#: gio/gresolver.c:831 gio/gresolver.c:909
+#: ../gio/gresolver.c:830 ../gio/gresolver.c:908
 #, c-format
 msgid "Error resolving '%s'"
 msgstr "解析「%s」時發生錯誤"
 
-#: gio/gschema-compile.c:659
+#: ../gio/gschema-compile.c:1632
 msgid "where to store the gschemas.compiled file"
-msgstr ""
+msgstr "要將 gschemas.compiled 檔案儲存到哪裏"
 
-#: gio/gschema-compile.c:659 gio/gschema-compile.c:671
+#: ../gio/gschema-compile.c:1632 ../gio/gschema-compile.c:1644
 msgid "DIRECTORY"
-msgstr ""
+msgstr "目錄"
 
-#: gio/gschema-compile.c:660
+#: ../gio/gschema-compile.c:1633
 msgid "Do not write the gschema.compiled file"
-msgstr ""
+msgstr "不要寫入 gschemas.compiled 檔案"
 
-#: gio/gschema-compile.c:661
-#, fuzzy
-msgid "Do not give error for empty directory"
-msgstr "不能將目錄移動至目錄上"
+#: ../gio/gschema-compile.c:1634
+msgid "This option will be removed soon."
+msgstr "這個選項很快會被移除。"
 
-#: gio/gschema-compile.c:662
+#: ../gio/gschema-compile.c:1635
 msgid "Do not enforce key name restrictions"
-msgstr ""
+msgstr "不要強制設定鍵名稱限制"
 
-#: gio/gschema-compile.c:674
+#: ../gio/gschema-compile.c:1647
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
 "and the cache file is called gschemas.compiled."
 msgstr ""
+"將所有的 GSettings schema 檔案編譯為 schema 快取。\n"
+"Schema 檔案的延伸檔名必須為 .gschema.xml，\n"
+"而快取檔案叫做 gschemas.compiled。"
 
-#: gio/gschema-compile.c:690
+#: ../gio/gschema-compile.c:1663
 #, c-format
 msgid "You should give exactly one directory name\n"
-msgstr ""
+msgstr "你應該明確指定一個目錄名稱\n"
 
-#: gio/gschema-compile.c:729
+#: ../gio/gschema-compile.c:1696
 #, c-format
-msgid "No schema files found\n"
-msgstr ""
+msgid "No schema files found: "
+msgstr "找不到 schema 檔案："
+
+#: ../gio/gschema-compile.c:1699
+#, c-format
+msgid "doing nothing.\n"
+msgstr "不做任何事。\n"
 
-#: gio/gsettings-tool.c:41
+#: ../gio/gschema-compile.c:1702
+#, c-format
+msgid "removed existing output file.\n"
+msgstr "移除現有的輸出檔案。\n"
+
+#: ../gio/gsettings-tool.c:79
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2435,41 +2506,54 @@ msgid ""
 "\n"
 "Use '%s COMMAND --help' to get help for individual commands.\n"
 msgstr ""
+"指令：\n"
+"  help        顯示這個資訊\n"
+"  get         取得設定鍵的數值\n"
+"  set         設定設定鍵的數值\n"
+"  monitor     監控設定鍵的更改\n"
+"  writable    檢查設定鍵是否可寫入\n"
+"\n"
+"使用「%s COMMAND --help」取得個別指令的求助文件。\n"
 
-#: gio/gsettings-tool.c:102 gio/gsettings-tool.c:161 gio/gsettings-tool.c:252
-#: gio/gsettings-tool.c:325
+#: ../gio/gsettings-tool.c:221 ../gio/gsettings-tool.c:321
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:549
 msgid "Specify the path for the schema"
-msgstr ""
+msgstr "指定 schema 的路徑"
 
-#: gio/gsettings-tool.c:102 gio/gsettings-tool.c:161 gio/gsettings-tool.c:252
-#: gio/gsettings-tool.c:325
+#: ../gio/gsettings-tool.c:221 ../gio/gsettings-tool.c:321
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:549
 msgid "PATH"
-msgstr ""
+msgstr "路徑"
 
-#: gio/gsettings-tool.c:110 gio/gsettings-tool.c:260 gio/gsettings-tool.c:333
+#: ../gio/gsettings-tool.c:229 ../gio/gsettings-tool.c:444
+#: ../gio/gsettings-tool.c:557
 msgid "SCHEMA KEY"
-msgstr ""
+msgstr "SCHEMA 設定鍵"
 
-#: gio/gsettings-tool.c:112
+#: ../gio/gsettings-tool.c:231
 msgid "Get the value of KEY"
-msgstr ""
+msgstr "取得 KEY 的數值"
 
-#: gio/gsettings-tool.c:114 gio/gsettings-tool.c:264 gio/gsettings-tool.c:340
+#: ../gio/gsettings-tool.c:233 ../gio/gsettings-tool.c:448
+#: ../gio/gsettings-tool.c:564
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
 "  KEY         The name of the key\n"
 msgstr ""
+"引數：\n"
+"  SCHEMA      這個 schema 的 id\n"
+"  KEY         設定鍵的名稱\n"
 
-#: gio/gsettings-tool.c:169
+#: ../gio/gsettings-tool.c:329
 msgid "SCHEMA KEY VALUE"
-msgstr ""
+msgstr "SCHEMA 設定鍵數值"
 
-#: gio/gsettings-tool.c:171
+#: ../gio/gsettings-tool.c:331
 msgid "Set the value of KEY"
-msgstr ""
+msgstr "設定 KEY 的數值"
 
-#: gio/gsettings-tool.c:173
+#: ../gio/gsettings-tool.c:333
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -2477,285 +2561,290 @@ msgid ""
 "  VALUE       The value to set key to, as a serialized GVariant\n"
 msgstr ""
 
-#: gio/gsettings-tool.c:212
-#, fuzzy, c-format
+#: ../gio/gsettings-tool.c:406
+#, c-format
 msgid "Key %s is not writable\n"
-msgstr "類型 %s 尚未歸類"
+msgstr "設定鍵 %s 無法寫入\n"
 
-#: gio/gsettings-tool.c:262
+#: ../gio/gsettings-tool.c:446
 msgid "Find out whether KEY is writable"
-msgstr ""
+msgstr "找出 KEY 是否可寫入"
 
-#: gio/gsettings-tool.c:336
+#: ../gio/gsettings-tool.c:560
 msgid ""
 "Monitor KEY for changes and print the changed values.\n"
 "Monitoring will continue until the process is terminated."
 msgstr ""
+"監控 KEY 的更改並顯示更改後的數值。\n"
+"監控會持續到程序中止為止。"
 
-#: gio/gsettings-tool.c:399
-#, fuzzy, c-format
+#: ../gio/gsettings-tool.c:733
+#, c-format
 msgid "Unknown command '%s'\n"
-msgstr "未知的選項 %s"
+msgstr "不明指令「%s」\n"
 
-#: gio/gsocket.c:275
+#: ../gio/gsocket.c:274
 msgid "Invalid socket, not initialized"
 msgstr "無效的 socket，尚未初始化"
 
-#: gio/gsocket.c:282
+#: ../gio/gsocket.c:281
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "無效的 socket，初始化失敗原因為：%s"
 
-#: gio/gsocket.c:290
+#: ../gio/gsocket.c:289
 msgid "Socket is already closed"
 msgstr "Socket 已經關閉"
 
-#: gio/gsocket.c:298 gio/gsocket.c:2609 gio/gsocket.c:2653
+#: ../gio/gsocket.c:297 ../gio/gsocket.c:2617 ../gio/gsocket.c:2661
 msgid "Socket I/O timed out"
-msgstr ""
+msgstr "Socket I/O 逾時"
 
-#: gio/gsocket.c:420
+#: ../gio/gsocket.c:419
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "正在從 fd 建立 GSocket：%s"
 
-#: gio/gsocket.c:454 gio/gsocket.c:468 gio/gsocket.c:2020
+#: ../gio/gsocket.c:453 ../gio/gsocket.c:467 ../gio/gsocket.c:2019
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "無法建立 socket：%s"
 
-#: gio/gsocket.c:454
+#: ../gio/gsocket.c:453
 msgid "Unknown protocol was specified"
 msgstr "指定了不明的通訊協定"
 
-#: gio/gsocket.c:1218
+#: ../gio/gsocket.c:1217
 #, c-format
 msgid "could not get local address: %s"
 msgstr "無法取得本地端位址：%s"
 
-#: gio/gsocket.c:1251
+#: ../gio/gsocket.c:1250
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "無法取得遠端位址：%s"
 
-#: gio/gsocket.c:1309
+#: ../gio/gsocket.c:1308
 #, c-format
 msgid "could not listen: %s"
 msgstr "無法聽取：%s"
 
-#: gio/gsocket.c:1383
+#: ../gio/gsocket.c:1382
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "綁定至位址時發生錯誤：%s"
 
-#: gio/gsocket.c:1503
+#: ../gio/gsocket.c:1502
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "接受連線時發生錯誤：%s"
 
-#: gio/gsocket.c:1616
+#: ../gio/gsocket.c:1615
 msgid "Error connecting: "
 msgstr "連線錯誤："
 
-#: gio/gsocket.c:1620
+#: ../gio/gsocket.c:1619
 msgid "Connection in progress"
 msgstr "連線進行中"
 
-#: gio/gsocket.c:1625
+#: ../gio/gsocket.c:1624
 #, c-format
 msgid "Error connecting: %s"
 msgstr "連線錯誤：%s"
 
-#: gio/gsocket.c:1668
+#: ../gio/gsocket.c:1667
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "無法取得未處理的錯誤：%s"
 
-#: gio/gsocket.c:1764
+#: ../gio/gsocket.c:1763
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "接收資料時發生錯誤：%s"
 
-#: gio/gsocket.c:1907
+#: ../gio/gsocket.c:1906
 #, c-format
 msgid "Error sending data: %s"
 msgstr "傳送資料時發生錯誤：%s"
 
-#: gio/gsocket.c:2099
+#: ../gio/gsocket.c:2098
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "關閉 socket 時發生錯誤：%s"
 
-#: gio/gsocket.c:2602
+#: ../gio/gsocket.c:2610
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "等候 socket 情況：%s"
 
-#: gio/gsocket.c:2884
+#: ../gio/gsocket.c:2892
 msgid "GSocketControlMessage not supported on windows"
 msgstr "視窗不支援 GSocketControlMessage"
 
-#: gio/gsocket.c:3143 gio/gsocket.c:3284
+#: ../gio/gsocket.c:3151 ../gio/gsocket.c:3292
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "取回郵件發生錯誤：%s"
 
-#: gio/gsocketclient.c:521 gio/gsocketclient.c:770
+#: ../gio/gsocketclient.c:520 ../gio/gsocketclient.c:769
 msgid "Unknown error on connect"
 msgstr "連線時有不明的錯誤"
 
-#: gio/gsocketlistener.c:192
+#: ../gio/gsocketlistener.c:191
 msgid "Listener is already closed"
 msgstr "聽取程式已經關閉"
 
-#: gio/gsocketlistener.c:233
+#: ../gio/gsocketlistener.c:232
 msgid "Added socket is closed"
 msgstr "加入的 socket 已經關閉"
 
-#: gio/gthemedicon.c:499
+#: ../gio/gthemedicon.c:498
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "不能處理版本為 %d 的 GThemedIcon 編碼"
 
-#: gio/gunixconnection.c:165 gio/gunixconnection.c:502
+#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:501
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgstr "預期有 1 個控制訊息，卻收到 %d"
 
-#: gio/gunixconnection.c:178 gio/gunixconnection.c:512
+#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:511
 msgid "Unexpected type of ancillary data"
 msgstr "輔助資料的未預期類型"
 
-#: gio/gunixconnection.c:196
+#: ../gio/gunixconnection.c:195
 #, c-format
 msgid "Expecting one fd, but got %d\n"
 msgstr "預期有 1 個 fd，卻收到 %d\n"
 
-#: gio/gunixconnection.c:212
+#: ../gio/gunixconnection.c:211
 msgid "Received invalid fd"
 msgstr "收到無效的 fd"
 
-#: gio/gunixconnection.c:359
-#, fuzzy
+#: ../gio/gunixconnection.c:358
 msgid "Error sending credentials: "
-msgstr "傳送資料時發生錯誤：%s"
+msgstr "傳送證書時發生錯誤："
 
-#: gio/gunixconnection.c:436
+#: ../gio/gunixconnection.c:435
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
-msgstr ""
+msgstr "檢查 SO_PASSCRED 在 socket 是否啟用時發生錯誤：%s"
 
-#: gio/gunixconnection.c:445
+#: ../gio/gunixconnection.c:444
 #, c-format
 msgid ""
 "Unexpected option length while checking if SO_PASSCRED is enabled for "
 "socket. Expected %d bytes, got %d"
-msgstr ""
+msgstr "檢查 SO_PASSCRED 在 socket 是否啟用時有未預期的選項長度。預期為 %d 位元組，得到 %d"
 
-#: gio/gunixconnection.c:462
-#, fuzzy, c-format
+#: ../gio/gunixconnection.c:461
+#, c-format
 msgid "Error enabling SO_PASSCRED: %s"
-msgstr "重新命名檔案時發生錯誤：%s"
+msgstr "啟用 SO_PASSCRED 時發生錯誤：%s"
 
-#: gio/gunixconnection.c:492
+#: ../gio/gunixconnection.c:491
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
-msgstr ""
+msgstr "預期接收證書要讀取單一位元組，但讀取到零位元組"
 
-#: gio/gunixconnection.c:535
+#: ../gio/gunixconnection.c:534
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
-msgstr ""
+msgstr "停用 SO_PASSCRED 時發生錯誤：%s"
 
-#: gio/gunixinputstream.c:354 gio/gunixinputstream.c:374
-#: gio/gunixinputstream.c:452 gio/gunixoutputstream.c:439
+#: ../gio/gunixinputstream.c:353 ../gio/gunixinputstream.c:373
+#: ../gio/gunixinputstream.c:451 ../gio/gunixoutputstream.c:438
 #, c-format
 msgid "Error reading from unix: %s"
 msgstr "從 unix 讀取時發生錯誤：%s"
 
-#: gio/gunixinputstream.c:407 gio/gunixinputstream.c:589
-#: gio/gunixoutputstream.c:394 gio/gunixoutputstream.c:545
+#: ../gio/gunixinputstream.c:406 ../gio/gunixinputstream.c:589
+#: ../gio/gunixoutputstream.c:393 ../gio/gunixoutputstream.c:545
 #, c-format
 msgid "Error closing unix: %s"
 msgstr "關閉 unix 時發生錯誤：%s"
 
-#: gio/gunixmounts.c:1846 gio/gunixmounts.c:1883
+#: ../gio/gunixmounts.c:1846 ../gio/gunixmounts.c:1883
 msgid "Filesystem root"
 msgstr "根檔案系統"
 
-#: gio/gunixoutputstream.c:340 gio/gunixoutputstream.c:361
+#: ../gio/gunixoutputstream.c:339 ../gio/gunixoutputstream.c:360
 #, c-format
 msgid "Error writing to unix: %s"
 msgstr "寫入至 unix 時發生錯誤：%s"
 
-#: gio/gunixsocketaddress.c:245
+#: ../gio/gunixsocketaddress.c:244
 msgid "Abstract unix domain socket addresses not supported on this system"
 msgstr "這個系統不支授抽象 unix 網域 socket 位址"
 
-#: gio/gvolume.c:407
+#: ../gio/gvolume.c:406
 msgid "volume doesn't implement eject"
 msgstr "儲存區尚未實作退出(eject)"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gvolume.c:486
+#: ../gio/gvolume.c:485
 msgid "volume doesn't implement eject or eject_with_operation"
 msgstr "儲存區尚未實作退出(eject) 或 eject_with_operation"
 
-#: gio/gwin32appinfo.c:277
+#: ../gio/gwin32appinfo.c:276
 msgid "Can't find application"
 msgstr "找不到應用程式"
 
-#: gio/gwin32appinfo.c:300
+#: ../gio/gwin32appinfo.c:299
 #, c-format
 msgid "Error launching application: %s"
 msgstr "執行應用程式時發生錯誤：%s"
 
-#: gio/gwin32appinfo.c:336
+#: ../gio/gwin32appinfo.c:335
 msgid "URIs not supported"
 msgstr "不支援 URIs"
 
-#: gio/gwin32appinfo.c:358
+#: ../gio/gwin32appinfo.c:357
 msgid "association changes not supported on win32"
 msgstr "關聯更改在 win32 上不支援"
 
-#: gio/gwin32appinfo.c:370
+#: ../gio/gwin32appinfo.c:369
 msgid "Association creation not supported on win32"
 msgstr "關聯建立在 win32 上不支援"
 
-#: gio/gwin32inputstream.c:319
-#, fuzzy, c-format
+#: ../gio/gwin32inputstream.c:318
+#, c-format
 msgid "Error reading from handle: %s"
-msgstr "從檔案讀取時發生錯誤：%s"
+msgstr "從處理器讀取時發生錯誤：%s"
 
-#: gio/gwin32inputstream.c:349 gio/gwin32outputstream.c:349
-#, fuzzy, c-format
+#: ../gio/gwin32inputstream.c:348 ../gio/gwin32outputstream.c:348
+#, c-format
 msgid "Error closing handle: %s"
-msgstr "關閉檔案時發生錯誤：%s"
+msgstr "關閉處理器時發生錯誤：%s"
 
-#: gio/gwin32outputstream.c:319
-#, fuzzy, c-format
+#: ../gio/gwin32outputstream.c:318
+#, c-format
 msgid "Error writing to handle: %s"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "寫入至處理器時發生錯誤：%s"
 
-#: gio/gzlibcompressor.c:279 gio/gzlibdecompressor.c:250
+#: ../gio/gzlibcompressor.c:278 ../gio/gzlibdecompressor.c:249
 msgid "Not enough memory"
 msgstr "沒有足夠的記憶體"
 
-#: gio/gzlibcompressor.c:286 gio/gzlibdecompressor.c:257
+#: ../gio/gzlibcompressor.c:285 ../gio/gzlibdecompressor.c:256
 #, c-format
 msgid "Internal error: %s"
 msgstr "內部的錯誤：%s"
 
-#: gio/gzlibcompressor.c:299 gio/gzlibdecompressor.c:271
+#: ../gio/gzlibcompressor.c:298 ../gio/gzlibdecompressor.c:270
 msgid "Need more input"
 msgstr "需要更多輸入"
 
-#: gio/gzlibdecompressor.c:243
+#: ../gio/gzlibdecompressor.c:242
 msgid "Invalid compressed data"
 msgstr "無效的壓縮資料"
 
+#, fuzzy
+#~ msgid "Do not give error for empty directory"
+#~ msgstr "不能將目錄移動至目錄上"
+
 #~ msgid "Invalid UTF-8 sequence in input"
 #~ msgstr "在輸入中出現無效的 UTF-8 次序"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7513dbe..edca1b4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2005-07.
 msgid ""
 msgstr ""
-"Project-Id-Version: glib 2.24.1\n"
+"Project-Id-Version: glib 2.25.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 21:37-0400\n"
-"PO-Revision-Date: 2010-03-27 14:14+0800\n"
+"POT-Creation-Date: 2010-07-14 19:27+0800\n"
+"PO-Revision-Date: 2010-07-13 10:37+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -18,343 +18,345 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: glib/gbookmarkfile.c:737
+#: ../glib/gbookmarkfile.c:780
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "元件「%2$s」中有未預期的屬性「%1$s」"
 
-#: glib/gbookmarkfile.c:748 glib/gbookmarkfile.c:819 glib/gbookmarkfile.c:829
-#: glib/gbookmarkfile.c:936
+#: ../glib/gbookmarkfile.c:791 ../glib/gbookmarkfile.c:862
+#: ../glib/gbookmarkfile.c:872 ../glib/gbookmarkfile.c:979
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "找不到元件「%2$s」中的屬性「%1$s」"
 
-#: glib/gbookmarkfile.c:1106 glib/gbookmarkfile.c:1171
-#: glib/gbookmarkfile.c:1235 glib/gbookmarkfile.c:1245
+#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1214
+#: ../glib/gbookmarkfile.c:1278 ../glib/gbookmarkfile.c:1288
 #, c-format
 msgid "Unexpected tag '%s', tag '%s' expected"
 msgstr "未預期的標籤「%s」，應為標籤「%s」"
 
-#: glib/gbookmarkfile.c:1131 glib/gbookmarkfile.c:1145
-#: glib/gbookmarkfile.c:1213 glib/gbookmarkfile.c:1265
+#: ../glib/gbookmarkfile.c:1174 ../glib/gbookmarkfile.c:1188
+#: ../glib/gbookmarkfile.c:1256 ../glib/gbookmarkfile.c:1308
 #, c-format
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "「%2$s」中有未預期的標籤「%1$s」"
 
-#: glib/gbookmarkfile.c:1793
+#: ../glib/gbookmarkfile.c:1836
 msgid "No valid bookmark file found in data dirs"
 msgstr "在資料目錄中找不到有效的書籤檔案"
 
-#: glib/gbookmarkfile.c:1994
+#: ../glib/gbookmarkfile.c:2037
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "URI「%s」的書籤已經存在"
 
-#: glib/gbookmarkfile.c:2040 glib/gbookmarkfile.c:2198
-#: glib/gbookmarkfile.c:2283 glib/gbookmarkfile.c:2363
-#: glib/gbookmarkfile.c:2448 glib/gbookmarkfile.c:2531
-#: glib/gbookmarkfile.c:2609 glib/gbookmarkfile.c:2688
-#: glib/gbookmarkfile.c:2730 glib/gbookmarkfile.c:2827
-#: glib/gbookmarkfile.c:2953 glib/gbookmarkfile.c:3143
-#: glib/gbookmarkfile.c:3219 glib/gbookmarkfile.c:3384
-#: glib/gbookmarkfile.c:3473 glib/gbookmarkfile.c:3563
-#: glib/gbookmarkfile.c:3691
+#: ../glib/gbookmarkfile.c:2083 ../glib/gbookmarkfile.c:2241
+#: ../glib/gbookmarkfile.c:2326 ../glib/gbookmarkfile.c:2406
+#: ../glib/gbookmarkfile.c:2491 ../glib/gbookmarkfile.c:2574
+#: ../glib/gbookmarkfile.c:2652 ../glib/gbookmarkfile.c:2731
+#: ../glib/gbookmarkfile.c:2773 ../glib/gbookmarkfile.c:2870
+#: ../glib/gbookmarkfile.c:2996 ../glib/gbookmarkfile.c:3186
+#: ../glib/gbookmarkfile.c:3262 ../glib/gbookmarkfile.c:3427
+#: ../glib/gbookmarkfile.c:3516 ../glib/gbookmarkfile.c:3606
+#: ../glib/gbookmarkfile.c:3734
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "找不到 URI「%s」的書籤"
 
-#: glib/gbookmarkfile.c:2372
+#: ../glib/gbookmarkfile.c:2415
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有定義 MIME 類型"
 
-#: glib/gbookmarkfile.c:2457
+#: ../glib/gbookmarkfile.c:2500
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有私有旗幟"
 
-#: glib/gbookmarkfile.c:2836
+#: ../glib/gbookmarkfile.c:2879
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "URI「%s」書籤中沒有設定群組"
 
-#: glib/gbookmarkfile.c:3237 glib/gbookmarkfile.c:3394
+#: ../glib/gbookmarkfile.c:3280 ../glib/gbookmarkfile.c:3437
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "沒有名為「%s」的應用程式註冊書籤「%s」"
 
-#: glib/gbookmarkfile.c:3417
+#: ../glib/gbookmarkfile.c:3460
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "以 URI‘%2$s’ 展開 exec 行‘%1$s’失敗"
 
-#: glib/gconvert.c:437 glib/gconvert.c:515 glib/giochannel.c:1404
-#: gio/gcharsetconverter.c:459
+#: ../glib/gconvert.c:436 ../glib/gconvert.c:514 ../glib/giochannel.c:1403
+#: ../gio/gcharsetconverter.c:458
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "不支援將字元集‘%s’轉換成‘%s’"
 
-#: glib/gconvert.c:441 glib/gconvert.c:519 gio/gcharsetconverter.c:463
+#: ../glib/gconvert.c:440 ../glib/gconvert.c:518
+#: ../gio/gcharsetconverter.c:462
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "無法將‘%s’轉換至‘%s’"
 
-#: glib/gconvert.c:638 glib/gconvert.c:1031 glib/giochannel.c:1576
-#: glib/giochannel.c:1618 glib/giochannel.c:2462 glib/gutf8.c:989
-#: glib/gutf8.c:1444 gio/gcharsetconverter.c:346
+#: ../glib/gconvert.c:637 ../glib/gconvert.c:1030 ../glib/giochannel.c:1575
+#: ../glib/giochannel.c:1617 ../glib/giochannel.c:2461 ../glib/gutf8.c:988
+#: ../glib/gutf8.c:1443 ../gio/gcharsetconverter.c:345
 msgid "Invalid byte sequence in conversion input"
 msgstr "轉換輸入資料時遇到不正確的位元組組合"
 
-#: glib/gconvert.c:646 glib/gconvert.c:956 glib/giochannel.c:1583
-#: glib/giochannel.c:2474 gio/gcharsetconverter.c:351
+#: ../glib/gconvert.c:645 ../glib/gconvert.c:955 ../glib/giochannel.c:1582
+#: ../glib/giochannel.c:2473 ../gio/gcharsetconverter.c:350
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "轉換時發生錯誤：%s"
 
-#: glib/gconvert.c:678 glib/gutf8.c:985 glib/gutf8.c:1195 glib/gutf8.c:1336
-#: glib/gutf8.c:1440
+#: ../glib/gconvert.c:677 ../glib/gutf8.c:984 ../glib/gutf8.c:1194
+#: ../glib/gutf8.c:1335 ../glib/gutf8.c:1439
 msgid "Partial character sequence at end of input"
 msgstr "輸入資料結束時字元仍未完整"
 
-#: glib/gconvert.c:928
+#: ../glib/gconvert.c:927
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "無法將後備字串‘%s’的字元集轉換成‘%s’"
 
-#: glib/gconvert.c:1751
+#: ../glib/gconvert.c:1750
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "URI‘%s’不是使用“file”格式的絕對 URI"
 
-#: glib/gconvert.c:1761
+#: ../glib/gconvert.c:1760
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "本機檔案的 URI‘%s’不應含有‘#’"
 
-#: glib/gconvert.c:1778
+#: ../glib/gconvert.c:1777
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URI‘%s’無效"
 
-#: glib/gconvert.c:1790
+#: ../glib/gconvert.c:1789
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "URI‘%s’中的主機名稱無效"
 
-#: glib/gconvert.c:1806
+#: ../glib/gconvert.c:1805
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "URI‘%s’含有「不正確跳出」的字元"
 
-#: glib/gconvert.c:1901
+#: ../glib/gconvert.c:1900
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "路徑名稱‘%s’不是絕對路徑"
 
-#: glib/gconvert.c:1911
+#: ../glib/gconvert.c:1910
 msgid "Invalid hostname"
 msgstr "主機名稱無效"
 
-#: glib/gdir.c:112 glib/gdir.c:135
+#: ../glib/gdir.c:111 ../glib/gdir.c:134
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "開啟目錄‘%s’時發生錯誤：%s"
 
-#: glib/gfileutils.c:536 glib/gfileutils.c:624
+#: ../glib/gfileutils.c:535 ../glib/gfileutils.c:623
 #, c-format
 msgid "Could not allocate %lu bytes to read file \"%s\""
 msgstr "無法配置 %lu 位元來讀取檔案“%s”"
 
-#: glib/gfileutils.c:551
+#: ../glib/gfileutils.c:550
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "讀取檔案‘%s’時發生錯誤：%s"
 
-#: glib/gfileutils.c:565
+#: ../glib/gfileutils.c:564
 #, c-format
 msgid "File \"%s\" is too large"
 msgstr "檔案「%s」太過巨大"
 
-#: glib/gfileutils.c:648
+#: ../glib/gfileutils.c:647
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "讀取檔案‘%s’失敗：%s"
 
-#: glib/gfileutils.c:699 glib/gfileutils.c:786
+#: ../glib/gfileutils.c:698 ../glib/gfileutils.c:785
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "開啟檔案「%s」失敗：%s"
 
-#: glib/gfileutils.c:716 glib/gmappedfile.c:170
+#: ../glib/gfileutils.c:715 ../glib/gmappedfile.c:169
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "獲取檔案‘%s’的屬性失敗：fstat() 失敗：%s"
 
-#: glib/gfileutils.c:750
+#: ../glib/gfileutils.c:749
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "開啟檔案‘%s’失敗：fdopen() 失敗：%s"
 
-#: glib/gfileutils.c:858
+#: ../glib/gfileutils.c:857
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "檔案名稱由‘%s’改為‘%s’失敗：g_rename() 失敗：%s"
 
-#: glib/gfileutils.c:900 glib/gfileutils.c:1366
+#: ../glib/gfileutils.c:899 ../glib/gfileutils.c:1365
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "建立檔案‘%s’失敗：%s"
 
-#: glib/gfileutils.c:914
+#: ../glib/gfileutils.c:913
 #, c-format
 msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 msgstr "開啟檔案‘%s’作寫入失敗：fdopen() 失敗：%s"
 
-#: glib/gfileutils.c:939
+#: ../glib/gfileutils.c:938
 #, c-format
 msgid "Failed to write file '%s': fwrite() failed: %s"
 msgstr "寫入檔案‘%s’失敗：fwrite() 失敗：%s"
 
-#: glib/gfileutils.c:958
+#: ../glib/gfileutils.c:957
 #, c-format
 msgid "Failed to write file '%s': fflush() failed: %s"
 msgstr "無法寫入檔案「%s」：fflush() 失敗：%s"
 
-#: glib/gfileutils.c:987
+#: ../glib/gfileutils.c:986
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "無法寫入檔案「%s」：fsync() 失敗：%s"
 
-#: glib/gfileutils.c:1006
+#: ../glib/gfileutils.c:1005
 #, c-format
 msgid "Failed to close file '%s': fclose() failed: %s"
 msgstr "關閉檔案‘%s’失敗：fclose() 失敗：%s"
 
-#: glib/gfileutils.c:1124
+#: ../glib/gfileutils.c:1123
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "現存檔案‘%s’無法移除：g_unlink() 失敗：%s"
 
-#: glib/gfileutils.c:1328
+#: ../glib/gfileutils.c:1327
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "樣式‘%s’無效，不應含有‘%s’"
 
 # (Abel) this is file template for mktemp/mkstemp
-#: glib/gfileutils.c:1341
+#: ../glib/gfileutils.c:1340
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "檔案樣式‘%s’沒有包含 XXXXXX"
 
-#: glib/gfileutils.c:1774
+#: ../glib/gfileutils.c:1773
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 位元組"
 
-#: glib/gfileutils.c:1782
+#: ../glib/gfileutils.c:1781
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: glib/gfileutils.c:1787
+#: ../glib/gfileutils.c:1786
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: glib/gfileutils.c:1792
+#: ../glib/gfileutils.c:1791
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: glib/gfileutils.c:1797
+#: ../glib/gfileutils.c:1796
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: glib/gfileutils.c:1802
+#: ../glib/gfileutils.c:1801
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: glib/gfileutils.c:1807
+#: ../glib/gfileutils.c:1806
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: glib/gfileutils.c:1850
+#: ../glib/gfileutils.c:1849
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "讀取符號連結‘%s’失敗：%s"
 
-#: glib/gfileutils.c:1871
+#: ../glib/gfileutils.c:1870
 msgid "Symbolic links not supported"
 msgstr "不支援符號連結"
 
-#: glib/giochannel.c:1408
+#: ../glib/giochannel.c:1407
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "無法開啟將‘%s’轉換至‘%s’的轉換器：%s"
 
-#: glib/giochannel.c:1753
+#: ../glib/giochannel.c:1752
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "在 g_io_channel_read_line_string 中無法讀取原始資料"
 
-#: glib/giochannel.c:1800 glib/giochannel.c:2058 glib/giochannel.c:2145
+#: ../glib/giochannel.c:1799 ../glib/giochannel.c:2057
+#: ../glib/giochannel.c:2144
 msgid "Leftover unconverted data in read buffer"
 msgstr "用來讀取資料的緩衝區中仍有未轉換的資料"
 
-#: glib/giochannel.c:1881 glib/giochannel.c:1958
+#: ../glib/giochannel.c:1880 ../glib/giochannel.c:1957
 msgid "Channel terminates in a partial character"
 msgstr "在字元未完整之前，輸入管道已經結束"
 
-#: glib/giochannel.c:1944
+#: ../glib/giochannel.c:1943
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end 中無法讀取原始資料"
 
-#: glib/gmappedfile.c:151
+#: ../glib/gmappedfile.c:150
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "開啟檔案‘%s’失敗：open() 失敗：%s"
 
-#: glib/gmappedfile.c:230
+#: ../glib/gmappedfile.c:229
 #, c-format
 msgid "Failed to map file '%s': mmap() failed: %s"
 msgstr "對應檔案‘%s’失敗：mmap() 失敗：%s"
 
-#: glib/gmarkup.c:303 glib/gmarkup.c:343
+#: ../glib/gmarkup.c:302 ../glib/gmarkup.c:342
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "第 %d 行第 %d 個字發生錯誤："
 
-#: glib/gmarkup.c:363 glib/gmarkup.c:441
+#: ../glib/gmarkup.c:362 ../glib/gmarkup.c:440
 #, c-format
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "名稱中無效的 UTF-8 編碼文字 - 不是合法的「%s」"
 
-#: glib/gmarkup.c:374
+#: ../glib/gmarkup.c:373
 #, c-format
 msgid "'%s' is not a valid name "
 msgstr "「%s」不是一個有效的名稱"
 
-#: glib/gmarkup.c:390
+#: ../glib/gmarkup.c:389
 #, c-format
 msgid "'%s' is not a valid name: '%c' "
 msgstr "「%s」不是一個有效的名稱：「%c」"
 
-#: glib/gmarkup.c:494
+#: ../glib/gmarkup.c:493
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "第 %d 行發生錯誤：%s"
 
-#: glib/gmarkup.c:578
+#: ../glib/gmarkup.c:577
 #, c-format
 msgid ""
 "Failed to parse '%-.*s', which should have been a digit inside a character "
 "reference (&#234; for example) - perhaps the digit is too large"
 msgstr "無法解析‘%-.*s’，字元參引內應該含有數字（例如 &#234;）─ 可能是數字太大"
 
-#: glib/gmarkup.c:590
+#: ../glib/gmarkup.c:589
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
@@ -363,22 +365,22 @@ msgstr ""
 "字元參引的結束部分不是分號；很可能您想使用 & 字元但未將它變為實體 ─ 請將 & 轉"
 "換為 &amp;"
 
-#: glib/gmarkup.c:616
+#: ../glib/gmarkup.c:615
 #, c-format
 msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "字元參引‘%-.*s’無法表示任何能接受的字元"
 
-#: glib/gmarkup.c:654
+#: ../glib/gmarkup.c:653
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr "出現空白的實體‘&;’；可用的實體為：&amp; &quot; &lt; &gt; &apos;"
 
-#: glib/gmarkup.c:662
+#: ../glib/gmarkup.c:661
 #, c-format
 msgid "Entity name '%-.*s' is not known"
 msgstr "實體名稱 '%-.*s' 意義不明"
 
-#: glib/gmarkup.c:667
+#: ../glib/gmarkup.c:666
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
@@ -386,31 +388,31 @@ msgstr ""
 "實體的結束部分不是分號；很可能您想使用 & 字元但未將它變為實體 ─ 請將 & 轉換"
 "為 &amp;"
 
-#: glib/gmarkup.c:1014
+#: ../glib/gmarkup.c:1013
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "文件開始必須為一元素（例如 <book>）"
 
-#: glib/gmarkup.c:1054
+#: ../glib/gmarkup.c:1053
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
 msgstr "‘<’字元後的‘%s’不是有效的字元；這樣不可能是元素名稱的開始部份"
 
-#: glib/gmarkup.c:1122
+#: ../glib/gmarkup.c:1121
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag '%"
 "s'"
 msgstr "字元「%s」只有一半，空元素標籤「%s」的結尾應該以‘>’字元結束"
 
-#: glib/gmarkup.c:1206
+#: ../glib/gmarkup.c:1205
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr "不尋常的字元‘%s’，屬性名稱‘%s’（屬於元素‘%s’）後應該是‘=’字元"
 
-#: glib/gmarkup.c:1247
+#: ../glib/gmarkup.c:1246
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -420,7 +422,7 @@ msgstr ""
 "不尋常的字元‘%s’，元素‘%s’的開始標籤應該以‘>’或‘/’字元終結，也可以是屬性；或"
 "許您在屬性名稱中使用了無效的字元"
 
-#: glib/gmarkup.c:1291
+#: ../glib/gmarkup.c:1290
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
@@ -428,1161 +430,1213 @@ msgid ""
 msgstr ""
 "不尋常的字元‘%s’，當指定屬性‘%s’的值（屬於元素‘%s’）時，等號後應該出現開引號"
 
-#: glib/gmarkup.c:1425
+#: ../glib/gmarkup.c:1424
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr "‘</’字元後的‘%s’不是有效的字元；‘%s’不可能是元素名稱的開始部份"
 
-#: glib/gmarkup.c:1461
+#: ../glib/gmarkup.c:1460
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
 msgstr "字元‘%s’是無效的（位置在關閉元素‘%s’末端）；允許的字元為「>」"
 
-#: glib/gmarkup.c:1472
+#: ../glib/gmarkup.c:1471
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "元素‘%s’已關閉，沒有開啟中的元素"
 
-#: glib/gmarkup.c:1481
+#: ../glib/gmarkup.c:1480
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "元素‘%s’已關閉，但開啟中的元素是‘%s’"
 
-#: glib/gmarkup.c:1648
+#: ../glib/gmarkup.c:1647
 msgid "Document was empty or contained only whitespace"
 msgstr "文件完全空白或只含有空白字元"
 
-#: glib/gmarkup.c:1662
+#: ../glib/gmarkup.c:1661
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "文件在尖角括號‘<’後突然終止"
 
-#: glib/gmarkup.c:1670 glib/gmarkup.c:1715
+#: ../glib/gmarkup.c:1669 ../glib/gmarkup.c:1714
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr "在仍然有開啟中的元素時，文件突然結束 ─‘%s’是最後一個開啟的元素"
 
-#: glib/gmarkup.c:1678
+#: ../glib/gmarkup.c:1677
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
 msgstr "文件突然結束，本來應該出現用來關閉標籤 <%s/> 的尖角括號"
 
-#: glib/gmarkup.c:1684
+#: ../glib/gmarkup.c:1683
 msgid "Document ended unexpectedly inside an element name"
 msgstr "在元素的名稱內，文件突然結束"
 
-#: glib/gmarkup.c:1690
+#: ../glib/gmarkup.c:1689
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "在屬性名稱內，文件突然結束"
 
-#: glib/gmarkup.c:1695
+#: ../glib/gmarkup.c:1694
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "在元素的開啟標籤內，文件突然結束"
 
-#: glib/gmarkup.c:1701
+#: ../glib/gmarkup.c:1700
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr "在屬性名稱的等號後，文件突然結束；沒有屬性值"
 
-#: glib/gmarkup.c:1708
+#: ../glib/gmarkup.c:1707
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "在屬性值內，文件突然結束"
 
-#: glib/gmarkup.c:1724
+#: ../glib/gmarkup.c:1723
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "在元素‘%s’的關閉標籤內，文件突然結束"
 
-#: glib/gmarkup.c:1730
+#: ../glib/gmarkup.c:1729
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "在註解或處理指示內，文件突然結束"
 
-#: glib/gregex.c:131
+#: ../glib/gregex.c:130
 msgid "corrupted object"
 msgstr "損毀的物件"
 
-#: glib/gregex.c:133
+#: ../glib/gregex.c:132
 msgid "internal error or corrupted object"
 msgstr "內部錯誤或損毀的物件"
 
-#: glib/gregex.c:135
+#: ../glib/gregex.c:134
 msgid "out of memory"
 msgstr "記憶體耗盡"
 
-#: glib/gregex.c:140
+#: ../glib/gregex.c:139
 msgid "backtracking limit reached"
 msgstr "已達回溯上限"
 
-#: glib/gregex.c:152 glib/gregex.c:160
+#: ../glib/gregex.c:151 ../glib/gregex.c:159
 msgid "the pattern contains items not supported for partial matching"
 msgstr "此模式包含了不支援部分比對的項目"
 
-#: glib/gregex.c:154 gio/glocalfile.c:2110
+#: ../glib/gregex.c:153 ../gio/glocalfile.c:2109
 msgid "internal error"
 msgstr "內部的錯誤"
 
-#: glib/gregex.c:162
+#: ../glib/gregex.c:161
 msgid "back references as conditions are not supported for partial matching"
 msgstr "部分比對不支援以反向參照為條件"
 
-#: glib/gregex.c:171
+#: ../glib/gregex.c:170
 msgid "recursion limit reached"
 msgstr "已達遞廻上限"
 
-#: glib/gregex.c:173
+#: ../glib/gregex.c:172
 msgid "workspace limit for empty substrings reached"
 msgstr "已達空白子字串的工作區上限"
 
-#: glib/gregex.c:175
+#: ../glib/gregex.c:174
 msgid "invalid combination of newline flags"
 msgstr "無效的換行旗標組合"
 
-#: glib/gregex.c:179
+#: ../glib/gregex.c:178
 msgid "unknown error"
 msgstr "不明的錯誤"
 
-#: glib/gregex.c:199
+#: ../glib/gregex.c:198
 msgid "\\ at end of pattern"
 msgstr "\\ 於模式結尾"
 
-#: glib/gregex.c:202
+#: ../glib/gregex.c:201
 msgid "\\c at end of pattern"
 msgstr "\\c 於模式結尾"
 
-#: glib/gregex.c:205
+#: ../glib/gregex.c:204
 msgid "unrecognized character follows \\"
 msgstr "無法辨識的字元接著 \\"
 
-#: glib/gregex.c:212
+#: ../glib/gregex.c:211
 msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
 msgstr "這裡不允許使用改變大小寫的轉義符(\\l, \\L, \\u, \\U)"
 
-#: glib/gregex.c:215
+#: ../glib/gregex.c:214
 msgid "numbers out of order in {} quantifier"
 msgstr "{} 裡的數字次序顛倒了"
 
-#: glib/gregex.c:218
+#: ../glib/gregex.c:217
 msgid "number too big in {} quantifier"
 msgstr "{} 裡的數字太大了"
 
-#: glib/gregex.c:221
+#: ../glib/gregex.c:220
 msgid "missing terminating ] for character class"
 msgstr "字元類別缺少結束的 ]"
 
-#: glib/gregex.c:224
+#: ../glib/gregex.c:223
 msgid "invalid escape sequence in character class"
 msgstr "字元類別中無效的跳脫序列"
 
-#: glib/gregex.c:227
+#: ../glib/gregex.c:226
 msgid "range out of order in character class"
 msgstr "字元類別的範圍次序顛倒"
 
-#: glib/gregex.c:230
+#: ../glib/gregex.c:229
 msgid "nothing to repeat"
 msgstr "沒有東西可重複"
 
-#: glib/gregex.c:233
+#: ../glib/gregex.c:232
 msgid "unrecognized character after (?"
 msgstr "在 (? 後有無法辨識的字元"
 
-#: glib/gregex.c:237
+#: ../glib/gregex.c:236
 msgid "unrecognized character after (?<"
 msgstr "在 (?< 後有無法辨識的字元"
 
-#: glib/gregex.c:241
+#: ../glib/gregex.c:240
 msgid "unrecognized character after (?P"
 msgstr "在 (?P 後有無法辨識的字元"
 
-#: glib/gregex.c:244
+#: ../glib/gregex.c:243
 msgid "POSIX named classes are supported only within a class"
 msgstr "POSIX 命名類別只在單一類別中支援"
 
-#: glib/gregex.c:247
+#: ../glib/gregex.c:246
 msgid "missing terminating )"
 msgstr "缺少結束的 )"
 
-#: glib/gregex.c:251
+#: ../glib/gregex.c:250
 msgid ") without opening ("
 msgstr ") 沒有開頭的 ("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: glib/gregex.c:258
+#: ../glib/gregex.c:257
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "(?R 或 (?[+-]數字必須接著 )"
 
-#: glib/gregex.c:261
+#: ../glib/gregex.c:260
 msgid "reference to non-existent subpattern"
 msgstr "參照不存在的子模式"
 
-#: glib/gregex.c:264
+#: ../glib/gregex.c:263
 msgid "missing ) after comment"
 msgstr "註解後缺少 )"
 
-#: glib/gregex.c:267
+#: ../glib/gregex.c:266
 msgid "regular expression too large"
 msgstr "正規表示式太長"
 
-#: glib/gregex.c:270
+#: ../glib/gregex.c:269
 msgid "failed to get memory"
 msgstr "取得記憶體失敗"
 
-#: glib/gregex.c:273
+#: ../glib/gregex.c:272
 msgid "lookbehind assertion is not fixed length"
 msgstr "lookbehind 判斷提示(assertion) 不是固定的長度"
 
-#: glib/gregex.c:276
+#: ../glib/gregex.c:275
 msgid "malformed number or name after (?("
 msgstr "(?( 之後有格式不正確的數字或名稱"
 
-#: glib/gregex.c:279
+#: ../glib/gregex.c:278
 msgid "conditional group contains more than two branches"
 msgstr "條件式群組包含了兩個以上的分支"
 
-#: glib/gregex.c:282
+#: ../glib/gregex.c:281
 msgid "assertion expected after (?("
 msgstr "(?( 後應該有判斷提示(assertion)"
 
-#: glib/gregex.c:285
+#: ../glib/gregex.c:284
 msgid "unknown POSIX class name"
 msgstr "未知的 POSIX 類別名稱"
 
-#: glib/gregex.c:288
+#: ../glib/gregex.c:287
 msgid "POSIX collating elements are not supported"
 msgstr "不支援 POSIX 整理元件"
 
-#: glib/gregex.c:291
+#: ../glib/gregex.c:290
 msgid "character value in \\x{...} sequence is too large"
 msgstr "\\x{...} 序列中的字元值太大"
 
-#: glib/gregex.c:294
+#: ../glib/gregex.c:293
 msgid "invalid condition (?(0)"
 msgstr "無效的條件 (?(0)"
 
-#: glib/gregex.c:297
+#: ../glib/gregex.c:296
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "在 lookbehind 判斷提示(assertion) 中不支援\\C"
 
-#: glib/gregex.c:300
+#: ../glib/gregex.c:299
 msgid "recursive call could loop indefinitely"
 msgstr "遞廻呼叫可能變成無限廻圈"
 
-#: glib/gregex.c:303
+#: ../glib/gregex.c:302
 msgid "missing terminator in subpattern name"
 msgstr "子模式名稱中缺少結束字元"
 
-#: glib/gregex.c:306
+#: ../glib/gregex.c:305
 msgid "two named subpatterns have the same name"
 msgstr "兩個命名的子模式具有相同的名稱"
 
-#: glib/gregex.c:309
+#: ../glib/gregex.c:308
 msgid "malformed \\P or \\p sequence"
 msgstr "格式不正確的 \\P 或 \\p 序列"
 
-#: glib/gregex.c:312
+#: ../glib/gregex.c:311
 msgid "unknown property name after \\P or \\p"
 msgstr "在 \\P 或 \\p 後有未知的屬性名稱"
 
-#: glib/gregex.c:315
+#: ../glib/gregex.c:314
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "子模式名稱太長（最多 32 字元）"
 
-#: glib/gregex.c:318
+#: ../glib/gregex.c:317
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "太多命名的子模式（最大值 10,000）"
 
-#: glib/gregex.c:321
+#: ../glib/gregex.c:320
 msgid "octal value is greater than \\377"
 msgstr "8 進位值大於 \\377"
 
-#: glib/gregex.c:324
+#: ../glib/gregex.c:323
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE 群組包含一個以上的分支"
 
-#: glib/gregex.c:327
+#: ../glib/gregex.c:326
 msgid "repeating a DEFINE group is not allowed"
 msgstr "不允許重複 DEFINE 群組"
 
-#: glib/gregex.c:330
+#: ../glib/gregex.c:329
 msgid "inconsistent NEWLINE options"
 msgstr "不一致的 NEWLINE 選項"
 
-#: glib/gregex.c:333
+#: ../glib/gregex.c:332
 msgid ""
 "\\g is not followed by a braced name or an optionally braced non-zero number"
 msgstr "\\g 並未隨著具有大括弧的名稱或選用的具大括弧的非零數值"
 
-#: glib/gregex.c:338
+#: ../glib/gregex.c:337
 msgid "unexpected repeat"
 msgstr "未預期的重複"
 
-#: glib/gregex.c:342
+#: ../glib/gregex.c:341
 msgid "code overflow"
 msgstr "程式碼溢流"
 
-#: glib/gregex.c:346
+#: ../glib/gregex.c:345
 msgid "overran compiling workspace"
 msgstr "編譯工作區超出範圍"
 
-#: glib/gregex.c:350
+#: ../glib/gregex.c:349
 msgid "previously-checked referenced subpattern not found"
 msgstr "找不到預先核取的參照子字串"
 
-#: glib/gregex.c:522 glib/gregex.c:1639
+#: ../glib/gregex.c:521 ../glib/gregex.c:1638
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "比對正規表示式 %s 發生錯誤：%s"
 
-#: glib/gregex.c:1094
+#: ../glib/gregex.c:1093
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE 程式庫並未編譯對 UTF8 的支援"
 
-#: glib/gregex.c:1103
+#: ../glib/gregex.c:1102
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE 程式庫並未編譯對 UTF8 屬性的支援"
 
-#: glib/gregex.c:1157
+#: ../glib/gregex.c:1156
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "編譯正規表示式 %s 時於第 %d 個字發生錯誤：%s"
 
-#: glib/gregex.c:1193
+#: ../glib/gregex.c:1192
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "最佳化正規表示式 %s 時發生錯誤：%s"
 
-#: glib/gregex.c:2067
+#: ../glib/gregex.c:2066
 msgid "hexadecimal digit or '}' expected"
 msgstr "應為 16 進位數字或「}」"
 
-#: glib/gregex.c:2083
+#: ../glib/gregex.c:2082
 msgid "hexadecimal digit expected"
 msgstr "應為 16 進位數字"
 
-#: glib/gregex.c:2123
+#: ../glib/gregex.c:2122
 msgid "missing '<' in symbolic reference"
 msgstr "在符號參照中缺少「<」"
 
-#: glib/gregex.c:2132
+#: ../glib/gregex.c:2131
 msgid "unfinished symbolic reference"
 msgstr "未完成的符號參照"
 
-#: glib/gregex.c:2139
+#: ../glib/gregex.c:2138
 msgid "zero-length symbolic reference"
 msgstr "零-長度的符號參照"
 
-#: glib/gregex.c:2150
+#: ../glib/gregex.c:2149
 msgid "digit expected"
 msgstr "預期數字"
 
-#: glib/gregex.c:2168
+#: ../glib/gregex.c:2167
 msgid "illegal symbolic reference"
 msgstr "不合法的符號參照"
 
-#: glib/gregex.c:2230
+#: ../glib/gregex.c:2229
 msgid "stray final '\\'"
 msgstr "缺少最後的「\\」"
 
-#: glib/gregex.c:2234
+#: ../glib/gregex.c:2233
 msgid "unknown escape sequence"
 msgstr "不明的跳脫序列"
 
-#: glib/gregex.c:2244
+#: ../glib/gregex.c:2243
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
-msgstr "當分析於字元 %2$lu 的取代文字「%1$s」時發生錯誤：%3$s"
+msgstr "當解析於字元 %2$lu 的取代文字「%1$s」時發生錯誤：%3$s"
 
-#: glib/gshell.c:92
+#: ../glib/gshell.c:91
 msgid "Quoted text doesn't begin with a quotation mark"
 msgstr "應該用引號括起來的文字不是以括號為開始"
 
-#: glib/gshell.c:182
+#: ../glib/gshell.c:181
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr "指令列或其它標為指令的字串內有不對稱的引號"
 
-#: glib/gshell.c:560
+#: ../glib/gshell.c:559
 #, c-format
 msgid "Text ended just after a '\\' character. (The text was '%s')"
 msgstr "文字在‘\\’字元後就終止了。（文字為‘%s’）"
 
-#: glib/gshell.c:567
+#: ../glib/gshell.c:566
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
 msgstr "字串完結前仍沒有對應於 %c 的引號（字串為‘%s’）"
 
-#: glib/gshell.c:579
+#: ../glib/gshell.c:578
 msgid "Text was empty (or contained only whitespace)"
 msgstr "文字是空白的（或只含有空白字元）"
 
-#: glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:282
 msgid "Failed to read data from child process"
 msgstr "無法從副進程讀取資料"
 
-#: glib/gspawn-win32.c:300 glib/gspawn.c:1480
+#: ../glib/gspawn-win32.c:299 ../glib/gspawn.c:1479
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "無法建立管道來和副進程溝通 (%s)"
 
-#: glib/gspawn-win32.c:339 glib/gspawn-win32.c:347 glib/gspawn.c:1139
+#: ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346 ../glib/gspawn.c:1138
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "無法從管道讀取資料 (%s)"
 
-#: glib/gspawn-win32.c:370 glib/gspawn.c:1346
+#: ../glib/gspawn-win32.c:369 ../glib/gspawn.c:1345
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "無法進入目錄‘%s’(%s)"
 
-#: glib/gspawn-win32.c:376 glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:375 ../glib/gspawn-win32.c:494
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "無法執行副進程 (%s)"
 
-#: glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:444
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "程式名稱無效：%s"
 
-#: glib/gspawn-win32.c:455 glib/gspawn-win32.c:723 glib/gspawn-win32.c:1279
+#: ../glib/gspawn-win32.c:454 ../glib/gspawn-win32.c:722
+#: ../glib/gspawn-win32.c:1278
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "第 %d 個引數中含無效的字串：%s"
 
-#: glib/gspawn-win32.c:466 glib/gspawn-win32.c:738 glib/gspawn-win32.c:1312
+#: ../glib/gspawn-win32.c:465 ../glib/gspawn-win32.c:737
+#: ../glib/gspawn-win32.c:1311
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "環境變數中的字串無效：%s"
 
-#: glib/gspawn-win32.c:719 glib/gspawn-win32.c:1260
+#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1259
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "無效的工作目錄：%s"
 
-#: glib/gspawn-win32.c:784
+#: ../glib/gspawn-win32.c:783
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "無法執行協助程式 (%s)"
 
-#: glib/gspawn-win32.c:998
+#: ../glib/gspawn-win32.c:997
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
 msgstr "當 g_io_channel_win32_poll() 從副進程讀取資料時發生無法預計的錯誤"
 
-#: glib/gspawn.c:190
+#: ../glib/gspawn.c:189
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "無法從副進程讀取資料 (%s)"
 
-#: glib/gspawn.c:329
+#: ../glib/gspawn.c:328
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "當 select() 從子程序讀取資料時發生未預期的錯誤 (%s)"
 
-#: glib/gspawn.c:414
+#: ../glib/gspawn.c:413
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() 發生未預期的錯誤 (%s)"
 
-#: glib/gspawn.c:1206
+#: ../glib/gspawn.c:1205
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "無法衍生進程 (%s)"
 
-#: glib/gspawn.c:1356
+#: ../glib/gspawn.c:1355
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "無法執行副進程“%s”(%s)"
 
-#: glib/gspawn.c:1366
+#: ../glib/gspawn.c:1365
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "無法將副進程的輸出或輸入重新導向 (%s)"
 
-#: glib/gspawn.c:1375
+#: ../glib/gspawn.c:1374
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "無法衍生副進程 (%s)"
 
-#: glib/gspawn.c:1383
+#: ../glib/gspawn.c:1382
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "執行副進程“%s”時發生不明的錯誤"
 
-#: glib/gspawn.c:1407
+#: ../glib/gspawn.c:1406
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "無法從 child pid pipe 讀取足夠的資料 (%s)"
 
-#: glib/gutf8.c:1063
+#: ../glib/gutf8.c:1062
 msgid "Character out of range for UTF-8"
 msgstr "字元不在 UTF-8 範圍之內"
 
-#: glib/gutf8.c:1163 glib/gutf8.c:1172 glib/gutf8.c:1304 glib/gutf8.c:1313
-#: glib/gutf8.c:1454 glib/gutf8.c:1550
+#: ../glib/gutf8.c:1162 ../glib/gutf8.c:1171 ../glib/gutf8.c:1303
+#: ../glib/gutf8.c:1312 ../glib/gutf8.c:1453 ../glib/gutf8.c:1549
 msgid "Invalid sequence in conversion input"
 msgstr "轉換輸入資料時出現無效的字元次序"
 
-#: glib/gutf8.c:1465 glib/gutf8.c:1561
+#: ../glib/gutf8.c:1464 ../glib/gutf8.c:1560
 msgid "Character out of range for UTF-16"
 msgstr "字元不在 UTF-16 範圍之內"
 
-#: glib/goption.c:755
+#: ../glib/goption.c:754
 msgid "Usage:"
 msgstr "用法："
 
-#: glib/goption.c:755
+#: ../glib/goption.c:754
 msgid "[OPTION...]"
 msgstr "[選項...]"
 
-#: glib/goption.c:861
+#: ../glib/goption.c:860
 msgid "Help Options:"
 msgstr "說明選項："
 
-#: glib/goption.c:862
+#: ../glib/goption.c:861
 msgid "Show help options"
 msgstr "顯示說明的選項"
 
-#: glib/goption.c:868
+#: ../glib/goption.c:867
 msgid "Show all help options"
 msgstr "顯示所有的說明選項"
 
-#: glib/goption.c:930
+#: ../glib/goption.c:929
 msgid "Application Options:"
 msgstr "應用程式選項："
 
-#: glib/goption.c:992 glib/goption.c:1062
+#: ../glib/goption.c:991 ../glib/goption.c:1061
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "無法給 %2$s 解析整數值‘%1$s’"
 
-#: glib/goption.c:1002 glib/goption.c:1070
+#: ../glib/goption.c:1001 ../glib/goption.c:1069
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "%2$s 的整數值‘%1$s’超出範圍"
 
-#: glib/goption.c:1027
+#: ../glib/goption.c:1026
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "無法給 %2$s 解析雙精度浮點數‘%1$s’"
 
-#: glib/goption.c:1035
+#: ../glib/goption.c:1034
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "%2$s 的雙精度浮點數‘%1$s’超出範圍"
 
-#: glib/goption.c:1298 glib/goption.c:1377
+#: ../glib/goption.c:1297 ../glib/goption.c:1376
 #, c-format
 msgid "Error parsing option %s"
 msgstr "解析 %s 選項時發生錯誤"
 
-#: glib/goption.c:1408 glib/goption.c:1522
+#: ../glib/goption.c:1407 ../glib/goption.c:1521
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺少 %s 的參數"
 
-#: glib/goption.c:1917
+#: ../glib/goption.c:1916
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的選項 %s"
 
-#: glib/gkeyfile.c:363
+#: ../glib/gkeyfile.c:362
 msgid "Valid key file could not be found in search dirs"
 msgstr "在資料目錄中找不到有效的設定鍵檔案"
 
-#: glib/gkeyfile.c:398
+#: ../glib/gkeyfile.c:397
 msgid "Not a regular file"
 msgstr "不是正規的檔案"
 
-#: glib/gkeyfile.c:406
+#: ../glib/gkeyfile.c:405
 msgid "File is empty"
 msgstr "檔案是空白的"
 
-#: glib/gkeyfile.c:765
+#: ../glib/gkeyfile.c:764
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
 msgstr "設定鍵檔案中‘%s’行並非設定鍵值配對、群組或註解"
 
-#: glib/gkeyfile.c:825
+#: ../glib/gkeyfile.c:824
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "無效的群組名稱：%s"
 
-#: glib/gkeyfile.c:847
+#: ../glib/gkeyfile.c:846
 msgid "Key file does not start with a group"
 msgstr "設定鍵檔案並非以群組開頭"
 
-#: glib/gkeyfile.c:873
+#: ../glib/gkeyfile.c:872
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "無效的設定鍵名稱：%s"
 
-#: glib/gkeyfile.c:900
+#: ../glib/gkeyfile.c:899
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "設定鍵檔案包含不支援的編碼‘%s’"
 
-#: glib/gkeyfile.c:1116 glib/gkeyfile.c:1278 glib/gkeyfile.c:2657
-#: glib/gkeyfile.c:2723 glib/gkeyfile.c:2858 glib/gkeyfile.c:2991
-#: glib/gkeyfile.c:3144 glib/gkeyfile.c:3331 glib/gkeyfile.c:3392
+#: ../glib/gkeyfile.c:1115 ../glib/gkeyfile.c:1277 ../glib/gkeyfile.c:2656
+#: ../glib/gkeyfile.c:2722 ../glib/gkeyfile.c:2857 ../glib/gkeyfile.c:2990
+#: ../glib/gkeyfile.c:3143 ../glib/gkeyfile.c:3330 ../glib/gkeyfile.c:3391
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "設定鍵檔案沒有群組‘%s’"
 
-#: glib/gkeyfile.c:1290
+#: ../glib/gkeyfile.c:1289
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "設定鍵檔案沒有設定鍵‘%s’"
 
-#: glib/gkeyfile.c:1397 glib/gkeyfile.c:1512
+#: ../glib/gkeyfile.c:1396 ../glib/gkeyfile.c:1511
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr "設定鍵檔案包含的設定鍵‘%s’（數值為‘%s’）並非 UTF-8"
 
-#: glib/gkeyfile.c:1417 glib/gkeyfile.c:1911
+#: ../glib/gkeyfile.c:1416 ../glib/gkeyfile.c:1910
 #, c-format
 msgid "Key file contains key '%s' which has value that cannot be interpreted."
 msgstr "設定鍵檔案包含的設定鍵‘%s’的數值無法解譯。"
 
-#: glib/gkeyfile.c:1532
+#: ../glib/gkeyfile.c:1531
 #, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "設定鍵檔案包含的設定鍵「%s」的數值無法解譯。"
 
-#: glib/gkeyfile.c:2126 glib/gkeyfile.c:2488
+#: ../glib/gkeyfile.c:2125 ../glib/gkeyfile.c:2487
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
 "interpreted."
 msgstr "設定鍵檔案包含的群組‘%2$s’中設定鍵‘%1$s’數值無法解譯"
 
-#: glib/gkeyfile.c:2672 glib/gkeyfile.c:2873 glib/gkeyfile.c:3403
+#: ../glib/gkeyfile.c:2671 ../glib/gkeyfile.c:2872 ../glib/gkeyfile.c:3402
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "設定鍵檔案的群組‘%2$s’中沒有設定鍵‘%1$s’"
 
-#: glib/gkeyfile.c:3637
+#: ../glib/gkeyfile.c:3636
 msgid "Key file contains escape character at end of line"
 msgstr "設定鍵檔案在行尾包含跳出字元"
 
-#: glib/gkeyfile.c:3659
+#: ../glib/gkeyfile.c:3658
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "設定鍵檔案含有不正確的「跳出字元」‘%s’"
 
-#: glib/gkeyfile.c:3801
+#: ../glib/gkeyfile.c:3800
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "數值‘%s’不能被解譯為數字。"
 
-#: glib/gkeyfile.c:3815
+#: ../glib/gkeyfile.c:3814
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "整數值‘%s’超出範圍"
 
-#: glib/gkeyfile.c:3848
+#: ../glib/gkeyfile.c:3847
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "數值‘%s’不能被解譯為浮點數。"
 
-#: glib/gkeyfile.c:3872
+#: ../glib/gkeyfile.c:3871
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "數值‘%s’不能被解譯為邏輯值。"
 
-#: gio/gbufferedinputstream.c:415 gio/gbufferedinputstream.c:496
-#: gio/ginputstream.c:186 gio/ginputstream.c:318 gio/ginputstream.c:557
-#: gio/ginputstream.c:682 gio/goutputstream.c:198 gio/goutputstream.c:721
+#: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492
+#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317
+#: ../gio/ginputstream.c:556 ../gio/ginputstream.c:681
+#: ../gio/goutputstream.c:197 ../gio/goutputstream.c:720
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "傳給 %s 的計數值太大"
 
-#: gio/gbufferedinputstream.c:883 gio/ginputstream.c:892 gio/giostream.c:305
-#: gio/goutputstream.c:1196
+#: ../gio/gbufferedinputstream.c:881 ../gio/ginputstream.c:891
+#: ../gio/giostream.c:304 ../gio/goutputstream.c:1195
 msgid "Stream is already closed"
 msgstr "串流已經關閉"
 
-#: gio/gcancellable.c:433 gio/gdbusconnection.c:1212
-#: gio/gdbusconnection.c:1300 gio/gdbusconnection.c:1472 gio/glocalfile.c:2103
-#: gio/gsimpleasyncresult.c:651 gio/gsimpleasyncresult.c:677
+#: ../gio/gcancellable.c:432 ../gio/gdbusconnection.c:1415
+#: ../gio/gdbusconnection.c:1503 ../gio/gdbusconnection.c:1678
+#: ../gio/glocalfile.c:2102 ../gio/gsimpleasyncresult.c:650
+#: ../gio/gsimpleasyncresult.c:676
 msgid "Operation was cancelled"
 msgstr "操作已被取消"
 
-#: gio/gcharsetconverter.c:264
+#: ../gio/gcharsetconverter.c:263
 msgid "Invalid object, not initialized"
 msgstr "無效的物件，尚未初始化"
 
-#: gio/gcharsetconverter.c:285 gio/gcharsetconverter.c:313
+#: ../gio/gcharsetconverter.c:284 ../gio/gcharsetconverter.c:312
 msgid "Incomplete multibyte sequence in input"
 msgstr "在輸入中出現不完整的多位元組次序"
 
-#: gio/gcharsetconverter.c:319 gio/gcharsetconverter.c:328
+#: ../gio/gcharsetconverter.c:318 ../gio/gcharsetconverter.c:327
 msgid "Not enough space in destination"
 msgstr "在目的端中沒有足夠的空間"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:804
+#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:803
 msgid "Cancellable initialization not supported"
 msgstr "不支援可取消的初始化"
 
-#: gio/gcontenttype.c:180
+#: ../gio/gcontenttype.c:179
 msgid "Unknown type"
 msgstr "不明的類型"
 
-#: gio/gcontenttype.c:181
+#: ../gio/gcontenttype.c:180
 #, c-format
 msgid "%s filetype"
 msgstr "%s 檔案類型"
 
-#: gio/gcontenttype.c:681
+#: ../gio/gcontenttype.c:679
 #, c-format
 msgid "%s type"
 msgstr "%s 類型"
 
-#: gio/gcredentials.c:203 gio/gcredentials.c:338
+#: ../gio/gcredentials.c:204 ../gio/gcredentials.c:339
 msgid "GCredentials is not implemented on this OS"
-msgstr ""
+msgstr "GCredentials 沒有在這個 OS 上實作"
 
-#: gio/gcredentials.c:296
+#: ../gio/gcredentials.c:297
 msgid "There is no GCredentials support for your platform"
-msgstr ""
+msgstr "您的平台沒有 GCredentials 支援"
 
-#: gio/gdatainputstream.c:311
+#: ../gio/gdatainputstream.c:310
 msgid "Unexpected early end-of-stream"
 msgstr "未預期的串流過早結束"
 
-#: gio/gdbusaddress.c:135 gio/gdbusaddress.c:226 gio/gdbusaddress.c:300
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:140 ../gio/gdbusaddress.c:231
+#: ../gio/gdbusaddress.c:305
+#, c-format
 msgid "Unsupported key `%s' in address entry `%s'"
-msgstr "不支援的 socket 位址"
+msgstr "位址項目「%2$s」有不支援的設定鍵「%1$s」"
 
-#: gio/gdbusaddress.c:165
+#: ../gio/gdbusaddress.c:170
 #, c-format
 msgid ""
 "Address `%s' is invalid (need exactly one of path, tmpdir or abstract keys)"
-msgstr ""
+msgstr "位址「%s」是無效的（需要有明確的 path、tmpdir 或 abstract 設定鍵之一）"
 
-#: gio/gdbusaddress.c:178
+#: ../gio/gdbusaddress.c:183
 #, c-format
 msgid "Meaningless key/value pair combination in address entry `%s'"
-msgstr ""
+msgstr "在位址項「%s」有無意義的設定鍵/數值組合配對"
 
-#: gio/gdbusaddress.c:241 gio/gdbusaddress.c:315
+#: ../gio/gdbusaddress.c:246 ../gio/gdbusaddress.c:320
 #, c-format
 msgid "Error in address `%s' - the port attribute is malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - port 屬性的格式不良"
 
-#: gio/gdbusaddress.c:252 gio/gdbusaddress.c:326
+#: ../gio/gdbusaddress.c:257 ../gio/gdbusaddress.c:331
 #, c-format
 msgid "Error in address `%s' - the family attribute is malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - family 屬性的格式不良"
 
-#: gio/gdbusaddress.c:428
+#: ../gio/gdbusaddress.c:435
 #, c-format
 msgid "Address element `%s', does not contain a colon (:)"
-msgstr ""
+msgstr "位址元素「%s」，並未包含分號 (:)"
 
-#: gio/gdbusaddress.c:449
+#: ../gio/gdbusaddress.c:456
 #, c-format
 msgid ""
 "Key/Value pair %d, `%s', in address element `%s', does not contain an equal "
 "sign"
-msgstr ""
+msgstr "設定鍵/數值配對 %d，「%s」，於位址元素「%s」，並未包含等於符號"
 
-#: gio/gdbusaddress.c:523
+#: ../gio/gdbusaddress.c:536
 #, c-format
 msgid ""
 "Error in address `%s' - the unix transport requires exactly one of the keys "
 "`path' or `abstract' to be set"
 msgstr ""
+"位址「%s」有錯誤 - unix 傳輸需要明確的設定一個「path」或「abstract」設定鍵"
 
-#: gio/gdbusaddress.c:559
+#: ../gio/gdbusaddress.c:572
 #, c-format
 msgid "Error in address `%s' - the host attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - host 屬性遺失或格式不良"
 
-#: gio/gdbusaddress.c:573
+#: ../gio/gdbusaddress.c:586
 #, c-format
 msgid "Error in address `%s' - the port attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - port 屬性遺失或格式不良"
 
-#: gio/gdbusaddress.c:587
+#: ../gio/gdbusaddress.c:600
 #, c-format
 msgid "Error in address `%s' - the noncefile attribute is missing or malformed"
-msgstr ""
+msgstr "位址「%s」有錯誤 - noncefile 屬性遺失或格式不良"
+
+#: ../gio/gdbusaddress.c:621
+msgid "Error auto-launching: "
+msgstr "自動執行失敗："
 
-#: gio/gdbusaddress.c:601
+#: ../gio/gdbusaddress.c:629
 #, c-format
 msgid "Unknown or unsupported transport `%s' for address `%s'"
-msgstr ""
+msgstr "位址「%2$s」有不明或不支援的傳輸「%1$s」"
 
-#: gio/gdbusaddress.c:635
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:663
+#, c-format
 msgid "Error reading nonce file `%s':"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "讀取臨時檔案「%s」時發生錯誤："
 
-#: gio/gdbusaddress.c:646
-msgid "The nonce-file `%s' was %"
-msgstr ""
+#: ../gio/gdbusaddress.c:675
+#, c-format
+msgid "The nonce-file `%s' was %lu bytes. Expected 16 bytes."
+msgstr "nonce-file「%s」有 %lu 位元組。預期應為 16 位元組。"
 
-#: gio/gdbusaddress.c:662
+#: ../gio/gdbusaddress.c:691
 #, c-format
 msgid "Error write contents of nonce file `%s' to stream:"
-msgstr ""
+msgstr "寫入臨時檔案「%s」的內容到串流時發生錯誤："
+
+#: ../gio/gdbusaddress.c:915
+msgid "The given address is empty"
+msgstr "指定的位址是空白的"
 
-#: gio/gdbusaddress.c:978
+#: ../gio/gdbusaddress.c:984
+msgid "Cannot spawn a message bus without a machine-id: "
+msgstr "沒有 machine-id 不能產生訊息匯流排："
+
+#: ../gio/gdbusaddress.c:1021
 #, c-format
-msgid ""
-"Cannot determine session bus address (TODO: run dbus-launch to find out)"
-msgstr ""
+msgid "Error spawning command line `%s': "
+msgstr "產生命令列「%s」時出現錯誤："
+
+#: ../gio/gdbusaddress.c:1032
+#, c-format
+msgid "Abnormal program termination spawning command line `%s': %s"
+msgstr "不正常的程式中止產生命令列「%s」：%s"
+
+#: ../gio/gdbusaddress.c:1046
+#, c-format
+msgid "Command line `%s' exited with non-zero exit status %d: %s"
+msgstr "命令列「%s」以非零結束狀態 %d 結束：%s"
 
-#: gio/gdbusaddress.c:1002 gio/gdbusconnection.c:5309
+#: ../gio/gdbusaddress.c:1119
+#, c-format
+msgid "Cannot determine session bus address (not implemented for this OS)"
+msgstr "不能判斷作業階段匯流排位址（沒有在這個 OS 實作）"
+
+#: ../gio/gdbusaddress.c:1218 ../gio/gdbusconnection.c:5787
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "- unknown value `%s'"
-msgstr ""
+msgstr "不能從 DBUS_STARTER_BUS_TYPE 環境變數判斷匯流排位址 - 不明的數值「%s」"
 
-#: gio/gdbusaddress.c:1011 gio/gdbusconnection.c:5318
+#: ../gio/gdbusaddress.c:1227 ../gio/gdbusconnection.c:5796
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
-msgstr ""
+msgstr "不能判斷匯流排位址，因為尚未設定 DBUS_STARTER_BUS_TYPE 環境變數"
 
-#: gio/gdbusaddress.c:1021
-#, fuzzy, c-format
+#: ../gio/gdbusaddress.c:1237
+#, c-format
 msgid "Unknown bus type %d"
-msgstr "不明的類型"
+msgstr "不明的匯流排類型 %d"
 
-#: gio/gdbusauth.c:289
+#: ../gio/gdbusauth.c:288
 msgid "Unexpected lack of content trying to read a line"
-msgstr ""
+msgstr "未預期的內容缺乏嘗試讀取行"
 
-#: gio/gdbusauth.c:333
+#: ../gio/gdbusauth.c:332
 msgid "Unexpected lack of content trying to (safely) read a line"
-msgstr ""
+msgstr "未預期的內容缺乏嘗試（安全的）讀取行"
 
-#: gio/gdbusauth.c:504
+#: ../gio/gdbusauth.c:503
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
-msgstr ""
+msgstr "竭盡所有可用的驗證機制 (已嘗試：%s) (可用：%s)"
 
-#: gio/gdbusauth.c:1146
+#: ../gio/gdbusauth.c:1149
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
-msgstr ""
+msgstr "已透過 GDBusAuthObserver::authorize-authenticated-peer 取消"
 
-#: gio/gdbusauthmechanismsha1.c:264
+#: ../gio/gdbusauthmechanismsha1.c:266
 #, fuzzy, c-format
 msgid "Error statting directory `%s': %s"
-msgstr "開啟目錄‘%s’時發生錯誤：%s"
+msgstr "建立目錄時發生錯誤"
 
-#: gio/gdbusauthmechanismsha1.c:276
+#: ../gio/gdbusauthmechanismsha1.c:278
 #, c-format
 msgid ""
 "Permissions on directory `%s' are malformed. Expected mode 0700, got 0%o"
-msgstr ""
+msgstr "目錄「%s」的權限格式下良。預期的模式為 0700，卻得到 0%o"
 
-#: gio/gdbusauthmechanismsha1.c:295
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:299
+#, c-format
 msgid "Error creating directory `%s': %s"
-msgstr "建立目錄發生錯誤：%s"
+msgstr "建立目錄「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:378
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:382
+#, c-format
 msgid "Error opening keyring `%s' for reading: "
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "開啟鑰匙圈「%s」讀取時發生錯誤："
 
-#: gio/gdbusauthmechanismsha1.c:402 gio/gdbusauthmechanismsha1.c:711
+#: ../gio/gdbusauthmechanismsha1.c:406 ../gio/gdbusauthmechanismsha1.c:715
 #, c-format
 msgid "Line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的鑰匙圈第 %1$d 行格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:416 gio/gdbusauthmechanismsha1.c:725
+#: ../gio/gdbusauthmechanismsha1.c:420 ../gio/gdbusauthmechanismsha1.c:729
 #, c-format
 msgid ""
 "First token of line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的鑰匙圈第 %1$d 行第一記號格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:739
+#: ../gio/gdbusauthmechanismsha1.c:434 ../gio/gdbusauthmechanismsha1.c:743
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at `%s' with content `%s' is malformed"
-msgstr ""
+msgstr "位於「%2$s」內容「%3$s」的鑰匙圈第 %1$d 行第二記號格式不良"
 
-#: gio/gdbusauthmechanismsha1.c:454
+#: ../gio/gdbusauthmechanismsha1.c:458
 #, c-format
 msgid "Didn't find cookie with id %d in the keyring at `%s'"
-msgstr ""
+msgstr "在「%2$s」鑰匙圈找不到 id %1$d 的 cookie"
 
-#: gio/gdbusauthmechanismsha1.c:531
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:535
+#, c-format
 msgid "Error deleting stale lock-file `%s': %s"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "刪除舊的鎖定檔案「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:562
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:566
+#, c-format
 msgid "Error creating lock-file `%s': %s"
-msgstr "讀取檔案‘%s’時發生錯誤：%s"
+msgstr "建立鎖定檔案「%s」時發生錯誤：%s"
 
-#: gio/gdbusauthmechanismsha1.c:592
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:596
+#, c-format
 msgid "Error closing (unlinked) lock-file `%s': %s"
-msgstr "關閉檔案時發生錯誤：%s"
+msgstr "關閉（取消連結）鎖定檔案時發生錯誤「%s」：%s"
 
-#: gio/gdbusauthmechanismsha1.c:602
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:606
+#, c-format
 msgid "Error unlinking lock-file `%s': %s"
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "取消連結鎖定檔案時發生錯誤「%s」：%s"
 
-#: gio/gdbusauthmechanismsha1.c:678
-#, fuzzy, c-format
+#: ../gio/gdbusauthmechanismsha1.c:682
+#, c-format
 msgid "Error opening keyring `%s' for writing: "
-msgstr "開啟檔案「%s」時發生錯誤：%s"
+msgstr "開啟鑰匙圈「%s」寫入時發生錯誤："
 
-#: gio/gdbusauthmechanismsha1.c:873
+#: ../gio/gdbusauthmechanismsha1.c:877
 #, c-format
 msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
-msgstr ""
+msgstr "(另外，釋放「%s」的鎖定失敗：%s)"
 
-#: gio/gdbusconnection.c:1001 gio/gdbusconnection.c:1311
-#, fuzzy
+#: ../gio/gdbusconnection.c:1047 ../gio/gdbusconnection.c:1198
+#: ../gio/gdbusconnection.c:1514
 msgid "The connection is closed"
-msgstr "加入的 socket 已經關閉"
+msgstr "這個連線已關閉"
 
-#: gio/gdbusconnection.c:1256
+#: ../gio/gdbusconnection.c:1459
 msgid "Timeout was reached"
-msgstr ""
+msgstr "已達逾時時間"
 
-#: gio/gdbusconnection.c:1757
+#: ../gio/gdbusconnection.c:2013
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
-msgstr ""
+msgstr "當建立客戶端連線時遇到不支援的旗標"
+
+#: ../gio/gdbusconnection.c:3399 ../gio/gdbusconnection.c:3715
+#, c-format
+msgid ""
+"No such interface `org.freedesktop.DBus.Properties' on object at path %s"
+msgstr "在路徑 %s 的物件沒有「org.freedesktop.DBus.Properties」這個介面"
 
-#: gio/gdbusconnection.c:3158
+#: ../gio/gdbusconnection.c:3470
 #, c-format
 msgid "Error setting property `%s': Expected type `%s' but got `%s'"
-msgstr ""
+msgstr "設定屬性「%s」錯誤：預期的類型為「%s」但得到「%s」"
 
-#: gio/gdbusconnection.c:3250
+#: ../gio/gdbusconnection.c:3564
 #, c-format
 msgid "No such property `%s'"
-msgstr ""
+msgstr "沒有這個屬性「%s」"
 
-#: gio/gdbusconnection.c:3262
-#, fuzzy, c-format
+#: ../gio/gdbusconnection.c:3576
+#, c-format
 msgid "Property `%s' is not readable"
-msgstr "類型 %s 尚未歸類"
+msgstr "屬性「%s」無法讀取"
 
-#: gio/gdbusconnection.c:3273
-#, fuzzy, c-format
+#: ../gio/gdbusconnection.c:3587
+#, c-format
 msgid "Property `%s' is not writable"
-msgstr "類型 %s 尚未歸類"
+msgstr "屬性「%s」無法寫入"
 
-#: gio/gdbusconnection.c:3341 gio/gdbusconnection.c:4768
+#: ../gio/gdbusconnection.c:3657 ../gio/gdbusconnection.c:5235
 #, c-format
 msgid "No such interface `%s'"
-msgstr ""
+msgstr "沒有這個介面「%s」"
 
-#: gio/gdbusconnection.c:3504
+#: ../gio/gdbusconnection.c:3842
 msgid "No such interface"
-msgstr ""
+msgstr "沒有這個介面"
+
+#: ../gio/gdbusconnection.c:4058 ../gio/gdbusconnection.c:5737
+#, c-format
+msgid "No such interface `%s' on object at path %s"
+msgstr "在路徑 %2$s 的物件沒有「%1$s」這個介面"
 
-#: gio/gdbusconnection.c:3748
+#: ../gio/gdbusconnection.c:4110
 #, c-format
 msgid "No such method `%s'"
-msgstr ""
+msgstr "沒有這個方法「%s」"
 
-#: gio/gdbusconnection.c:3779
+#: ../gio/gdbusconnection.c:4141
 #, c-format
 msgid "Type of message, `%s', does not match expected type `%s'"
-msgstr ""
+msgstr "訊息的類型，「%s」，不符合預期的類型「%s」"
 
-#: gio/gdbusconnection.c:3993
+#: ../gio/gdbusconnection.c:4359
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
-msgstr ""
+msgstr "有物件已為介面 %s 匯出於 %s"
 
-#: gio/gdbusconnection.c:4173
+#: ../gio/gdbusconnection.c:4553
 #, c-format
 msgid "Method `%s' returned type `%s', but expected `%s'"
-msgstr ""
+msgstr "方法「%s」傳回類型「%s」，但預期為「%s」"
 
-#: gio/gdbusconnection.c:4866
+#: ../gio/gdbusconnection.c:5337
 #, c-format
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
-msgstr ""
+msgstr "介面「%2$s」簽章「%3$s」的方法「%1$s」不存在"
 
-#: gio/gdbusconnection.c:4981
-#, fuzzy, c-format
-msgid "A subtree is already exported for %s"
-msgstr "聽取程式已經關閉"
-
-#: gio/gdbusconnection.c:5089
+#: ../gio/gdbusconnection.c:5452
 #, c-format
-msgid "Unable to load /var/lib/dbus/machine-id: %s"
-msgstr ""
+msgid "A subtree is already exported for %s"
+msgstr "子樹狀目錄已為 %s 匯出"
 
-#: gio/gdbusconnection.c:5259
+#: ../gio/gdbusmessage.c:754
 #, c-format
-msgid "No such interface `%s' on object at path %s"
-msgstr ""
-
-#: gio/gdbusmessage.c:723
-msgid "Wanted to read %"
-msgstr ""
+msgid "Wanted to read %lu bytes but got EOF"
+msgstr "嘗試讀取 %lu 位元組卻得到 EOF"
 
-#: gio/gdbusmessage.c:744
+#: ../gio/gdbusmessage.c:775
 #, c-format
 msgid "Expected NUL byte after the string `%s' but found `%c' (%d)"
-msgstr ""
+msgstr "預期在字串「%s」之後為 NUL 位元組，但是發現「%c」(%d)"
 
-#: gio/gdbusmessage.c:927
+#: ../gio/gdbusmessage.c:974
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus object path"
-msgstr ""
+msgstr "已解析數值「%s」不是有效的 D-Bus 物件路徑"
 
-#: gio/gdbusmessage.c:953
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:1000
+#, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "已解析數值「%s」不是一個有效的 D-Bus 簽章"
 
-#: gio/gdbusmessage.c:979
-msgid "Encountered array of length %"
-msgstr ""
+#: ../gio/gdbusmessage.c:1041
+#, c-format
+msgid "Encountered array of length %u bytes. Maximum length is 2<<26 bytes."
+msgstr "遇到長度為 %u 位元組的陣列。最大長度為 2<<26 位元組。"
 
-#: gio/gdbusmessage.c:1116
+#: ../gio/gdbusmessage.c:1202
 #, c-format
 msgid "Parsed value `%s' for variant is not a valid D-Bus signature"
 msgstr ""
 
-#: gio/gdbusmessage.c:1141
+#: ../gio/gdbusmessage.c:1229
 #, c-format
 msgid ""
 "Error deserializing GVariant with type-string `%s' from the D-Bus wire format"
 msgstr ""
 
-#: gio/gdbusmessage.c:1286
+#: ../gio/gdbusmessage.c:1409
 #, c-format
 msgid "Invalid endianness value. Expected 'l' or 'B' but found '%c' (%d)"
-msgstr ""
+msgstr "無效的字節順序數值。預期為「I」或「B」卻得到「%c」(%d)"
 
-#: gio/gdbusmessage.c:1300
+#: ../gio/gdbusmessage.c:1423
 #, c-format
 msgid "Invalid major protocol version. Expected 1 but found %d"
-msgstr ""
+msgstr "無效的主通訊協定版本。預期為 1 但找到 %d"
 
-#: gio/gdbusmessage.c:1342
+#: ../gio/gdbusmessage.c:1480
 #, c-format
 msgid "Signature header with signature `%s' found but message body is empty"
-msgstr ""
+msgstr "發現簽章「%s」的簽章標頭但訊息主體是空的"
 
-#: gio/gdbusmessage.c:1356
+#: ../gio/gdbusmessage.c:1494
 #, c-format
 msgid "Parsed value `%s' is not a valid D-Bus signature (for body)"
-msgstr ""
+msgstr "已解析數值「%s」不是有效的 D-Bus 簽章 (於主體)"
 
-#: gio/gdbusmessage.c:1385
-msgid "No signature header in message but the message body is %"
-msgstr ""
+#: ../gio/gdbusmessage.c:1524
+#, c-format
+msgid "No signature header in message but the message body is %u bytes"
+msgstr "在訊息中沒有簽章標頭但訊息主體有 %u 位元組"
 
-#: gio/gdbusmessage.c:1694
+#: ../gio/gdbusmessage.c:1841
 #, c-format
 msgid ""
 "Error serializing GVariant with type-string `%s' to the D-Bus wire format"
 msgstr ""
 
-#: gio/gdbusmessage.c:1823
+#: ../gio/gdbusmessage.c:1974
 #, c-format
 msgid "Message has %d fds but the header field indicates %d fds"
-msgstr ""
+msgstr "訊息有 %d fds 但標頭欄位表示有 %d fds"
 
-#: gio/gdbusmessage.c:1869
+#: ../gio/gdbusmessage.c:2020
 #, c-format
 msgid "Message body has signature `%s' but there is no signature header"
-msgstr ""
+msgstr "訊息主體有簽章「%s」但是沒有簽章標頭"
 
-#: gio/gdbusmessage.c:1879
+#: ../gio/gdbusmessage.c:2030
 #, c-format
 msgid ""
 "Message body has type signature `%s' but signature in the header field is `%"
 "s'"
-msgstr ""
+msgstr "訊息主體有類型簽章「%s」但是標頭欄位中的簽章為「%s」"
 
-#: gio/gdbusmessage.c:1895
+#: ../gio/gdbusmessage.c:2046
 #, c-format
 msgid "Message body is empty but signature in the header field is `(%s)'"
-msgstr ""
+msgstr "訊息主體是空的但是標頭欄位中的簽章為「%s」"
 
-#: gio/gdbusmessage.c:2448
-#, fuzzy, c-format
+#: ../gio/gdbusmessage.c:2600
+#, c-format
 msgid "Error return with body of type `%s'"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "傳回類型「%s」主體時發生錯誤"
 
-#: gio/gdbusmessage.c:2456
+#: ../gio/gdbusmessage.c:2608
 msgid "Error return with empty body"
-msgstr ""
+msgstr "傳回空白主體錯誤"
 
-#: gio/gdbusmethodinvocation.c:357
+#: ../gio/gdbusmethodinvocation.c:375
 #, c-format
 msgid "Type of return value is incorrect, got `%s', expected `%s'"
-msgstr ""
+msgstr "回傳值的類型是不正確的，得到「%s」，預期為「%s」"
 
-#: gio/gdbusmethodinvocation.c:371 gio/gsocket.c:2859 gio/gsocket.c:2940
+#: ../gio/gdbusmethodinvocation.c:389 ../gio/gsocket.c:2867
+#: ../gio/gsocket.c:2948
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
-#: gio/gdbusprivate.c:775
+#: ../gio/gdbusprivate.c:885
 msgid "Error writing first 16 bytes of message to socket: "
-msgstr ""
+msgstr "當寫入訊息的頭 16 位元組到 socket 時發生錯誤："
+
+#: ../gio/gdbusprivate.c:1406
+msgid "Unable to load /var/lib/dbus/machine-id: "
+msgstr "無法載入 /var/lib/dbus/machine-id："
 
-#: gio/gdbusproxy.c:633
+#: ../gio/gdbusproxy.c:703
 #, c-format
 msgid ""
 "Trying to set property %s of type %s but according to the expected interface "
 "the type is %s"
 msgstr ""
+"正在嘗試設定類型 %2$s 的屬性 %1$s 但是根據預期的介面這個類型應該是 %3$s"
 
-#: gio/gdbusserver.c:669
-#, fuzzy
+#: ../gio/gdbusproxy.c:1224
+#, c-format
+msgid "Error calling StartServiceByName for %s: "
+msgstr "呼叫 %s StartServiceByName 時發生錯誤："
+
+#: ../gio/gdbusproxy.c:1245
+#, c-format
+msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
+msgstr "來自 StartServiceByName(\"%2$s\") 方法的未預期回應 %1$d"
+
+#: ../gio/gdbusserver.c:703
 msgid "Abstract name space not supported"
-msgstr "不支援回收筒"
+msgstr "不支援抽象命名空間"
 
-#: gio/gdbusserver.c:759
+#: ../gio/gdbusserver.c:793
 msgid "Cannot specify nonce file when creating a server"
-msgstr ""
+msgstr "當建立伺服器時不能指定臨時檔案"
 
-#: gio/gdbusserver.c:836
-#, fuzzy, c-format
+#: ../gio/gdbusserver.c:870
+#, c-format
 msgid "Error writing nonce file at `%s': %s"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "在「%s」寫入臨時檔案時發生錯誤：%s"
 
-#: gio/gdbusserver.c:988
-#, fuzzy, c-format
+#: ../gio/gdbusserver.c:1026
+#, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "字串「%s」不是一個有效的 D-Bus GUID"
 
-#: gio/gdbusserver.c:1028
+#: ../gio/gdbusserver.c:1066
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
-msgstr ""
+msgstr "不能聽取不支援的傳輸「%s」"
 
-#: gio/gdbus-tool.c:87 gio/gsettings-tool.c:38
+#: ../gio/gdbus-tool.c:87 ../gio/gsettings-tool.c:76
 msgid "COMMAND"
-msgstr ""
+msgstr "指令"
 
-#: gio/gdbus-tool.c:92
+#: ../gio/gdbus-tool.c:92
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1593,231 +1647,244 @@ msgid ""
 "\n"
 "Use \"%s COMMAND --help\" to get help on each command.\n"
 msgstr ""
+"指令：\n"
+"  help         顯示這個資訊\n"
+"  introspect   檢查遠端物件\n"
+"  monitor      監控遠端物件\n"
+"  call         呼叫遠端物件的方法\n"
+"\n"
+"使用「%s COMMAND --help」來取得每個指令的求助資訊。\n"
 
-#: gio/gdbus-tool.c:160 gio/gdbus-tool.c:216 gio/gdbus-tool.c:288
-#: gio/gdbus-tool.c:312 gio/gdbus-tool.c:814 gio/gdbus-tool.c:1322
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:160 ../gio/gdbus-tool.c:216 ../gio/gdbus-tool.c:288
+#: ../gio/gdbus-tool.c:312 ../gio/gdbus-tool.c:814 ../gio/gdbus-tool.c:1324
+#, c-format
 msgid "Error: %s\n"
-msgstr "第 %d 行發生錯誤：%s"
+msgstr "錯誤：%s\n"
 
-#: gio/gdbus-tool.c:171 gio/gdbus-tool.c:229 gio/gdbus-tool.c:1332
+#: ../gio/gdbus-tool.c:171 ../gio/gdbus-tool.c:229 ../gio/gdbus-tool.c:1340
 #, fuzzy, c-format
 msgid "Error parsing introspection XML: %s\n"
-msgstr "解析 %s 選項時發生錯誤"
+msgstr "解析指令時出現錯誤"
 
-#: gio/gdbus-tool.c:346
+#: ../gio/gdbus-tool.c:346
 msgid "Connect to the system bus"
-msgstr ""
+msgstr "連線到系統匯流排"
 
-#: gio/gdbus-tool.c:347
+#: ../gio/gdbus-tool.c:347
 msgid "Connect to the session bus"
-msgstr ""
+msgstr "連線到作業階段匯流排"
 
-#: gio/gdbus-tool.c:348
-#, fuzzy
+#: ../gio/gdbus-tool.c:348
 msgid "Connect to given D-Bus address"
-msgstr "連線進行中"
+msgstr "連線到指定的 D-Bus 位址"
 
-#: gio/gdbus-tool.c:358
-#, fuzzy
+#: ../gio/gdbus-tool.c:358
 msgid "Connection Endpoint Options:"
-msgstr "連線進行中"
+msgstr "連線端點選項："
 
-#: gio/gdbus-tool.c:359
+#: ../gio/gdbus-tool.c:359
 msgid "Options specifying the connection endpoint"
-msgstr ""
+msgstr "指定連線端點的選項"
 
-#: gio/gdbus-tool.c:379
+#: ../gio/gdbus-tool.c:379
 #, c-format
 msgid "No connection endpoint specified"
-msgstr ""
+msgstr "沒有指定連線端點"
 
-#: gio/gdbus-tool.c:389
+#: ../gio/gdbus-tool.c:389
 #, c-format
 msgid "Multiple connection endpoints specified"
-msgstr ""
+msgstr "指定了多重連線端點"
 
-#: gio/gdbus-tool.c:459
+#: ../gio/gdbus-tool.c:459
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface `%s' does not exist\n"
-msgstr ""
+msgstr "警告：根據檢討資料，介面「%s」不存在\n"
 
-#: gio/gdbus-tool.c:468
+#: ../gio/gdbus-tool.c:468
 #, c-format
 msgid ""
 "Warning: According to introspection data, method `%s' does not exist on "
 "interface `%s'\n"
-msgstr ""
+msgstr "警告：根據檢討資料，介面「%2$s」的方法「%1$s」不存在\n"
 
-#: gio/gdbus-tool.c:530
+#: ../gio/gdbus-tool.c:530
 msgid "Destination name to invoke method on"
-msgstr ""
+msgstr "要呼叫方法的目的端名稱"
 
-#: gio/gdbus-tool.c:531
+#: ../gio/gdbus-tool.c:531
 msgid "Object path to invoke method on"
-msgstr ""
+msgstr "要呼叫方法的物件路徑"
 
-#: gio/gdbus-tool.c:532
+#: ../gio/gdbus-tool.c:532
 msgid "Method and interface name"
-msgstr ""
+msgstr "方法和介面名稱"
 
-#: gio/gdbus-tool.c:571
+#: ../gio/gdbus-tool.c:571
 msgid "Invoke a method on a remote object."
-msgstr ""
+msgstr "呼叫遠端物件的方法。"
 
-#: gio/gdbus-tool.c:626 gio/gdbus-tool.c:1243 gio/gdbus-tool.c:1495
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:626 ../gio/gdbus-tool.c:1245 ../gio/gdbus-tool.c:1504
+#, c-format
 msgid "Error connecting: %s\n"
-msgstr "連線錯誤：%s"
+msgstr "連線錯誤：%s\n"
 
-#: gio/gdbus-tool.c:646 gio/gdbus-tool.c:1262 gio/gdbus-tool.c:1514
+#: ../gio/gdbus-tool.c:646 ../gio/gdbus-tool.c:1264 ../gio/gdbus-tool.c:1523
 #, c-format
 msgid "Error: Destination is not specified\n"
-msgstr ""
+msgstr "錯誤：尚未指定目的端\n"
 
-#: gio/gdbus-tool.c:667 gio/gdbus-tool.c:1281
+#: ../gio/gdbus-tool.c:667 ../gio/gdbus-tool.c:1283
 #, c-format
 msgid "Error: Object path is not specified\n"
-msgstr ""
+msgstr "錯誤：沒有指定物件路徑\n"
 
-#: gio/gdbus-tool.c:687 gio/gdbus-tool.c:1301 gio/gdbus-tool.c:1554
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:687 ../gio/gdbus-tool.c:1303 ../gio/gdbus-tool.c:1563
+#, c-format
 msgid "Error: %s is not a valid object path\n"
-msgstr "「%s」不是一個有效的名稱"
+msgstr "錯誤：%s 不是有效的物件路徑\n"
 
-#: gio/gdbus-tool.c:702
+#: ../gio/gdbus-tool.c:702
 #, c-format
 msgid "Error: Method name is not specified\n"
-msgstr ""
+msgstr "錯誤：沒有指定方法名稱\n"
 
-#: gio/gdbus-tool.c:713
+#: ../gio/gdbus-tool.c:713
 #, c-format
 msgid "Error: Method name `%s' is invalid\n"
-msgstr ""
+msgstr "錯誤：方法名稱「%s」是無效的\n"
 
-#: gio/gdbus-tool.c:778
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:778
+#, c-format
 msgid "Error parsing parameter %d of type `%s': %s\n"
-msgstr "開啟目錄‘%s’時發生錯誤：%s"
+msgstr "解析類型「%2$s」的參數 %1$d 時發生錯誤：%3$s\n"
 
-#: gio/gdbus-tool.c:786
-#, fuzzy, c-format
+#: ../gio/gdbus-tool.c:786
+#, c-format
 msgid "Error parsing parameter %d: %s\n"
-msgstr "解析 %s 選項時發生錯誤"
+msgstr "解析參數 %d 時發生錯誤：%s\n"
 
-#: gio/gdbus-tool.c:1161
+#: ../gio/gdbus-tool.c:1162
+#, fuzzy
 msgid "Destination name to introspect"
-msgstr ""
+msgstr "用來識別本面板的名稱"
 
-#: gio/gdbus-tool.c:1162
+#: ../gio/gdbus-tool.c:1163
+#, fuzzy
 msgid "Object path to introspect"
-msgstr ""
+msgstr "「cvs」 指令的路徑"
 
-#: gio/gdbus-tool.c:1195
+#: ../gio/gdbus-tool.c:1164
+msgid "Print XML"
+msgstr "顯示 XML"
+
+#: ../gio/gdbus-tool.c:1197
+#, fuzzy
 msgid "Introspect a remote object."
-msgstr ""
+msgstr "讀出物件助記符(_K)"
 
-#: gio/gdbus-tool.c:1413
+#: ../gio/gdbus-tool.c:1422
 msgid "Destination name to monitor"
-msgstr ""
+msgstr "要監控的目的端名稱"
 
-#: gio/gdbus-tool.c:1414
+#: ../gio/gdbus-tool.c:1423
 msgid "Object path to monitor"
-msgstr ""
+msgstr "要監控的物件路徑"
 
-#: gio/gdbus-tool.c:1447
-#, fuzzy
+#: ../gio/gdbus-tool.c:1456
 msgid "Monitor a remote object."
-msgstr "損毀的物件"
+msgstr "監控遠端物件。"
 
-#: gio/gdesktopappinfo.c:468 gio/gwin32appinfo.c:222
+#: ../gio/gdesktopappinfo.c:467 ../gio/gwin32appinfo.c:221
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: gio/gdesktopappinfo.c:742
+#: ../gio/gdesktopappinfo.c:751
 msgid "Desktop file didn't specify Exec field"
 msgstr "桌面(Desktop)檔案未指定 Exec 欄位"
 
-#: gio/gdesktopappinfo.c:935
+#: ../gio/gdesktopappinfo.c:944
 msgid "Unable to find terminal required for application"
 msgstr "無法找到應用程式要求的終端機"
 
-#: gio/gdesktopappinfo.c:1144
+#: ../gio/gdesktopappinfo.c:1153
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "不能建立使用者應用程式組態資料夾 %s：%s"
 
-#: gio/gdesktopappinfo.c:1148
+#: ../gio/gdesktopappinfo.c:1157
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "不能建立使用者 MIME 組態資料夾 %s：%s"
 
-#: gio/gdesktopappinfo.c:1556
+#: ../gio/gdesktopappinfo.c:1565
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "不能建立使用者桌面檔案 %s"
 
-#: gio/gdesktopappinfo.c:1670
+#: ../gio/gdesktopappinfo.c:1679
 #, c-format
 msgid "Custom definition for %s"
 msgstr "自訂 %s 的定義"
 
-#: gio/gdrive.c:364
+#: ../gio/gdrive.c:363
 msgid "drive doesn't implement eject"
 msgstr "裝置無法實作退出功能(eject)"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gdrive.c:444
+#: ../gio/gdrive.c:443
 msgid "drive doesn't implement eject or eject_with_operation"
 msgstr "裝置無法實作退出功能(eject) 或 eject_with_operation"
 
-#: gio/gdrive.c:521
+#: ../gio/gdrive.c:520
 msgid "drive doesn't implement polling for media"
 msgstr "裝置無法實作媒體的輪詢"
 
-#: gio/gdrive.c:726
+#: ../gio/gdrive.c:725
 msgid "drive doesn't implement start"
 msgstr "裝置無法實作啟動功能(start)"
 
-#: gio/gdrive.c:828
+#: ../gio/gdrive.c:827
 msgid "drive doesn't implement stop"
 msgstr "裝置無法實作停止功能(stop)"
 
-#: gio/gemblem.c:325
+#: ../gio/gemblem.c:324
 #, c-format
 msgid "Can't handle version %d of GEmblem encoding"
 msgstr "不能處理版本為 %d 的 GEmblem 編碼"
 
-#: gio/gemblem.c:335
+#: ../gio/gemblem.c:334
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "GEmblem 編碼中記號 (%d) 的數量格式不正確"
 
-#: gio/gemblemedicon.c:296
+#: ../gio/gemblemedicon.c:295
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr "不能處理版本為 %d 的 GEmblemedIcon 編碼"
 
-#: gio/gemblemedicon.c:306
+#: ../gio/gemblemedicon.c:305
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "GEmblemedIcon 編碼中記號 (%d) 的數量格式不正確"
 
-#: gio/gemblemedicon.c:329
+#: ../gio/gemblemedicon.c:328
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "預期為 GEmblemedIcon 的 GEmblem"
 
-#: gio/gfile.c:871 gio/gfile.c:1101 gio/gfile.c:1236 gio/gfile.c:1472
-#: gio/gfile.c:1526 gio/gfile.c:1583 gio/gfile.c:1666 gio/gfile.c:1721
-#: gio/gfile.c:1781 gio/gfile.c:1835 gio/gfile.c:3304 gio/gfile.c:3358
-#: gio/gfile.c:3490 gio/gfile.c:3530 gio/gfile.c:3857 gio/gfile.c:4259
-#: gio/gfile.c:4345 gio/gfile.c:4434 gio/gfile.c:4532 gio/gfile.c:4619
-#: gio/gfile.c:4712 gio/gfile.c:5042 gio/gfile.c:5322 gio/gfile.c:5391
-#: gio/gfile.c:6982 gio/gfile.c:7072 gio/gfile.c:7158
-#: gio/win32/gwinhttpfile.c:441
+#: ../gio/gfile.c:870 ../gio/gfile.c:1100 ../gio/gfile.c:1235
+#: ../gio/gfile.c:1471 ../gio/gfile.c:1525 ../gio/gfile.c:1582
+#: ../gio/gfile.c:1665 ../gio/gfile.c:1720 ../gio/gfile.c:1780
+#: ../gio/gfile.c:1834 ../gio/gfile.c:3304 ../gio/gfile.c:3358
+#: ../gio/gfile.c:3490 ../gio/gfile.c:3530 ../gio/gfile.c:3857
+#: ../gio/gfile.c:4259 ../gio/gfile.c:4345 ../gio/gfile.c:4434
+#: ../gio/gfile.c:4532 ../gio/gfile.c:4619 ../gio/gfile.c:4712
+#: ../gio/gfile.c:5042 ../gio/gfile.c:5322 ../gio/gfile.c:5391
+#: ../gio/gfile.c:6982 ../gio/gfile.c:7072 ../gio/gfile.c:7158
+#: ../gio/win32/gwinhttpfile.c:439
 msgid "Operation not supported"
 msgstr "不支援的操作"
 
@@ -1829,137 +1896,137 @@ msgstr "不支援的操作"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: gio/gfile.c:1357 gio/glocalfile.c:1060 gio/glocalfile.c:1071
-#: gio/glocalfile.c:1084
+#: ../gio/gfile.c:1356 ../gio/glocalfile.c:1059 ../gio/glocalfile.c:1070
+#: ../gio/glocalfile.c:1083
 msgid "Containing mount does not exist"
 msgstr "包含了不存在的掛載點"
 
-#: gio/gfile.c:2409 gio/glocalfile.c:2259
+#: ../gio/gfile.c:2408 ../gio/glocalfile.c:2258
 msgid "Can't copy over directory"
 msgstr "不能複製整個目錄"
 
-#: gio/gfile.c:2469
+#: ../gio/gfile.c:2469
 msgid "Can't copy directory over directory"
 msgstr "不能將目錄複製到目錄上"
 
-#: gio/gfile.c:2477 gio/glocalfile.c:2268
+#: ../gio/gfile.c:2477 ../gio/glocalfile.c:2267
 msgid "Target file exists"
 msgstr "目標檔案已存在"
 
-#: gio/gfile.c:2495
+#: ../gio/gfile.c:2495
 msgid "Can't recursively copy directory"
 msgstr "不能遞廻複製目錄"
 
-#: gio/gfile.c:2755
+#: ../gio/gfile.c:2755
 msgid "Splice not supported"
 msgstr "不支援拼接"
 
-#: gio/gfile.c:2759
+#: ../gio/gfile.c:2759
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "拼接檔案時發生錯誤：%s"
 
-#: gio/gfile.c:2906
+#: ../gio/gfile.c:2906
 msgid "Can't copy special file"
 msgstr "不能複製特殊的檔案"
 
-#: gio/gfile.c:3480
+#: ../gio/gfile.c:3480
 msgid "Invalid symlink value given"
 msgstr "提供了無效的符號連結值"
 
-#: gio/gfile.c:3573
+#: ../gio/gfile.c:3573
 msgid "Trash not supported"
 msgstr "不支援回收筒"
 
-#: gio/gfile.c:3622
+#: ../gio/gfile.c:3622
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "檔案名稱不能包含「%c」"
 
-#: gio/gfile.c:6039 gio/gvolume.c:331
+#: ../gio/gfile.c:6039 ../gio/gvolume.c:330
 msgid "volume doesn't implement mount"
 msgstr "儲存區尚未實作掛載功能"
 
-#: gio/gfile.c:6150
+#: ../gio/gfile.c:6150
 msgid "No application is registered as handling this file"
 msgstr "沒有應用程式註冊為用以處理這個檔案"
 
-#: gio/gfileenumerator.c:206
+#: ../gio/gfileenumerator.c:205
 msgid "Enumerator is closed"
 msgstr "檔案列舉器(enumerator)已關閉"
 
-#: gio/gfileenumerator.c:213 gio/gfileenumerator.c:272
-#: gio/gfileenumerator.c:372 gio/gfileenumerator.c:481
+#: ../gio/gfileenumerator.c:212 ../gio/gfileenumerator.c:271
+#: ../gio/gfileenumerator.c:371 ../gio/gfileenumerator.c:480
 msgid "File enumerator has outstanding operation"
 msgstr "檔案列舉器(enumerator)有異常操作"
 
-#: gio/gfileenumerator.c:362 gio/gfileenumerator.c:471
+#: ../gio/gfileenumerator.c:361 ../gio/gfileenumerator.c:470
 msgid "File enumerator is already closed"
 msgstr "檔案列舉器(enumerator)已經關閉"
 
-#: gio/gfileicon.c:237
+#: ../gio/gfileicon.c:236
 #, c-format
 msgid "Can't handle version %d of GFileIcon encoding"
 msgstr "不能處理版本為 %d 的 GFileIcon 編碼"
 
-#: gio/gfileicon.c:247
+#: ../gio/gfileicon.c:246
 msgid "Malformed input data for GFileIcon"
 msgstr "給 GFileIcon 的輸入資料格式不良"
 
-#: gio/gfileinputstream.c:155 gio/gfileinputstream.c:422
-#: gio/gfileiostream.c:171 gio/gfileoutputstream.c:170
-#: gio/gfileoutputstream.c:525
+#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:421
+#: ../gio/gfileiostream.c:170 ../gio/gfileoutputstream.c:169
+#: ../gio/gfileoutputstream.c:524
 msgid "Stream doesn't support query_info"
 msgstr "串流不支援 query_info"
 
-#: gio/gfileinputstream.c:337 gio/gfileiostream.c:389
-#: gio/gfileoutputstream.c:383
+#: ../gio/gfileinputstream.c:336 ../gio/gfileiostream.c:388
+#: ../gio/gfileoutputstream.c:382
 msgid "Seek not supported on stream"
 msgstr "不支援在串流中搜尋"
 
-#: gio/gfileinputstream.c:381
+#: ../gio/gfileinputstream.c:380
 msgid "Truncate not allowed on input stream"
 msgstr "在輸入串流中不允許截短(truncate)"
 
-#: gio/gfileiostream.c:465 gio/gfileoutputstream.c:459
+#: ../gio/gfileiostream.c:464 ../gio/gfileoutputstream.c:458
 msgid "Truncate not supported on stream"
 msgstr "在串流中不支援截短(truncate)"
 
-#: gio/gicon.c:286
+#: ../gio/gicon.c:285
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "記號數量 (%d) 錯誤"
 
-#: gio/gicon.c:306
+#: ../gio/gicon.c:305
 #, c-format
 msgid "No type for class name %s"
 msgstr "類別名稱 %s 沒有類型"
 
-#: gio/gicon.c:316
+#: ../gio/gicon.c:315
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "類型 %s 沒有實作 GIcon 介面"
 
-#: gio/gicon.c:327
+#: ../gio/gicon.c:326
 #, c-format
 msgid "Type %s is not classed"
 msgstr "類型 %s 尚未歸類"
 
-#: gio/gicon.c:341
+#: ../gio/gicon.c:340
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "格式不良的版本號碼：%s"
 
-#: gio/gicon.c:355
+#: ../gio/gicon.c:354
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "類型 %s 沒有實作 GIcon 介面的 from_tokens()"
 
-#: gio/gicon.c:431
+#: ../gio/gicon.c:430
 msgid "Can't handle the supplied version the icon encoding"
 msgstr "不能處理提供的圖示編碼版本"
 
-#: gio/ginputstream.c:195
+#: ../gio/ginputstream.c:194
 msgid "Input stream doesn't implement read"
 msgstr "輸入串流尚未實作讀取"
 
@@ -1969,461 +2036,474 @@ msgstr "輸入串流尚未實作讀取"
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: gio/ginputstream.c:902 gio/giostream.c:315 gio/goutputstream.c:1206
+#: ../gio/ginputstream.c:901 ../gio/giostream.c:314
+#: ../gio/goutputstream.c:1205
 msgid "Stream has outstanding operation"
 msgstr "串流有異常操作"
 
-#: gio/ginetsocketaddress.c:182 gio/ginetsocketaddress.c:199
-#: gio/gunixsocketaddress.c:222
+#: ../gio/ginetsocketaddress.c:181 ../gio/ginetsocketaddress.c:198
+#: ../gio/gunixsocketaddress.c:221
 msgid "Not enough space for socket address"
 msgstr "socket 位址沒有足夠的空間"
 
-#: gio/ginetsocketaddress.c:212
+#: ../gio/ginetsocketaddress.c:211
 msgid "Unsupported socket address"
 msgstr "不支援的 socket 位址"
 
-#: gio/glocaldirectorymonitor.c:288
+#: ../gio/glocaldirectorymonitor.c:287
 msgid "Unable to find default local directory monitor type"
 msgstr "無法找到預設的本地端目錄監視器類型"
 
-#: gio/glocalfile.c:594 gio/win32/gwinhttpfile.c:424
+#: ../gio/glocalfile.c:593 ../gio/win32/gwinhttpfile.c:422
 #, c-format
 msgid "Invalid filename %s"
 msgstr "無效的檔案名稱 %s"
 
-#: gio/glocalfile.c:968
+#: ../gio/glocalfile.c:967
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "取得檔案系統資訊時發生錯誤：%s"
 
-#: gio/glocalfile.c:1106
+#: ../gio/glocalfile.c:1105
 msgid "Can't rename root directory"
 msgstr "不能重新命名根目錄"
 
-#: gio/glocalfile.c:1126 gio/glocalfile.c:1152
+#: ../gio/glocalfile.c:1125 ../gio/glocalfile.c:1151
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "重新命名檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1135
+#: ../gio/glocalfile.c:1134
 msgid "Can't rename file, filename already exist"
 msgstr "不能重新命名檔案，該檔案名稱已存在"
 
-#: gio/glocalfile.c:1148 gio/glocalfile.c:2132 gio/glocalfile.c:2161
-#: gio/glocalfile.c:2321 gio/glocalfileoutputstream.c:570
-#: gio/glocalfileoutputstream.c:623 gio/glocalfileoutputstream.c:668
-#: gio/glocalfileoutputstream.c:1150
+#: ../gio/glocalfile.c:1147 ../gio/glocalfile.c:2131 ../gio/glocalfile.c:2160
+#: ../gio/glocalfile.c:2320 ../gio/glocalfileoutputstream.c:571
+#: ../gio/glocalfileoutputstream.c:624 ../gio/glocalfileoutputstream.c:669
+#: ../gio/glocalfileoutputstream.c:1151
 msgid "Invalid filename"
 msgstr "無效的檔案名稱"
 
-#: gio/glocalfile.c:1309
+#: ../gio/glocalfile.c:1308
 #, c-format
 msgid "Error opening file: %s"
 msgstr "開啓檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1319
+#: ../gio/glocalfile.c:1318
 msgid "Can't open directory"
 msgstr "不能開啟目錄"
 
-#: gio/glocalfile.c:1444
+#: ../gio/glocalfile.c:1443
 #, c-format
 msgid "Error removing file: %s"
 msgstr "移除檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:1811
+#: ../gio/glocalfile.c:1810
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "移動檔案至回收筒時發生錯誤：%s"
 
-#: gio/glocalfile.c:1834
+#: ../gio/glocalfile.c:1833
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "無法建立回收筒目錄 %s：%s"
 
-#: gio/glocalfile.c:1855
+#: ../gio/glocalfile.c:1854
 msgid "Unable to find toplevel directory for trash"
 msgstr "無法找到回收筒的頂端層級目錄"
 
-#: gio/glocalfile.c:1934 gio/glocalfile.c:1954
+#: ../gio/glocalfile.c:1933 ../gio/glocalfile.c:1953
 msgid "Unable to find or create trash directory"
 msgstr "無法找到或建立回收筒目錄"
 
-#: gio/glocalfile.c:1988
+#: ../gio/glocalfile.c:1987
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "無法建立回收筒資訊檔案：%s"
 
-#: gio/glocalfile.c:2017 gio/glocalfile.c:2022 gio/glocalfile.c:2102
-#: gio/glocalfile.c:2109
+#: ../gio/glocalfile.c:2016 ../gio/glocalfile.c:2021 ../gio/glocalfile.c:2101
+#: ../gio/glocalfile.c:2108
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "無法將檔案移至回收筒：%s"
 
-#: gio/glocalfile.c:2136
+#: ../gio/glocalfile.c:2135
 #, c-format
 msgid "Error creating directory: %s"
 msgstr "建立目錄發生錯誤：%s"
 
-#: gio/glocalfile.c:2165
+#: ../gio/glocalfile.c:2164
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "檔案系統不支援符號連結"
 
-#: gio/glocalfile.c:2169
+#: ../gio/glocalfile.c:2168
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "建立符號連結時發生錯誤：%s"
 
-#: gio/glocalfile.c:2231 gio/glocalfile.c:2325
+#: ../gio/glocalfile.c:2230 ../gio/glocalfile.c:2324
 #, c-format
 msgid "Error moving file: %s"
 msgstr "移動檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:2254
+#: ../gio/glocalfile.c:2253
 msgid "Can't move directory over directory"
 msgstr "不能將目錄移動至目錄上"
 
-#: gio/glocalfile.c:2281 gio/glocalfileoutputstream.c:948
-#: gio/glocalfileoutputstream.c:962 gio/glocalfileoutputstream.c:977
-#: gio/glocalfileoutputstream.c:993 gio/glocalfileoutputstream.c:1007
+#: ../gio/glocalfile.c:2280 ../gio/glocalfileoutputstream.c:949
+#: ../gio/glocalfileoutputstream.c:963 ../gio/glocalfileoutputstream.c:978
+#: ../gio/glocalfileoutputstream.c:994 ../gio/glocalfileoutputstream.c:1008
 msgid "Backup file creation failed"
 msgstr "建立備份檔案失敗"
 
-#: gio/glocalfile.c:2300
+#: ../gio/glocalfile.c:2299
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目標檔案時發生錯誤：%s"
 
-#: gio/glocalfile.c:2314
+#: ../gio/glocalfile.c:2313
 msgid "Move between mounts not supported"
 msgstr "不支援在掛載點之間移動"
 
-#: gio/glocalfileinfo.c:721
+#: ../gio/glocalfileinfo.c:720
 msgid "Attribute value must be non-NULL"
 msgstr "屬性數值必須為非-NULL"
 
-#: gio/glocalfileinfo.c:728
+#: ../gio/glocalfileinfo.c:727
 msgid "Invalid attribute type (string expected)"
 msgstr "無效的屬性類型（應為字串值）"
 
-#: gio/glocalfileinfo.c:735
+#: ../gio/glocalfileinfo.c:734
 msgid "Invalid extended attribute name"
 msgstr "無效的延伸屬性名稱"
 
-#: gio/glocalfileinfo.c:775
+#: ../gio/glocalfileinfo.c:774
 #, c-format
 msgid "Error setting extended attribute '%s': %s"
 msgstr "設定延伸屬性「%s」時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1479 gio/glocalfileoutputstream.c:832
+#: ../gio/glocalfileinfo.c:1483 ../gio/glocalfileoutputstream.c:833
 #, c-format
 msgid "Error stating file '%s': %s"
 msgstr "取得檔案「%s」狀態時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1552
+#: ../gio/glocalfileinfo.c:1567
 msgid " (invalid encoding)"
 msgstr "（無效的編碼）"
 
-#: gio/glocalfileinfo.c:1750
+#: ../gio/glocalfileinfo.c:1769
 #, c-format
 msgid "Error stating file descriptor: %s"
 msgstr "取得檔案描述狀態時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1795
+#: ../gio/glocalfileinfo.c:1814
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "無效的屬性類型（應為 uint32 值）"
 
-#: gio/glocalfileinfo.c:1813
+#: ../gio/glocalfileinfo.c:1832
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "無效的屬性類型（應為 uint64 值）"
 
-#: gio/glocalfileinfo.c:1832 gio/glocalfileinfo.c:1851
+#: ../gio/glocalfileinfo.c:1851 ../gio/glocalfileinfo.c:1870
 msgid "Invalid attribute type (byte string expected)"
 msgstr "無效的屬性類型（應為 byte string 值）"
 
-#: gio/glocalfileinfo.c:1886
+#: ../gio/glocalfileinfo.c:1905
 msgid "Cannot set permissions on symlinks"
 msgstr "不能設定符號連結的權限"
 
-#: gio/glocalfileinfo.c:1902
+#: ../gio/glocalfileinfo.c:1921
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "設定權限時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1953
+#: ../gio/glocalfileinfo.c:1972
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "設定擁有者時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1976
+#: ../gio/glocalfileinfo.c:1995
 msgid "symlink must be non-NULL"
 msgstr "符號連結必須為非-NULL"
 
-#: gio/glocalfileinfo.c:1986 gio/glocalfileinfo.c:2005
-#: gio/glocalfileinfo.c:2016
+#: ../gio/glocalfileinfo.c:2005 ../gio/glocalfileinfo.c:2024
+#: ../gio/glocalfileinfo.c:2035
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "設定符號連結時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:1995
+#: ../gio/glocalfileinfo.c:2014
 msgid "Error setting symlink: file is not a symlink"
 msgstr "設定符號連結時發生錯誤：檔案不是符號連結"
 
-#: gio/glocalfileinfo.c:2121
+#: ../gio/glocalfileinfo.c:2140
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "設定修改或存取時刻時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:2144
+#: ../gio/glocalfileinfo.c:2163
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux 關聯必須為非-NULL"
 
-#: gio/glocalfileinfo.c:2159
+#: ../gio/glocalfileinfo.c:2178
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "設定 SELinux 關聯時發生錯誤：%s"
 
-#: gio/glocalfileinfo.c:2166
+#: ../gio/glocalfileinfo.c:2185
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux 在這個系統上並未啟用"
 
-#: gio/glocalfileinfo.c:2258
+#: ../gio/glocalfileinfo.c:2277
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "不支援設定屬性 %s"
 
-#: gio/glocalfileinputstream.c:184 gio/glocalfileoutputstream.c:721
+#: ../gio/glocalfileinputstream.c:185 ../gio/glocalfileoutputstream.c:722
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "從檔案讀取時發生錯誤：%s"
 
-#: gio/glocalfileinputstream.c:215 gio/glocalfileinputstream.c:227
-#: gio/glocalfileinputstream.c:339 gio/glocalfileoutputstream.c:469
-#: gio/glocalfileoutputstream.c:1025
+#: ../gio/glocalfileinputstream.c:216 ../gio/glocalfileinputstream.c:228
+#: ../gio/glocalfileinputstream.c:340 ../gio/glocalfileoutputstream.c:470
+#: ../gio/glocalfileoutputstream.c:1026
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "在檔案中搜尋時發生錯誤：%s"
 
-#: gio/glocalfileinputstream.c:260 gio/glocalfileoutputstream.c:255
-#: gio/glocalfileoutputstream.c:350
+#: ../gio/glocalfileinputstream.c:261 ../gio/glocalfileoutputstream.c:256
+#: ../gio/glocalfileoutputstream.c:351
 #, c-format
 msgid "Error closing file: %s"
 msgstr "關閉檔案時發生錯誤：%s"
 
-#: gio/glocalfilemonitor.c:213
+#: ../gio/glocalfilemonitor.c:212
 msgid "Unable to find default local file monitor type"
 msgstr "無法找到預設的本地端檔案監視器類型"
 
-#: gio/glocalfileoutputstream.c:201 gio/glocalfileoutputstream.c:234
-#: gio/glocalfileoutputstream.c:742
+#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:235
+#: ../gio/glocalfileoutputstream.c:743
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "寫入至檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:282
+#: ../gio/glocalfileoutputstream.c:283
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "移除舊備份連結時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:296 gio/glocalfileoutputstream.c:309
+#: ../gio/glocalfileoutputstream.c:297 ../gio/glocalfileoutputstream.c:310
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "建立備份複本時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:327
+#: ../gio/glocalfileoutputstream.c:328
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "重新命名暫存檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:515 gio/glocalfileoutputstream.c:1076
+#: ../gio/glocalfileoutputstream.c:516 ../gio/glocalfileoutputstream.c:1077
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "截短檔案時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:576 gio/glocalfileoutputstream.c:629
-#: gio/glocalfileoutputstream.c:674 gio/glocalfileoutputstream.c:814
-#: gio/glocalfileoutputstream.c:1057 gio/glocalfileoutputstream.c:1156
+#: ../gio/glocalfileoutputstream.c:577 ../gio/glocalfileoutputstream.c:630
+#: ../gio/glocalfileoutputstream.c:675 ../gio/glocalfileoutputstream.c:815
+#: ../gio/glocalfileoutputstream.c:1058 ../gio/glocalfileoutputstream.c:1157
 #, c-format
 msgid "Error opening file '%s': %s"
 msgstr "開啟檔案「%s」時發生錯誤：%s"
 
-#: gio/glocalfileoutputstream.c:845
+#: ../gio/glocalfileoutputstream.c:846
 msgid "Target file is a directory"
 msgstr "目標檔案是一個目錄"
 
-#: gio/glocalfileoutputstream.c:850
+#: ../gio/glocalfileoutputstream.c:851
 msgid "Target file is not a regular file"
 msgstr "目標檔案不是正規的檔案"
 
-#: gio/glocalfileoutputstream.c:862
+#: ../gio/glocalfileoutputstream.c:863
 msgid "The file was externally modified"
 msgstr "該檔案已被外部程式修改過"
 
-#: gio/glocalfileoutputstream.c:1041
+#: ../gio/glocalfileoutputstream.c:1042
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "移除舊檔案時發生錯誤：%s"
 
-#: gio/gmemoryinputstream.c:487 gio/gmemoryoutputstream.c:718
+#: ../gio/gmemoryinputstream.c:486 ../gio/gmemoryoutputstream.c:717
 msgid "Invalid GSeekType supplied"
 msgstr "提供了無效的 GSeek 類型"
 
-#: gio/gmemoryinputstream.c:497
+#: ../gio/gmemoryinputstream.c:496
 msgid "Invalid seek request"
 msgstr "無效的搜尋要求"
 
-#: gio/gmemoryinputstream.c:521
+#: ../gio/gmemoryinputstream.c:520
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "不能截短 GMemoryInputStream"
 
-#: gio/gmemoryoutputstream.c:468
+#: ../gio/gmemoryoutputstream.c:467
 msgid "Memory output stream not resizable"
 msgstr "記憶體輸出串流不能改變大小"
 
-#: gio/gmemoryoutputstream.c:484
+#: ../gio/gmemoryoutputstream.c:483
 msgid "Failed to resize memory output stream"
 msgstr "改變記憶體輸出串流的大小失敗"
 
-#: gio/gmemoryoutputstream.c:572
+#: ../gio/gmemoryoutputstream.c:571
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
 msgstr "進行寫入所需的記憶體總額大於可用的位址空間"
 
-#: gio/gmemoryoutputstream.c:728
+#: ../gio/gmemoryoutputstream.c:727
 msgid "Requested seek before the beginning of the stream"
 msgstr "在串流的開頭之前要求的搜索"
 
-#: gio/gmemoryoutputstream.c:737
+#: ../gio/gmemoryoutputstream.c:736
 msgid "Requested seek beyond the end of the stream"
 msgstr "在串流的開頭之後要求的搜索"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: gio/gmount.c:364
+#: ../gio/gmount.c:363
 msgid "mount doesn't implement \"unmount\""
 msgstr "掛載點尚未實作卸載(umount)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: gio/gmount.c:443
+#: ../gio/gmount.c:442
 msgid "mount doesn't implement \"eject\""
 msgstr "掛載點尚未實作退出(eject)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: gio/gmount.c:523
+#: ../gio/gmount.c:522
 msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
 msgstr "掛載點尚未實作卸載(umount)或「umount_with_operation」"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gmount.c:610
+#: ../gio/gmount.c:609
 msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
 msgstr "掛載點尚未實作退出(eject)或「eject_with_operation」"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: gio/gmount.c:699
+#: ../gio/gmount.c:698
 msgid "mount doesn't implement \"remount\""
 msgstr "掛載點尚未實作重新掛載(remount)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:783
+#: ../gio/gmount.c:782
 msgid "mount doesn't implement content type guessing"
 msgstr "掛載點尚未實作內容類型預測"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:872
+#: ../gio/gmount.c:871
 msgid "mount doesn't implement synchronous content type guessing"
 msgstr "掛載點尚未實作同步內容類型預測"
 
-#: gio/gnetworkaddress.c:295
+#: ../gio/gnetworkaddress.c:294
 #, c-format
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主機名稱「%s」含有 '[' but not ']'"
 
-#: gio/goutputstream.c:207 gio/goutputstream.c:408
+#: ../gio/goutputstream.c:206 ../gio/goutputstream.c:407
 msgid "Output stream doesn't implement write"
 msgstr "輸出串流尚未實作寫入"
 
-#: gio/goutputstream.c:369 gio/goutputstream.c:845
+#: ../gio/goutputstream.c:368 ../gio/goutputstream.c:844
 msgid "Source stream is already closed"
 msgstr "來源串流已經關閉"
 
-#: gio/gresolver.c:736
+#: ../gio/gresolver.c:735
 #, c-format
 msgid "Error resolving '%s': %s"
 msgstr "解析「%s」時發生錯誤：%s"
 
-#: gio/gresolver.c:786
+#: ../gio/gresolver.c:785
 #, c-format
 msgid "Error reverse-resolving '%s': %s"
 msgstr "反向解析「%s」時發生錯誤：%s"
 
-#: gio/gresolver.c:821 gio/gresolver.c:899
+#: ../gio/gresolver.c:820 ../gio/gresolver.c:898
 #, c-format
 msgid "No service record for '%s'"
 msgstr "沒有「%s」的服務紀錄"
 
-#: gio/gresolver.c:826 gio/gresolver.c:904
+#: ../gio/gresolver.c:825 ../gio/gresolver.c:903
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr "暫時無法解析「%s」"
 
-#: gio/gresolver.c:831 gio/gresolver.c:909
+#: ../gio/gresolver.c:830 ../gio/gresolver.c:908
 #, c-format
 msgid "Error resolving '%s'"
 msgstr "解析「%s」時發生錯誤"
 
-#: gio/gschema-compile.c:659
+#: ../gio/gschema-compile.c:1632
 msgid "where to store the gschemas.compiled file"
-msgstr ""
+msgstr "要將 gschemas.compiled 檔案儲存到哪裡"
 
-#: gio/gschema-compile.c:659 gio/gschema-compile.c:671
+#: ../gio/gschema-compile.c:1632 ../gio/gschema-compile.c:1644
 msgid "DIRECTORY"
-msgstr ""
+msgstr "目錄"
 
-#: gio/gschema-compile.c:660
+#: ../gio/gschema-compile.c:1633
 msgid "Do not write the gschema.compiled file"
-msgstr ""
+msgstr "不要寫入 gschemas.compiled 檔案"
 
-#: gio/gschema-compile.c:661
-#, fuzzy
-msgid "Do not give error for empty directory"
-msgstr "不能將目錄移動至目錄上"
+#: ../gio/gschema-compile.c:1634
+msgid "This option will be removed soon."
+msgstr "這個選項很快會被移除。"
 
-#: gio/gschema-compile.c:662
+#: ../gio/gschema-compile.c:1635
 msgid "Do not enforce key name restrictions"
-msgstr ""
+msgstr "不要強制設定鍵名稱限制"
 
-#: gio/gschema-compile.c:674
+#: ../gio/gschema-compile.c:1647
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
 "and the cache file is called gschemas.compiled."
 msgstr ""
+"將所有的 GSettings schema 檔案編譯為 schema 快取。\n"
+"Schema 檔案的延伸檔名必須為 .gschema.xml，\n"
+"而快取檔案叫做 gschemas.compiled。"
 
-#: gio/gschema-compile.c:690
+#: ../gio/gschema-compile.c:1663
 #, c-format
 msgid "You should give exactly one directory name\n"
-msgstr ""
+msgstr "您應該明確指定一個目錄名稱\n"
 
-#: gio/gschema-compile.c:729
+#: ../gio/gschema-compile.c:1696
 #, c-format
-msgid "No schema files found\n"
-msgstr ""
+msgid "No schema files found: "
+msgstr "找不到 schema 檔案："
+
+#: ../gio/gschema-compile.c:1699
+#, c-format
+msgid "doing nothing.\n"
+msgstr "不做任何事。\n"
 
-#: gio/gsettings-tool.c:41
+#: ../gio/gschema-compile.c:1702
+#, c-format
+msgid "removed existing output file.\n"
+msgstr "移除現有的輸出檔案。\n"
+
+#: ../gio/gsettings-tool.c:79
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2435,41 +2515,54 @@ msgid ""
 "\n"
 "Use '%s COMMAND --help' to get help for individual commands.\n"
 msgstr ""
+"指令：\n"
+"  help        顯示這個資訊\n"
+"  get         取得設定鍵的數值\n"
+"  set         設定設定鍵的數值\n"
+"  monitor     監控設定鍵的變更\n"
+"  writable    檢查設定鍵是否可寫入\n"
+"\n"
+"使用「%s COMMAND --help」取得個別指令的求助文件。\n"
 
-#: gio/gsettings-tool.c:102 gio/gsettings-tool.c:161 gio/gsettings-tool.c:252
-#: gio/gsettings-tool.c:325
+#: ../gio/gsettings-tool.c:221 ../gio/gsettings-tool.c:321
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:549
 msgid "Specify the path for the schema"
-msgstr ""
+msgstr "指定 schema 的路徑"
 
-#: gio/gsettings-tool.c:102 gio/gsettings-tool.c:161 gio/gsettings-tool.c:252
-#: gio/gsettings-tool.c:325
+#: ../gio/gsettings-tool.c:221 ../gio/gsettings-tool.c:321
+#: ../gio/gsettings-tool.c:436 ../gio/gsettings-tool.c:549
 msgid "PATH"
-msgstr ""
+msgstr "路徑"
 
-#: gio/gsettings-tool.c:110 gio/gsettings-tool.c:260 gio/gsettings-tool.c:333
+#: ../gio/gsettings-tool.c:229 ../gio/gsettings-tool.c:444
+#: ../gio/gsettings-tool.c:557
 msgid "SCHEMA KEY"
-msgstr ""
+msgstr "SCHEMA 設定鍵"
 
-#: gio/gsettings-tool.c:112
+#: ../gio/gsettings-tool.c:231
 msgid "Get the value of KEY"
-msgstr ""
+msgstr "取得 KEY 的數值"
 
-#: gio/gsettings-tool.c:114 gio/gsettings-tool.c:264 gio/gsettings-tool.c:340
+#: ../gio/gsettings-tool.c:233 ../gio/gsettings-tool.c:448
+#: ../gio/gsettings-tool.c:564
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
 "  KEY         The name of the key\n"
 msgstr ""
+"引數：\n"
+"  SCHEMA      這個 schema 的 id\n"
+"  KEY         設定鍵的名稱\n"
 
-#: gio/gsettings-tool.c:169
+#: ../gio/gsettings-tool.c:329
 msgid "SCHEMA KEY VALUE"
-msgstr ""
+msgstr "SCHEMA 設定鍵數值"
 
-#: gio/gsettings-tool.c:171
+#: ../gio/gsettings-tool.c:331
 msgid "Set the value of KEY"
-msgstr ""
+msgstr "設定 KEY 的數值"
 
-#: gio/gsettings-tool.c:173
+#: ../gio/gsettings-tool.c:333
 msgid ""
 "Arguments:\n"
 "  SCHEMA      The id of the schema\n"
@@ -2477,285 +2570,292 @@ msgid ""
 "  VALUE       The value to set key to, as a serialized GVariant\n"
 msgstr ""
 
-#: gio/gsettings-tool.c:212
-#, fuzzy, c-format
+#: ../gio/gsettings-tool.c:406
+#, c-format
 msgid "Key %s is not writable\n"
-msgstr "類型 %s 尚未歸類"
+msgstr "設定鍵 %s 無法寫入\n"
 
-#: gio/gsettings-tool.c:262
+#: ../gio/gsettings-tool.c:446
 msgid "Find out whether KEY is writable"
-msgstr ""
+msgstr "找出 KEY 是否可寫入"
 
-#: gio/gsettings-tool.c:336
+#: ../gio/gsettings-tool.c:560
 msgid ""
 "Monitor KEY for changes and print the changed values.\n"
 "Monitoring will continue until the process is terminated."
 msgstr ""
+"監控 KEY 的變更並顯示變更後的數值。\n"
+"監控會持續到程序中止為止。"
 
-#: gio/gsettings-tool.c:399
-#, fuzzy, c-format
+#: ../gio/gsettings-tool.c:733
+#, c-format
 msgid "Unknown command '%s'\n"
-msgstr "未知的選項 %s"
+msgstr "不明指令「%s」\n"
 
-#: gio/gsocket.c:275
+#: ../gio/gsocket.c:274
 msgid "Invalid socket, not initialized"
 msgstr "無效的 socket，尚未初始化"
 
-#: gio/gsocket.c:282
+#: ../gio/gsocket.c:281
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "無效的 socket，初始化失敗原因為：%s"
 
-#: gio/gsocket.c:290
+#: ../gio/gsocket.c:289
 msgid "Socket is already closed"
 msgstr "Socket 已經關閉"
 
-#: gio/gsocket.c:298 gio/gsocket.c:2609 gio/gsocket.c:2653
+#: ../gio/gsocket.c:297 ../gio/gsocket.c:2617 ../gio/gsocket.c:2661
 msgid "Socket I/O timed out"
-msgstr ""
+msgstr "Socket I/O 逾時"
 
-#: gio/gsocket.c:420
+#: ../gio/gsocket.c:419
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "正在從 fd 建立 GSocket：%s"
 
-#: gio/gsocket.c:454 gio/gsocket.c:468 gio/gsocket.c:2020
+#: ../gio/gsocket.c:453 ../gio/gsocket.c:467 ../gio/gsocket.c:2019
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "無法建立 socket：%s"
 
-#: gio/gsocket.c:454
+#: ../gio/gsocket.c:453
 msgid "Unknown protocol was specified"
 msgstr "指定了不明的通訊協定"
 
-#: gio/gsocket.c:1218
+#: ../gio/gsocket.c:1217
 #, c-format
 msgid "could not get local address: %s"
 msgstr "無法取得本地端位址：%s"
 
-#: gio/gsocket.c:1251
+#: ../gio/gsocket.c:1250
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "無法取得遠端位址：%s"
 
-#: gio/gsocket.c:1309
+#: ../gio/gsocket.c:1308
 #, c-format
 msgid "could not listen: %s"
 msgstr "無法聽取：%s"
 
-#: gio/gsocket.c:1383
+#: ../gio/gsocket.c:1382
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "綁定至位址時發生錯誤：%s"
 
-#: gio/gsocket.c:1503
+#: ../gio/gsocket.c:1502
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "接受連線時發生錯誤：%s"
 
-#: gio/gsocket.c:1616
+#: ../gio/gsocket.c:1615
 msgid "Error connecting: "
 msgstr "連線錯誤："
 
-#: gio/gsocket.c:1620
+#: ../gio/gsocket.c:1619
 msgid "Connection in progress"
 msgstr "連線進行中"
 
-#: gio/gsocket.c:1625
+#: ../gio/gsocket.c:1624
 #, c-format
 msgid "Error connecting: %s"
 msgstr "連線錯誤：%s"
 
-#: gio/gsocket.c:1668
+#: ../gio/gsocket.c:1667
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "無法取得未處理的錯誤：%s"
 
-#: gio/gsocket.c:1764
+#: ../gio/gsocket.c:1763
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "接收資料時發生錯誤：%s"
 
-#: gio/gsocket.c:1907
+#: ../gio/gsocket.c:1906
 #, c-format
 msgid "Error sending data: %s"
 msgstr "傳送資料時發生錯誤：%s"
 
-#: gio/gsocket.c:2099
+#: ../gio/gsocket.c:2098
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "關閉 socket 時發生錯誤：%s"
 
-#: gio/gsocket.c:2602
+#: ../gio/gsocket.c:2610
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "等候 socket 情況：%s"
 
-#: gio/gsocket.c:2884
+#: ../gio/gsocket.c:2892
 msgid "GSocketControlMessage not supported on windows"
 msgstr "視窗不支援 GSocketControlMessage"
 
-#: gio/gsocket.c:3143 gio/gsocket.c:3284
+#: ../gio/gsocket.c:3151 ../gio/gsocket.c:3292
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "取回郵件發生錯誤：%s"
 
-#: gio/gsocketclient.c:521 gio/gsocketclient.c:770
+#: ../gio/gsocketclient.c:520 ../gio/gsocketclient.c:769
 msgid "Unknown error on connect"
 msgstr "連線時有不明的錯誤"
 
-#: gio/gsocketlistener.c:192
+#: ../gio/gsocketlistener.c:191
 msgid "Listener is already closed"
 msgstr "聽取程式已經關閉"
 
-#: gio/gsocketlistener.c:233
+#: ../gio/gsocketlistener.c:232
 msgid "Added socket is closed"
 msgstr "加入的 socket 已經關閉"
 
-#: gio/gthemedicon.c:499
+#: ../gio/gthemedicon.c:498
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "不能處理版本為 %d 的 GThemedIcon 編碼"
 
-#: gio/gunixconnection.c:165 gio/gunixconnection.c:502
+#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:501
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgstr "預期有 1 個控制訊息，卻收到 %d"
 
-#: gio/gunixconnection.c:178 gio/gunixconnection.c:512
+#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:511
 msgid "Unexpected type of ancillary data"
 msgstr "輔助資料的未預期類型"
 
-#: gio/gunixconnection.c:196
+#: ../gio/gunixconnection.c:195
 #, c-format
 msgid "Expecting one fd, but got %d\n"
 msgstr "預期有 1 個 fd，卻收到 %d\n"
 
-#: gio/gunixconnection.c:212
+#: ../gio/gunixconnection.c:211
 msgid "Received invalid fd"
 msgstr "收到無效的 fd"
 
-#: gio/gunixconnection.c:359
-#, fuzzy
+#: ../gio/gunixconnection.c:358
 msgid "Error sending credentials: "
-msgstr "傳送資料時發生錯誤：%s"
+msgstr "傳送憑證時發生錯誤："
 
-#: gio/gunixconnection.c:436
+#: ../gio/gunixconnection.c:435
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
-msgstr ""
+msgstr "檢查 SO_PASSCRED 在 socket 是否啟用時發生錯誤：%s"
 
-#: gio/gunixconnection.c:445
+#: ../gio/gunixconnection.c:444
 #, c-format
 msgid ""
 "Unexpected option length while checking if SO_PASSCRED is enabled for "
 "socket. Expected %d bytes, got %d"
 msgstr ""
+"檢查 SO_PASSCRED 在 socket 是否啟用時有未預期的選項長度。預期為 %d 位元組，得"
+"到 %d"
 
-#: gio/gunixconnection.c:462
-#, fuzzy, c-format
+#: ../gio/gunixconnection.c:461
+#, c-format
 msgid "Error enabling SO_PASSCRED: %s"
-msgstr "重新命名檔案時發生錯誤：%s"
+msgstr "啟用 SO_PASSCRED 時發生錯誤：%s"
 
-#: gio/gunixconnection.c:492
+#: ../gio/gunixconnection.c:491
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
-msgstr ""
+msgstr "預期接收憑證要讀取單一位元組，但讀取到零位元組"
 
-#: gio/gunixconnection.c:535
+#: ../gio/gunixconnection.c:534
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
-msgstr ""
+msgstr "停用 SO_PASSCRED 時發生錯誤：%s"
 
-#: gio/gunixinputstream.c:354 gio/gunixinputstream.c:374
-#: gio/gunixinputstream.c:452 gio/gunixoutputstream.c:439
+#: ../gio/gunixinputstream.c:353 ../gio/gunixinputstream.c:373
+#: ../gio/gunixinputstream.c:451 ../gio/gunixoutputstream.c:438
 #, c-format
 msgid "Error reading from unix: %s"
 msgstr "從 unix 讀取時發生錯誤：%s"
 
-#: gio/gunixinputstream.c:407 gio/gunixinputstream.c:589
-#: gio/gunixoutputstream.c:394 gio/gunixoutputstream.c:545
+#: ../gio/gunixinputstream.c:406 ../gio/gunixinputstream.c:589
+#: ../gio/gunixoutputstream.c:393 ../gio/gunixoutputstream.c:545
 #, c-format
 msgid "Error closing unix: %s"
 msgstr "關閉 unix 時發生錯誤：%s"
 
-#: gio/gunixmounts.c:1846 gio/gunixmounts.c:1883
+#: ../gio/gunixmounts.c:1846 ../gio/gunixmounts.c:1883
 msgid "Filesystem root"
 msgstr "根檔案系統"
 
-#: gio/gunixoutputstream.c:340 gio/gunixoutputstream.c:361
+#: ../gio/gunixoutputstream.c:339 ../gio/gunixoutputstream.c:360
 #, c-format
 msgid "Error writing to unix: %s"
 msgstr "寫入至 unix 時發生錯誤：%s"
 
-#: gio/gunixsocketaddress.c:245
+#: ../gio/gunixsocketaddress.c:244
 msgid "Abstract unix domain socket addresses not supported on this system"
 msgstr "這個系統不支授抽象 unix 網域 socket 位址"
 
-#: gio/gvolume.c:407
+#: ../gio/gvolume.c:406
 msgid "volume doesn't implement eject"
 msgstr "儲存區尚未實作退出(eject)"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gvolume.c:486
+#: ../gio/gvolume.c:485
 msgid "volume doesn't implement eject or eject_with_operation"
 msgstr "儲存區尚未實作退出(eject) 或 eject_with_operation"
 
-#: gio/gwin32appinfo.c:277
+#: ../gio/gwin32appinfo.c:276
 msgid "Can't find application"
 msgstr "找不到應用程式"
 
-#: gio/gwin32appinfo.c:300
+#: ../gio/gwin32appinfo.c:299
 #, c-format
 msgid "Error launching application: %s"
 msgstr "執行應用程式時發生錯誤：%s"
 
-#: gio/gwin32appinfo.c:336
+#: ../gio/gwin32appinfo.c:335
 msgid "URIs not supported"
 msgstr "不支援 URIs"
 
-#: gio/gwin32appinfo.c:358
+#: ../gio/gwin32appinfo.c:357
 msgid "association changes not supported on win32"
 msgstr "關聯變更在 win32 上不支援"
 
-#: gio/gwin32appinfo.c:370
+#: ../gio/gwin32appinfo.c:369
 msgid "Association creation not supported on win32"
 msgstr "關聯建立在 win32 上不支援"
 
-#: gio/gwin32inputstream.c:319
-#, fuzzy, c-format
+#: ../gio/gwin32inputstream.c:318
+#, c-format
 msgid "Error reading from handle: %s"
-msgstr "從檔案讀取時發生錯誤：%s"
+msgstr "從處理器讀取時發生錯誤：%s"
 
-#: gio/gwin32inputstream.c:349 gio/gwin32outputstream.c:349
-#, fuzzy, c-format
+#: ../gio/gwin32inputstream.c:348 ../gio/gwin32outputstream.c:348
+#, c-format
 msgid "Error closing handle: %s"
-msgstr "關閉檔案時發生錯誤：%s"
+msgstr "關閉處理器時發生錯誤：%s"
 
-#: gio/gwin32outputstream.c:319
-#, fuzzy, c-format
+#: ../gio/gwin32outputstream.c:318
+#, c-format
 msgid "Error writing to handle: %s"
-msgstr "寫入至檔案時發生錯誤：%s"
+msgstr "寫入至處理器時發生錯誤：%s"
 
-#: gio/gzlibcompressor.c:279 gio/gzlibdecompressor.c:250
+#: ../gio/gzlibcompressor.c:278 ../gio/gzlibdecompressor.c:249
 msgid "Not enough memory"
 msgstr "沒有足夠的記憶體"
 
-#: gio/gzlibcompressor.c:286 gio/gzlibdecompressor.c:257
+#: ../gio/gzlibcompressor.c:285 ../gio/gzlibdecompressor.c:256
 #, c-format
 msgid "Internal error: %s"
 msgstr "內部的錯誤：%s"
 
-#: gio/gzlibcompressor.c:299 gio/gzlibdecompressor.c:271
+#: ../gio/gzlibcompressor.c:298 ../gio/gzlibdecompressor.c:270
 msgid "Need more input"
 msgstr "需要更多輸入"
 
-#: gio/gzlibdecompressor.c:243
+#: ../gio/gzlibdecompressor.c:242
 msgid "Invalid compressed data"
 msgstr "無效的壓縮資料"
 
+#, fuzzy
+#~ msgid "Do not give error for empty directory"
+#~ msgstr "不能將目錄移動至目錄上"
+
 #~ msgid "Invalid UTF-8 sequence in input"
 #~ msgstr "在輸入中出現無效的 UTF-8 次序"