From f98541400b7ede2d4a99de5f2f6a25257b545a98 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Wed, 9 Dec 2015 16:02:55 +1000
Subject: Pull translations from Transifex and prepare for next release

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 lib/libalpm/po/zh_TW.po | 418 +++++++++++++++++++++++++-----------------------
 1 file changed, 221 insertions(+), 197 deletions(-)

(limited to 'lib/libalpm/po/zh_TW.po')

diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po
index 6e1a4a81..d7c8315e 100644
--- a/lib/libalpm/po/zh_TW.po
+++ b/lib/libalpm/po/zh_TW.po
@@ -7,16 +7,16 @@
 # dlin <dlin.tw@gmail.com>, 2014
 # dlin <dlin.tw@gmail.com>, 2014
 # dlin <dlin.tw@gmail.com>, 2011-2012
-# Jeff Huang <s8321414@gmail.com>, 2014
+# Jeff Huang <s8321414@gmail.com>, 2014-2015
 # Jeff Huang <s8321414@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2015-02-14 11:13+1000\n"
-"PO-Revision-Date: 2014-11-26 22:21+0000\n"
-"Last-Translator: dlin <dlin.tw@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
+"POT-Creation-Date: 2015-12-09 15:58+1000\n"
+"PO-Revision-Date: 2015-05-01 05:01+0000\n"
+"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/"
 "archlinux-pacman/language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,32 @@ msgstr "%s-%s 已經爲最新 -- 重新安裝\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "正在降級套件 %s (%s => %s)\n"
 
-#: lib/libalpm/add.c:122 lib/libalpm/util.c:379
+#: lib/libalpm/add.c:124 lib/libalpm/util.c:379
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
-msgstr "解壓 %s 時出現警告 (%s)\n"
+msgstr "解壓縮 %s 時出現警告 (%s)\n"
 
-#: lib/libalpm/add.c:125 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:127 lib/libalpm/util.c:382
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "無法解壓縮 %s (%s)\n"
 
-#: lib/libalpm/add.c:138 lib/libalpm/dload.c:589 lib/libalpm/remove.c:536
+#: lib/libalpm/add.c:140 lib/libalpm/dload.c:589 lib/libalpm/remove.c:520
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "無法將 %s 重命名爲 %s (%s)\n"
 
-#: lib/libalpm/add.c:184
+#: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
 msgstr "套件 %s 忽略無法找到的檔案 %s\n"
 
-#: lib/libalpm/add.c:232
+#: lib/libalpm/add.c:200
+#, c-format
+msgid "unable to extract %s%s: path too long"
+msgstr ""
+
+#: lib/libalpm/add.c:241
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -68,287 +73,295 @@ msgstr ""
 "目錄權限不一致 %s\n"
 "檔案系統：%o  套件：%o\n"
 
-#: lib/libalpm/add.c:247
+#: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
 msgstr ""
 "目錄擁有者不一致 %s\n"
-"檔案系統：%u:%u 套件: %u/%u\n"
+"檔案系統：%u:%u 套件: %u:%u\n"
 "\n"
 
-#: lib/libalpm/add.c:263
+#: lib/libalpm/add.c:272
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "解壓縮：沒有用文件 %s 覆蓋目錄\n"
+msgstr "解壓縮：沒有用檔案 %s 覆蓋目錄\n"
 
-#: lib/libalpm/add.c:603 lib/libalpm/util.c:331 lib/libalpm/util.c:507
+#: lib/libalpm/add.c:300
+#, c-format
+msgid "unable to extract %s.pacnew: path too long"
+msgstr ""
+
+#: lib/libalpm/add.c:501 lib/libalpm/util.c:331 lib/libalpm/util.c:567
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "無法得到當前的工作目錄\n"
+msgstr "無法取得目前的工作目錄\n"
 
-#: lib/libalpm/add.c:608 lib/libalpm/util.c:336 lib/libalpm/util.c:512
-#: lib/libalpm/util.c:553
+#: lib/libalpm/add.c:506 lib/libalpm/util.c:336 lib/libalpm/util.c:572
+#: lib/libalpm/util.c:627
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "無法更改目錄到 %s (%s)\n"
 
-#: lib/libalpm/add.c:647 lib/libalpm/util.c:400 lib/libalpm/util.c:624
+#: lib/libalpm/add.c:545 lib/libalpm/util.c:400 lib/libalpm/util.c:731
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "無法回存到工作目錄(%s)\n"
 
-#: lib/libalpm/add.c:655
+#: lib/libalpm/add.c:553
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "更新 %s 時出現錯誤\n"
 
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:559
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "安裝 %s 時出現錯誤\n"
 
-#: lib/libalpm/add.c:677
+#: lib/libalpm/add.c:575
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "無法更新資料庫記錄 %s-%s\n"
 
-#: lib/libalpm/add.c:688
+#: lib/libalpm/add.c:586
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "無法在快取中添加記錄 '%s' \n"
 
-#: lib/libalpm/be_local.c:249
+#: lib/libalpm/be_local.c:255
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "讀取檔案 %s 時發生錯誤: %s\n"
 
-#: lib/libalpm/be_local.c:343
+#: lib/libalpm/be_local.c:350
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "正在刪除無效的資料庫： %s\n"
 
-#: lib/libalpm/be_local.c:389 lib/libalpm/be_local.c:849
+#: lib/libalpm/be_local.c:401 lib/libalpm/be_local.c:873
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "無法更改目錄到 %1$s：%2$s\n"
 
-#: lib/libalpm/be_local.c:559 lib/libalpm/be_sync.c:358
+#: lib/libalpm/be_local.c:576 lib/libalpm/be_sync.c:377
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "資料庫記錄 '%s' 名字無效\n"
+msgstr "資料庫記錄「%s」名字無效\n"
 
-#: lib/libalpm/be_local.c:567
+#: lib/libalpm/be_local.c:584
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "重複的資料庫記錄 '%s'\n"
+msgstr "重複的資料庫記錄「%s」\n"
 
-#: lib/libalpm/be_local.c:579
+#: lib/libalpm/be_local.c:596
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "損壞的資料庫記錄 '%s'\n"
+msgstr "損壞的資料庫記錄「%s」\n"
 
-#: lib/libalpm/be_local.c:679 lib/libalpm/be_local.c:769
-#: lib/libalpm/be_local.c:898 lib/libalpm/be_local.c:991
+#: lib/libalpm/be_local.c:696 lib/libalpm/be_local.c:788
+#: lib/libalpm/be_local.c:922 lib/libalpm/be_local.c:1019
 #: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:447 lib/libalpm/util.c:250
 #: lib/libalpm/util.c:266
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr "無法打開文件 %1$s: %2$s\n"
+msgstr "無法打開檔案 %s: %s\n"
 
-#: lib/libalpm/be_local.c:695 lib/libalpm/be_sync.c:603
+#: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "%1$s 資料庫不一致：名字和套件中的 %2$s 不一致\n"
+msgstr "%s 資料庫不一致：名字和套件中的 %s 不一致\n"
 
-#: lib/libalpm/be_local.c:701 lib/libalpm/be_sync.c:609
+#: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "%1$s 資料庫不一致：版本和套件中的 %2$s 不一致\n"
+msgstr "%s 資料庫不一致：版本和套件中的 %s 不一致\n"
 
-#: lib/libalpm/be_local.c:740
+#: lib/libalpm/be_local.c:759
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
-msgstr "未知的驗證型態, 套件 %s: %s\n"
+msgstr "未知的驗證類型，套件 %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:625
-#: lib/libalpm/be_package.c:638
+#: lib/libalpm/be_package.c:476 lib/libalpm/be_package.c:634
+#: lib/libalpm/be_package.c:647
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "讀取套件 %1$s 發生錯誤: %2$s\n"
+msgstr "讀取套件 %s 發生錯誤：%s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:490 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "讀取套件 mtree 錯誤 %s: %s\n"
 
-#: lib/libalpm/be_package.c:588
+#: lib/libalpm/be_package.c:600
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "無法解析 %s 中的套件描述文件\n"
+msgstr "無法解析 %s 中的套件描述檔案\n"
 
-#: lib/libalpm/be_package.c:593
+#: lib/libalpm/be_package.c:605
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "%s 中缺少套件名字\n"
 
-#: lib/libalpm/be_package.c:597
+#: lib/libalpm/be_package.c:609
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "%s 中缺少套件版本號\n"
 
-#: lib/libalpm/be_package.c:601
+#: lib/libalpm/be_package.c:613
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "%s 中套件版本編號不正確\n"
 
-#: lib/libalpm/be_package.c:645
+#: lib/libalpm/be_package.c:654
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "%s 中缺少套件元資料\n"
 
-#: lib/libalpm/be_package.c:734
+#: lib/libalpm/be_package.c:743
 #, c-format
 msgid "failed to read signature file: %s\n"
-msgstr "無法讀取驗證檔: %s\n"
+msgstr "無法讀取驗證檔：%s\n"
 
-#: lib/libalpm/be_package.c:755 lib/libalpm/sync.c:1108
+#: lib/libalpm/be_package.c:764 lib/libalpm/sync.c:1108
 #, c-format
 msgid "required key missing from keyring\n"
-msgstr "從鑰匙圈找不到需要的鑰匙\n"
+msgstr "從鑰匙圈找不到需要的金鑰\n"
 
-#: lib/libalpm/be_sync.c:61
+#: lib/libalpm/be_sync.c:62
 #, c-format
 msgid "removing invalid file: %s\n"
-msgstr "刪除無效文件: %s\n"
+msgstr "刪除無效檔案：%s\n"
 
-#: lib/libalpm/be_sync.c:476
+#: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr "無法處理套件描述檔 '%s' 從套件庫 '%s'\\n\n"
+msgstr "無法解析套件描述檔案「%s」從套件庫「%s」\n"
 
-#: lib/libalpm/be_sync.c:509 lib/libalpm/be_sync.c:514
+#: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr "%s 資料庫不一致: 套件 %s 的檔名不正確\n"
+msgstr "%s 資料庫不一致：套件 %s 的檔名不正確\n"
 
-#: lib/libalpm/be_sync.c:519
+#: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s 資料庫不一致：套件 %s 的檔名太長\n"
 
-#: lib/libalpm/be_sync.c:585
+#: lib/libalpm/be_sync.c:611
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "未知的資料庫：%s\n"
 
-#: lib/libalpm/db.c:369
+#: lib/libalpm/db.c:370
 #, c-format
 msgid "database path is undefined\n"
 msgstr "資料庫路徑未定義\n"
 
-#: lib/libalpm/deps.c:218
+#: lib/libalpm/deps.c:229
 #, c-format
 msgid "dependency cycle detected:\n"
-msgstr "檢測到依賴關係環：\n"
+msgstr "檢測到依賴關係循環：\n"
 
-#: lib/libalpm/deps.c:221
+#: lib/libalpm/deps.c:232
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%1$s 將在它 %2$s 的依賴關係之後被刪除\n"
+msgstr "%s 將在它 %s 的依賴關係之後被刪除\n"
 
-#: lib/libalpm/deps.c:225
+#: lib/libalpm/deps.c:236
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "%1$s 將在它 %2$s 的依賴關係之前被安裝\n"
+msgstr "%s 將在它 %s 的依賴關係之前被安裝\n"
 
-#: lib/libalpm/deps.c:657 lib/libalpm/deps.c:689
+#: lib/libalpm/deps.c:678 lib/libalpm/deps.c:710
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr "正在忽略套件更新 %s-%s\n"
+msgstr "正在忽略套件 %s-%s\n"
 
-#: lib/libalpm/deps.c:844
+#: lib/libalpm/deps.c:865
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "無法解決 \"%1$s\"，\"%2$s\" 的一個依賴關係\n"
+msgstr "無法解決「%s」，「%s」的一個依賴關係\n"
 
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr "無法爲 %s 獲得檔案系統信息：%s\n"
+msgstr "無法爲 %s 獲得檔案系統資訊：%s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
 msgid "could not open file: %s: %s\n"
-msgstr "無法打開檔案: %s: %s\n"
+msgstr "無法打開檔案：%s: %s\n"
 
 #: lib/libalpm/diskspace.c:146 lib/libalpm/diskspace.c:159
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr "無法獲取檔案系統的信息\n"
+msgstr "無法取得檔案系統資訊\n"
+
+#: lib/libalpm/diskspace.c:241
+#, fuzzy, c-format
+msgid "could not get file information for %s\n"
+msgstr "無法爲 %s 獲得檔案系統資訊：%s\n"
 
-#: lib/libalpm/diskspace.c:249 lib/libalpm/diskspace.c:308
+#: lib/libalpm/diskspace.c:254 lib/libalpm/diskspace.c:313
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr "無法確定文件 %s 的掛載點\n"
+msgstr "無法確定檔案 %s 的掛載點\n"
 
-#: lib/libalpm/diskspace.c:347
-#, c-format
-msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr "磁碟分割區 %s 太滿了: 需要 %jd 磁區，剩餘 %jd 磁區\n"
+#: lib/libalpm/diskspace.c:352
+#, fuzzy, c-format
+msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
+msgstr "磁碟分割區 %s 太滿了：需要 %jd 磁區，剩餘 %jd 磁區\n"
 
-#: lib/libalpm/diskspace.c:372 lib/libalpm/diskspace.c:426
+#: lib/libalpm/diskspace.c:377 lib/libalpm/diskspace.c:431
 #, c-format
 msgid "could not determine filesystem mount points\n"
 msgstr "無法測定檔案系統掛載點\n"
 
-#: lib/libalpm/diskspace.c:378
+#: lib/libalpm/diskspace.c:383
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
 msgstr "無法決定快取目錄掛載點 %s\n"
 
-#: lib/libalpm/diskspace.c:431
+#: lib/libalpm/diskspace.c:436
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr "無法測定根分區掛載點 %s\n"
+msgstr "無法測定根分割區掛載點 %s\n"
 
-#: lib/libalpm/diskspace.c:479
+#: lib/libalpm/diskspace.c:484
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
-"分區 %s 爲只讀\n"
-"\n"
+msgstr "分區 %s 爲唯讀\n"
 
 #: lib/libalpm/dload.c:149
 #, c-format
 msgid "disk"
-msgstr "硬盤"
+msgstr "硬碟"
 
 #: lib/libalpm/dload.c:373
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr "無法建立下載暫存檔\\n\n"
+msgstr "無法建立下載暫存檔\n"
 
 #: lib/libalpm/dload.c:418
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "url '%s' 無效\n"
+msgstr "url「%s」無效\n"
 
 #: lib/libalpm/dload.c:487 lib/libalpm/dload.c:512
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "無法從 %2$s : %3$s 獲取文件 '%1$s'\n"
+msgstr "無法取得檔案「%s」從 %s：%s\n"
 
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr "超出下載的檔案大小造成無法解開 '%s' 從 %s 壓縮檔\n"
+msgstr "無法解開「%s」從 %s 壓縮檔：超出下載的檔案大小\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "%s 可縮小：%jd/%jd bytes\n"
+msgstr "%s 可縮小：%jd/%jd 位元組\n"
 
 #: lib/libalpm/dload.c:692 lib/libalpm/dload.c:721
 #, c-format
@@ -358,7 +371,7 @@ msgstr "下載 %s 失敗\n"
 #: lib/libalpm/error.c:40
 #, c-format
 msgid "out of memory!"
-msgstr "內存不足！"
+msgstr "記憶體不足！"
 
 #: lib/libalpm/error.c:42
 #, c-format
@@ -373,7 +386,7 @@ msgstr "沒有權限"
 #: lib/libalpm/error.c:46
 #, c-format
 msgid "could not find or read file"
-msgstr "無法找到或讀取文件"
+msgstr "無法找到或讀取檔案"
 
 #: lib/libalpm/error.c:48
 #, c-format
@@ -393,12 +406,12 @@ msgstr "剩餘空間不夠"
 #: lib/libalpm/error.c:55
 #, c-format
 msgid "library not initialized"
-msgstr "函數庫未初始化"
+msgstr "函式庫未初始化"
 
 #: lib/libalpm/error.c:57
 #, c-format
 msgid "library already initialized"
-msgstr "函數庫已初始化"
+msgstr "函式庫已初始化"
 
 #: lib/libalpm/error.c:59
 #, c-format
@@ -463,7 +476,7 @@ msgstr "無效的服務器 url"
 #: lib/libalpm/error.c:85
 #, c-format
 msgid "no servers configured for repository"
-msgstr "軟體庫沒有配置服務器信息"
+msgstr "沒有伺服器設定為套件庫"
 
 #: lib/libalpm/error.c:88
 #, c-format
@@ -493,149 +506,154 @@ msgstr "處理已放棄"
 #: lib/libalpm/error.c:100
 #, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "操作與處理類型不兼容"
+msgstr "操作與處理類型不相容"
 
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "未鎖定資料庫即提交了事務處理嘗試"
 
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:104
 #, c-format
-msgid "could not find or read package"
-msgstr "無法找到或讀取軟件包"
+msgid "failed to run transaction hooks"
+msgstr ""
 
 #: lib/libalpm/error.c:107
 #, c-format
+msgid "could not find or read package"
+msgstr "無法找到或讀取套件"
+
+#: lib/libalpm/error.c:109
+#, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "由於 ignorepkg 指定，操作已取消"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "無效的或已損壞的套件"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package (checksum)"
-msgstr "資料庫不正確或損毀(檢查碼)"
+msgstr "資料庫不正確或損毀（檢查碼）"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
-msgstr "套件不正確或損毀 (PGP 簽章)"
+msgstr "套件不正確或損毀（PGP 簽章）"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "package missing required signature"
 msgstr "套件缺少所需的簽名"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "cannot open package file"
-msgstr "無法打開軟件包文件"
+msgstr "無法開啟套件檔案"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "無法爲套件刪除全部文件"
+msgstr "無法爲套件刪除全部檔案"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "package filename is not valid"
-msgstr "套件文件名無效"
+msgstr "套件檔案名稱無效"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package architecture is not valid"
 msgstr "無效的套件架構"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "could not find repository for target"
-msgstr "無法爲目標找到軟體庫"
+msgstr "無法爲目標找到套件庫"
 
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
 msgstr "缺乏 PGP 簽章"
 
-#: lib/libalpm/error.c:130
+#: lib/libalpm/error.c:132
 #, c-format
 msgid "invalid PGP signature"
-msgstr "PGP 簽章不正確"
+msgstr "無效的 PGP 簽章"
 
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:135
 #, c-format
 msgid "invalid or corrupted delta"
 msgstr "無效的或已損壞的 delta"
 
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:137
 #, c-format
 msgid "delta patch failed"
-msgstr "delta 補丁失敗"
+msgstr "delta patch 失敗"
 
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:140
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "無法滿足依賴關係"
 
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:142
 #, c-format
 msgid "conflicting dependencies"
 msgstr "有衝突的依賴關係"
 
-#: lib/libalpm/error.c:142
+#: lib/libalpm/error.c:144
 #, c-format
 msgid "conflicting files"
-msgstr "有衝突的文件"
+msgstr "有衝突的檔案"
 
-#: lib/libalpm/error.c:145
+#: lib/libalpm/error.c:147
 #, c-format
 msgid "failed to retrieve some files"
-msgstr "無法獲取某些文件"
+msgstr "無法擷取某些檔案"
 
-#: lib/libalpm/error.c:147
+#: lib/libalpm/error.c:149
 #, c-format
 msgid "invalid regular expression"
-msgstr "無效的正則表達式"
+msgstr "無效的正規表達式"
 
-#: lib/libalpm/error.c:153
+#: lib/libalpm/error.c:155
 #, c-format
 msgid "libarchive error"
 msgstr "libarchive 錯誤"
 
-#: lib/libalpm/error.c:155
+#: lib/libalpm/error.c:157
 #, c-format
 msgid "download library error"
-msgstr "下載函數庫出錯"
+msgstr "下載函式庫出錯"
 
-#: lib/libalpm/error.c:157
+#: lib/libalpm/error.c:159
 #, c-format
 msgid "gpgme error"
 msgstr "gpgme 錯誤"
 
-#: lib/libalpm/error.c:159
+#: lib/libalpm/error.c:161
 #, c-format
 msgid "error invoking external downloader"
-msgstr "調用外部下載程序時出錯"
+msgstr "呼叫外部下載程式時出錯"
 
-#: lib/libalpm/error.c:162
+#: lib/libalpm/error.c:164
 #, c-format
 msgid "unexpected error"
 msgstr "未預期的錯誤"
 
-#: lib/libalpm/handle.c:139
+#: lib/libalpm/handle.c:155
 #, c-format
 msgid "lock file missing %s\n"
-msgstr "鎖定文件丟失 %s\n"
+msgstr "鎖定檔案遺失 %s\n"
 
-#: lib/libalpm/handle.c:145
+#: lib/libalpm/handle.c:161
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "無法刪除鎖定文件 %s\n"
+msgstr "無法刪除鎖定檔案 %s\n"
 
-#: lib/libalpm/package.c:559
+#: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "無法完全載入套件的解釋用資料 %s-%s\n"
@@ -650,29 +668,27 @@ msgstr "無法在資料庫中找到 %s -- 跳過\n"
 msgid "removing %s from target list\n"
 msgstr "正在從目標清單中刪除 '%s' \n"
 
-#: lib/libalpm/remove.c:348
+#: lib/libalpm/remove.c:343
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "無法刪除文件 '%1$s': %2$s\n"
+msgstr "無法刪除檔案「%s」：%s\n"
 
-#: lib/libalpm/remove.c:388
+#: lib/libalpm/remove.c:383
 #, c-format
 msgid "could not open directory: %s: %s\n"
-msgstr ""
-"無法開啟目錄: %s: %s\n"
-"\n"
+msgstr "無法開啟目錄：%s: %s\n"
 
-#: lib/libalpm/remove.c:556
+#: lib/libalpm/remove.c:540
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr "無法移除 %s (%s)\\n\n"
+msgstr "無法移除 %s (%s)\n"
 
-#: lib/libalpm/remove.c:727
+#: lib/libalpm/remove.c:713
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "無法刪除資料庫記錄 %1$s-%2$s\n"
+msgstr "無法刪除資料庫記錄 %s-%s\n"
 
-#: lib/libalpm/remove.c:732
+#: lib/libalpm/remove.c:718
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "無法從快取中刪除記錄 '%s'\n"
@@ -680,12 +696,12 @@ msgstr "無法從快取中刪除記錄 '%s'\n"
 #: lib/libalpm/sync.c:98
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%1$s：忽略套件更新（%2$s => %3$s）\n"
+msgstr "%s：忽略套件更新（%s => %s）\n"
 
 #: lib/libalpm/sync.c:110
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%1$s：正在忽略套件降級（%2$s => %3$s）\n"
+msgstr "%s：正在忽略套件降級（%s => %s）\n"
 
 #: lib/libalpm/sync.c:113
 #, c-format
@@ -695,7 +711,7 @@ msgstr "%s：正在從版本 %s 降級爲 %s \n"
 #: lib/libalpm/sync.c:119
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%1$s：本地（%2$s）比 %3$s 的版本更新 (%4$s)\n"
+msgstr "%s：本機（%s）比 %s 的版本更新 (%s)\n"
 
 #: lib/libalpm/sync.c:160
 #, c-format
@@ -705,17 +721,17 @@ msgstr "正在忽略套件更新 (%s-%s => %s-%s)\n"
 #: lib/libalpm/sync.c:176
 #, c-format
 msgid "cannot replace %s by %s\n"
-msgstr "無法用文件 '%2$s' 替代 %1$s\n"
+msgstr "無法替代 %s 以 %s\n"
 
 #: lib/libalpm/sync.c:536 lib/libalpm/sync.c:606
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "檢測到未解決的套件衝突\n"
+msgstr "檢測到無法解決的套件衝突\n"
 
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "正在從目標清單中刪除 '%1$s' ，因爲它和 '%2$s' 衝突\n"
+msgstr "正在從目標清單中刪除「%s」，因爲它和「%s」衝突\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -725,39 +741,39 @@ msgstr "解開部分檔案失敗\n"
 #: lib/libalpm/sync.c:1176
 #, c-format
 msgid "%s: missing required signature\n"
-msgstr "%s: 缺少需要的簽章\n"
+msgstr "%s：缺少需要的簽章\n"
 
-#: lib/libalpm/sync.c:1357
+#: lib/libalpm/sync.c:1376
 #, c-format
 msgid "not enough free disk space\n"
 msgstr "剩餘空間不夠\n"
 
-#: lib/libalpm/sync.c:1370
+#: lib/libalpm/sync.c:1398
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "無法交付可撤銷處理\n"
+msgstr "無法遞交移除事務處理\n"
 
-#: lib/libalpm/sync.c:1378
+#: lib/libalpm/sync.c:1406
 #, c-format
 msgid "could not commit transaction\n"
-msgstr "無法交付處理\n"
+msgstr "無法遞交事務處理\n"
 
-#: lib/libalpm/trans.c:343
+#: lib/libalpm/trans.c:353
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "無法創建臨時目錄\n"
 
-#: lib/libalpm/trans.c:358
+#: lib/libalpm/trans.c:368
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "無法複製臨時文件到 %1$s (%2$s)\n"
+msgstr "無法複製臨時檔案到 %s (%s)\n"
 
-#: lib/libalpm/trans.c:389
+#: lib/libalpm/trans.c:399
 #, c-format
 msgid "could not remove %s\n"
 msgstr "無法移除 %s\n"
 
-#: lib/libalpm/trans.c:393
+#: lib/libalpm/trans.c:403
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "無法刪除臨時目錄 %s\n"
@@ -767,57 +783,65 @@ msgstr "無法刪除臨時目錄 %s\n"
 msgid "could not stat file %s: %s\n"
 msgstr "無法取得檔案統計資訊 %s: %s\n"
 
-#: lib/libalpm/util.c:524
+#: lib/libalpm/util.c:483
+#, fuzzy, c-format
+msgid "unable to write to pipe (%s)\n"
+msgstr "無法建立管道(%s)\n"
+
+#: lib/libalpm/util.c:542
+#, fuzzy, c-format
+msgid "unable to read from pipe (%s)\n"
+msgstr "無法建立管道(%s)\n"
+
+#: lib/libalpm/util.c:584 lib/libalpm/util.c:590
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr "無法創建管道(%s)\n"
+msgstr "無法建立管道(%s)\n"
 
-#: lib/libalpm/util.c:532
+#: lib/libalpm/util.c:598
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "無法 fork 新進程 (%s)\n"
+msgstr "無法 fork 新行程 (%s)\n"
 
-#: lib/libalpm/util.c:549
+#: lib/libalpm/util.c:623
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "無法更改根目錄 (%s)\n"
 
-#: lib/libalpm/util.c:560
+#: lib/libalpm/util.c:634
 #, c-format
 msgid "call to execv failed (%s)\n"
-msgstr "調用 execv 失敗 (%s)\n"
+msgstr "呼叫 execv 失敗 (%s)\n"
 
-#: lib/libalpm/util.c:590
+#: lib/libalpm/util.c:702
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "調用 waitpid 失敗 (%s)\n"
+msgstr "呼叫 waitpid 失敗 (%s)\n"
 
-#: lib/libalpm/util.c:598
-#, c-format
-msgid "could not open pipe (%s)\n"
-msgstr "無法打開管道(%s)\n"
-
-#: lib/libalpm/util.c:605
+#: lib/libalpm/util.c:712
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "命令未能被正確執行\n"
 
-#: lib/libalpm/util.c:612
+#: lib/libalpm/util.c:719
 #, c-format
 msgid "Unknown signal"
-msgstr "未知的信號 signal"
+msgstr "未知的訊號"
 
-#: lib/libalpm/util.c:614
+#: lib/libalpm/util.c:721
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "命令被訊號中斷 %d: %s\n"
 
-#: lib/libalpm/util.c:711
+#: lib/libalpm/util.c:818
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "沒有 %s 快取存在，正在創建...\n"
+msgstr "沒有 %s 快取存在，正在建立...\n"
 
-#: lib/libalpm/util.c:742
+#: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "無法建立套件快取，以 %s 取代\n"
+
+#~ msgid "could not open pipe (%s)\n"
+#~ msgstr "無法打開管道 (%s)\n"
-- 
cgit v1.2.3-70-g09d2