Merge branch 'maint'

1 files changed, 256 insertions, 270 deletions

diff --git a/scripts/po/zh_TW.po b/scripts/po/zh_TW.po
index ad87346f..ed8edbc0 100644
--- a/scripts/po/zh_TW.po
+++ b/scripts/po/zh_TW.po
@@ -6,13 +6,13 @@
 # BrLi <rainman59118@gmail.com>, 2014
 # dlin <dlin.tw@gmail.com>, 2014
 # dlin <dlin.tw@gmail.com>, 2014
-# Jeff Huang <s8321414@gmail.com>, 2014
+# Jeff Huang <s8321414@gmail.com>, 2014-2015
 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: 2014-12-19 13:24+1000\n"
-"PO-Revision-Date: 2014-11-25 12:51+0000\n"
+"POT-Creation-Date: 2015-02-14 11:18+1000\n"
+"PO-Revision-Date: 2015-02-14 13:21+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "archlinux-pacman/language/zh_TW/)\n"
@@ -22,8 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: scripts/makepkg.sh.in:120 scripts/makepkg.sh.in:1517
-#: scripts/makepkg.sh.in:1521 scripts/library/output_format.sh:26
+#: scripts/makepkg.sh.in:120 scripts/makepkg.sh.in:1494
+#: scripts/makepkg.sh.in:1498 scripts/library/output_format.sh:26
 msgid "WARNING:"
 msgstr "警告:"
 
@@ -39,27 +39,26 @@ msgstr "正在清理..."
 msgid "Entering %s environment..."
 msgstr "正在進入 %s 環境..."
 
-#: scripts/makepkg.sh.in:303 scripts/makepkg.sh.in:2890
+#: scripts/makepkg.sh.in:303 scripts/makepkg.sh.in:2873
 msgid "Unknown download protocol: %s"
 msgstr "未知的下載通訊協定：%s"
 
 #: scripts/makepkg.sh.in:304 scripts/makepkg.sh.in:313
 #: scripts/makepkg.sh.in:377 scripts/makepkg.sh.in:441
-#: scripts/makepkg.sh.in:470 scripts/makepkg.sh.in:480
-#: scripts/makepkg.sh.in:487 scripts/makepkg.sh.in:518
-#: scripts/makepkg.sh.in:533 scripts/makepkg.sh.in:538
-#: scripts/makepkg.sh.in:561 scripts/makepkg.sh.in:569
-#: scripts/makepkg.sh.in:604 scripts/makepkg.sh.in:610
-#: scripts/makepkg.sh.in:627 scripts/makepkg.sh.in:635
-#: scripts/makepkg.sh.in:659 scripts/makepkg.sh.in:697
-#: scripts/makepkg.sh.in:706 scripts/makepkg.sh.in:711
-#: scripts/makepkg.sh.in:745 scripts/makepkg.sh.in:755
-#: scripts/makepkg.sh.in:893 scripts/makepkg.sh.in:1593
-#: scripts/makepkg.sh.in:1601 scripts/makepkg.sh.in:2208
-#: scripts/makepkg.sh.in:2891 scripts/makepkg.sh.in:3327
-#: scripts/makepkg.sh.in:3375 scripts/makepkg.sh.in:3382
-#: scripts/makepkg.sh.in:3395 scripts/makepkg.sh.in:3403
-#: scripts/makepkg.sh.in:3412 scripts/makepkg.sh.in:3425
+#: scripts/makepkg.sh.in:470 scripts/makepkg.sh.in:501
+#: scripts/makepkg.sh.in:516 scripts/makepkg.sh.in:521
+#: scripts/makepkg.sh.in:544 scripts/makepkg.sh.in:552
+#: scripts/makepkg.sh.in:587 scripts/makepkg.sh.in:593
+#: scripts/makepkg.sh.in:610 scripts/makepkg.sh.in:618
+#: scripts/makepkg.sh.in:642 scripts/makepkg.sh.in:680
+#: scripts/makepkg.sh.in:689 scripts/makepkg.sh.in:694
+#: scripts/makepkg.sh.in:728 scripts/makepkg.sh.in:738
+#: scripts/makepkg.sh.in:876 scripts/makepkg.sh.in:1570
+#: scripts/makepkg.sh.in:1578 scripts/makepkg.sh.in:2188
+#: scripts/makepkg.sh.in:2874 scripts/makepkg.sh.in:3320
+#: scripts/makepkg.sh.in:3368 scripts/makepkg.sh.in:3375
+#: scripts/makepkg.sh.in:3388 scripts/makepkg.sh.in:3396
+#: scripts/makepkg.sh.in:3405 scripts/makepkg.sh.in:3418
 msgid "Aborting..."
 msgstr "正在中止..."
 
@@ -85,7 +84,7 @@ msgstr "下載 %s 時失敗"
 
 #: scripts/makepkg.sh.in:432
 msgid "Extracting %s with %s"
-msgstr "正在以 %2$s 解壓縮 %1$s"
+msgstr "正在解壓縮 %s 使用 %s"
 
 #: scripts/makepkg.sh.in:440
 msgid "Failed to extract %s"
@@ -99,724 +98,716 @@ msgstr "正在分支 %s..."
 msgid "Failure while branching %s"
 msgstr "分支 %s 時失敗"
 
-#: scripts/makepkg.sh.in:479 scripts/makepkg.sh.in:485
-msgid "%s is not a branch of %s"
-msgstr "%s 並非 %s 的分支"
-
-#: scripts/makepkg.sh.in:486
-msgid "The local URL is %s"
-msgstr "本地端網址為 %s"
-
-#: scripts/makepkg.sh.in:491
+#: scripts/makepkg.sh.in:474
 msgid "Pulling %s ..."
 msgstr "拉出 %s ..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:478
 msgid "Failure while pulling %s"
 msgstr "拉出 %s 時失敗"
 
-#: scripts/makepkg.sh.in:517 scripts/makepkg.sh.in:626
-#: scripts/makepkg.sh.in:696 scripts/makepkg.sh.in:744
+#: scripts/makepkg.sh.in:500 scripts/makepkg.sh.in:609
+#: scripts/makepkg.sh.in:679 scripts/makepkg.sh.in:727
 msgid "Unrecognized reference: %s"
 msgstr "無法辨識的參考點：%s"
 
-#: scripts/makepkg.sh.in:526 scripts/makepkg.sh.in:595
-#: scripts/makepkg.sh.in:686 scripts/makepkg.sh.in:777
+#: scripts/makepkg.sh.in:509 scripts/makepkg.sh.in:578
+#: scripts/makepkg.sh.in:669 scripts/makepkg.sh.in:760
 msgid "Creating working copy of %s %s repo..."
 msgstr "正在建立 %s %s 庫的工作副本..."
 
-#: scripts/makepkg.sh.in:532 scripts/makepkg.sh.in:603
-#: scripts/makepkg.sh.in:705
+#: scripts/makepkg.sh.in:515 scripts/makepkg.sh.in:586
+#: scripts/makepkg.sh.in:688
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "更新 %s %s 庫的工作副本時失敗"
 
-#: scripts/makepkg.sh.in:537 scripts/makepkg.sh.in:609
-#: scripts/makepkg.sh.in:634 scripts/makepkg.sh.in:710
+#: scripts/makepkg.sh.in:520 scripts/makepkg.sh.in:592
+#: scripts/makepkg.sh.in:617 scripts/makepkg.sh.in:693
 msgid "Failure while creating working copy of %s %s repo"
 msgstr "製作 %s %s 庫的工作副本時失敗"
 
-#: scripts/makepkg.sh.in:558 scripts/makepkg.sh.in:656
-#: scripts/makepkg.sh.in:751
+#: scripts/makepkg.sh.in:541 scripts/makepkg.sh.in:639
+#: scripts/makepkg.sh.in:734
 msgid "Cloning %s %s repo..."
 msgstr "再製 %s %s 庫中..."
 
-#: scripts/makepkg.sh.in:560 scripts/makepkg.sh.in:658
-#: scripts/makepkg.sh.in:754
+#: scripts/makepkg.sh.in:543 scripts/makepkg.sh.in:641
+#: scripts/makepkg.sh.in:737
 msgid "Failure while downloading %s %s repo"
 msgstr "下載 %s %s 庫時失敗"
 
-#: scripts/makepkg.sh.in:568
+#: scripts/makepkg.sh.in:551
 msgid "%s is not a clone of %s"
 msgstr "%s 並非 %s 的再製本"
 
-#: scripts/makepkg.sh.in:572 scripts/makepkg.sh.in:663
-#: scripts/makepkg.sh.in:759
+#: scripts/makepkg.sh.in:555 scripts/makepkg.sh.in:646
+#: scripts/makepkg.sh.in:742
 msgid "Updating %s %s repo..."
 msgstr "更新 %s %s 庫中..."
 
-#: scripts/makepkg.sh.in:575 scripts/makepkg.sh.in:667
-#: scripts/makepkg.sh.in:763
+#: scripts/makepkg.sh.in:558 scripts/makepkg.sh.in:650
+#: scripts/makepkg.sh.in:746
 msgid "Failure while updating %s %s repo"
 msgstr "更新 %s %s 庫時失敗"
 
-#: scripts/makepkg.sh.in:816
+#: scripts/makepkg.sh.in:799
 msgid "Retrieving sources..."
 msgstr "擷取來源中..."
 
-#: scripts/makepkg.sh.in:868
+#: scripts/makepkg.sh.in:851
 msgid "pkgver() generated an invalid version: %s"
 msgstr "pkgver() 已生成一個無效版本號：%s"
 
-#: scripts/makepkg.sh.in:875
+#: scripts/makepkg.sh.in:858
 msgid "Failed to update %s from %s to %s"
 msgstr "無法將 %s 從 %s 更新為 %s"
 
-#: scripts/makepkg.sh.in:882
+#: scripts/makepkg.sh.in:865
 msgid "Updated version: %s"
 msgstr "更新的版本：%s"
 
-#: scripts/makepkg.sh.in:884
+#: scripts/makepkg.sh.in:867
 msgid "%s is not writeable -- pkgver will not be updated"
 msgstr "%s 無法寫入 -- pkgver 將不會更新"
 
-#: scripts/makepkg.sh.in:892
+#: scripts/makepkg.sh.in:875
 msgid "Unable to find source file %s."
 msgstr "找不到來源檔 %s。"
 
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1055
 msgid "'%s' returned a fatal error (%i): %s"
 msgstr "「%s」傳回嚴重錯誤 (%i)：%s"
 
-#: scripts/makepkg.sh.in:1091
+#: scripts/makepkg.sh.in:1074
 msgid "Installing missing dependencies..."
 msgstr "正在安裝缺少的依賴套件..."
 
-#: scripts/makepkg.sh.in:1094
+#: scripts/makepkg.sh.in:1077
 msgid "'%s' failed to install missing dependencies."
 msgstr "「%s」無法安裝缺少的依賴套件。"
 
-#: scripts/makepkg.sh.in:1125
+#: scripts/makepkg.sh.in:1108
 msgid "Missing dependencies:"
 msgstr "缺少以下依賴套件："
 
-#: scripts/makepkg.sh.in:1141 scripts/makepkg.sh.in:1155
+#: scripts/makepkg.sh.in:1124 scripts/makepkg.sh.in:1138
 msgid "Failed to remove installed dependencies."
 msgstr "無法移除已安裝的依賴套件。"
 
-#: scripts/makepkg.sh.in:1230
+#: scripts/makepkg.sh.in:1213
 msgid "Generating checksums for source files..."
 msgstr "正在生成來源檔案的校驗碼..."
 
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1216
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "找不到生成來源檔案校驗碼所需的二進位檔 %s 。"
 
-#: scripts/makepkg.sh.in:1247
+#: scripts/makepkg.sh.in:1230
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定的完整性演算法「%s」無效。"
 
-#: scripts/makepkg.sh.in:1265
+#: scripts/makepkg.sh.in:1248
 msgid "Skipped"
 msgstr "已略過"
 
-#: scripts/makepkg.sh.in:1270
+#: scripts/makepkg.sh.in:1253
 msgid "NOT FOUND"
 msgstr "找不到"
 
-#: scripts/makepkg.sh.in:1277 scripts/makepkg.sh.in:1514
+#: scripts/makepkg.sh.in:1260 scripts/makepkg.sh.in:1491
 msgid "Passed"
 msgstr "已通過"
 
-#: scripts/makepkg.sh.in:1279 scripts/makepkg.sh.in:1490
-#: scripts/makepkg.sh.in:1508 scripts/makepkg.sh.in:1511
+#: scripts/makepkg.sh.in:1262 scripts/makepkg.sh.in:1467
+#: scripts/makepkg.sh.in:1485 scripts/makepkg.sh.in:1488
 msgid "FAILED"
 msgstr "失敗"
 
-#: scripts/makepkg.sh.in:1302
+#: scripts/makepkg.sh.in:1285
 msgid "Validating source files with %s..."
 msgstr "正以 %s 驗證來源檔案..."
 
-#: scripts/makepkg.sh.in:1309
+#: scripts/makepkg.sh.in:1292
 msgid "One or more files did not pass the validity check!"
 msgstr "一份或多份檔案未通過完整性檢驗！"
 
-#: scripts/makepkg.sh.in:1313
+#: scripts/makepkg.sh.in:1296
 msgid "Integrity checks (%s) differ in size from the source array."
 msgstr "完整性檢驗 (%s) 與來源陣列在大小上有差異。"
 
-#: scripts/makepkg.sh.in:1361
+#: scripts/makepkg.sh.in:1338
 msgid "Integrity checks are missing."
 msgstr "遺失完整性檢驗。"
 
-#: scripts/makepkg.sh.in:1428
+#: scripts/makepkg.sh.in:1405
 msgid "Verifying source file signatures with %s..."
 msgstr "正以 %s 核對來源檔的簽章..."
 
-#: scripts/makepkg.sh.in:1453
+#: scripts/makepkg.sh.in:1430
 msgid "SIGNATURE NOT FOUND"
 msgstr "找不到簽章"
 
-#: scripts/makepkg.sh.in:1466
+#: scripts/makepkg.sh.in:1443
 msgid "SOURCE FILE NOT FOUND"
 msgstr "找不到來源檔"
 
-#: scripts/makepkg.sh.in:1493
+#: scripts/makepkg.sh.in:1470
 msgid "unknown public key"
 msgstr "未知公開金鑰"
 
-#: scripts/makepkg.sh.in:1496
+#: scripts/makepkg.sh.in:1473
 msgid "public key %s has been revoked"
 msgstr "公開金鑰 %s 已被撤銷"
 
-#: scripts/makepkg.sh.in:1499
+#: scripts/makepkg.sh.in:1476
 msgid "bad signature from public key"
 msgstr "以不良的公眾金鑰簽章"
 
-#: scripts/makepkg.sh.in:1502
+#: scripts/makepkg.sh.in:1479
 msgid "error during signature verification"
 msgstr "簽章核對過程發生錯誤"
 
-#: scripts/makepkg.sh.in:1508
+#: scripts/makepkg.sh.in:1485
 msgid "the public key %s is not trusted"
 msgstr "公開金鑰 %s 未受信任"
 
-#: scripts/makepkg.sh.in:1511
+#: scripts/makepkg.sh.in:1488
 msgid "invalid public key"
 msgstr "無效的公眾金鑰"
 
-#: scripts/makepkg.sh.in:1517
+#: scripts/makepkg.sh.in:1494
 msgid "the signature has expired."
 msgstr "簽章已經過期。"
 
-#: scripts/makepkg.sh.in:1521
+#: scripts/makepkg.sh.in:1498
 msgid "the key has expired."
 msgstr "金鑰已經過期。"
 
-#: scripts/makepkg.sh.in:1533
+#: scripts/makepkg.sh.in:1510
 msgid "One or more PGP signatures could not be verified!"
 msgstr "一份或多份 PGP 簽章無法通過核對！"
 
-#: scripts/makepkg.sh.in:1538
+#: scripts/makepkg.sh.in:1515
 msgid "Warnings have occurred while verifying the signatures."
 msgstr "核對簽章時曾有提出警告。"
 
-#: scripts/makepkg.sh.in:1539
+#: scripts/makepkg.sh.in:1516
 msgid "Please make sure you really trust them."
 msgstr "請確認您真的信任它們。"
 
-#: scripts/makepkg.sh.in:1545
+#: scripts/makepkg.sh.in:1522
 msgid "Skipping all source file integrity checks."
 msgstr "略過所有的來源檔案完整性檢驗。"
 
-#: scripts/makepkg.sh.in:1547
+#: scripts/makepkg.sh.in:1524
 msgid "Skipping verification of source file checksums."
 msgstr "略過來源檔案完整性校驗碼的核對。"
 
-#: scripts/makepkg.sh.in:1550
+#: scripts/makepkg.sh.in:1527
 msgid "Skipping verification of source file PGP signatures."
 msgstr "略過來源檔案 PGP 簽章的核對。"
 
-#: scripts/makepkg.sh.in:1559
+#: scripts/makepkg.sh.in:1536
 msgid "Extracting sources..."
 msgstr "正在抽出來源..."
 
-#: scripts/makepkg.sh.in:1592
+#: scripts/makepkg.sh.in:1569
 msgid "A failure occurred in %s()."
 msgstr "%s() 遭遇失敗。"
 
-#: scripts/makepkg.sh.in:1600
+#: scripts/makepkg.sh.in:1577
 msgid "Failed to change to directory %s"
 msgstr "無法切換至 %s 目錄"
 
-#: scripts/makepkg.sh.in:1609
+#: scripts/makepkg.sh.in:1586
 msgid "Failed to source %s"
 msgstr "%s 來源失敗"
 
-#: scripts/makepkg.sh.in:1671
+#: scripts/makepkg.sh.in:1651
 msgid "Starting %s()..."
 msgstr "正在啟動 %s()..."
 
-#: scripts/makepkg.sh.in:1796
+#: scripts/makepkg.sh.in:1776
 msgid "Tidying install..."
 msgstr "正在整理安裝..."
 
-#: scripts/makepkg.sh.in:1799
+#: scripts/makepkg.sh.in:1779
 msgid "Removing doc files..."
 msgstr "正在移除文件檔..."
 
-#: scripts/makepkg.sh.in:1804
+#: scripts/makepkg.sh.in:1784
 msgid "Purging unwanted files..."
 msgstr "正剷除不要的檔案..."
 
-#: scripts/makepkg.sh.in:1816
+#: scripts/makepkg.sh.in:1796
 msgid "Removing %s files..."
 msgstr "正在移除 %s 份檔案..."
 
-#: scripts/makepkg.sh.in:1821
+#: scripts/makepkg.sh.in:1801
 msgid "Removing static library files..."
 msgstr "正從靜態函式庫檔案中移除…"
 
-#: scripts/makepkg.sh.in:1831
+#: scripts/makepkg.sh.in:1811
 msgid "Removing empty directories..."
 msgstr "正在移除空白目錄..."
 
-#: scripts/makepkg.sh.in:1839
+#: scripts/makepkg.sh.in:1819
 msgid "%s entry file not in package : %s"
 msgstr "%s 記錄檔不在套件中：%s"
 
-#: scripts/makepkg.sh.in:1845 scripts/makepkg.sh.in:1848
+#: scripts/makepkg.sh.in:1825 scripts/makepkg.sh.in:1828
 msgid "Package contains reference to %s"
 msgstr "套件包含 %s 的參照"
 
-#: scripts/makepkg.sh.in:1852
+#: scripts/makepkg.sh.in:1832
 msgid "Compressing man and info pages..."
 msgstr "正在壓縮 man 與 info 頁面..."
 
-#: scripts/makepkg.sh.in:1880
+#: scripts/makepkg.sh.in:1860
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr "正從二進位檔與函式庫中去除不需要的符號連結..."
 
-#: scripts/makepkg.sh.in:1914
+#: scripts/makepkg.sh.in:1894
 msgid "Compressing binaries with %s..."
 msgstr "正以 %s 壓縮二進位檔..."
 
-#: scripts/makepkg.sh.in:1919
+#: scripts/makepkg.sh.in:1899
 msgid "Could not compress binary : %s"
 msgstr "無法壓縮二進位檔：%s"
 
-#: scripts/makepkg.sh.in:1976
+#: scripts/makepkg.sh.in:1956
 msgid "Library listed in %s is not required by any files: %s"
 msgstr "列在 %s 中的函式庫不被任何檔案需要：%s"
 
-#: scripts/makepkg.sh.in:2005
+#: scripts/makepkg.sh.in:1985
 msgid "Library listed in %s is not versioned: %s"
 msgstr "列在 %s 中的函式庫未標版本：%s"
 
-#: scripts/makepkg.sh.in:2018
+#: scripts/makepkg.sh.in:1998
 msgid "Library listed in %s is not a shared object: %s"
 msgstr "列在 %s 中的函式庫不是共享目標 (so)：%s"
 
-#: scripts/makepkg.sh.in:2033
+#: scripts/makepkg.sh.in:2013
 msgid "Cannot find library listed in %s: %s"
 msgstr "找不到 %s 所列的函式庫：%s"
 
-#: scripts/makepkg.sh.in:2147 scripts/makepkg.sh.in:2351
+#: scripts/makepkg.sh.in:2127 scripts/makepkg.sh.in:2331
 msgid "Generating %s file..."
 msgstr "正在生成 %s 檔..."
 
-#: scripts/makepkg.sh.in:2207
+#: scripts/makepkg.sh.in:2187
 msgid "Missing %s directory."
 msgstr "遺失 %s 目錄。"
 
-#: scripts/makepkg.sh.in:2213
+#: scripts/makepkg.sh.in:2193
 msgid "Creating package \"%s\"..."
 msgstr "正在建立「%s」套件..."
 
-#: scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2205
 msgid "Adding %s file..."
 msgstr "正在加入 %s 檔案..."
 
-#: scripts/makepkg.sh.in:2227
+#: scripts/makepkg.sh.in:2207
 msgid "Failed to add %s file to package."
 msgstr "無法將 %s 檔加入套件中。"
 
-#: scripts/makepkg.sh.in:2247
+#: scripts/makepkg.sh.in:2227
 msgid "Generating .MTREE file..."
 msgstr "正在生成 .MTREE 檔..."
 
-#: scripts/makepkg.sh.in:2253
+#: scripts/makepkg.sh.in:2233
 msgid "Compressing package..."
 msgstr "正在壓縮套件..."
 
-#: scripts/makepkg.sh.in:2268 scripts/makepkg.sh.in:2394
+#: scripts/makepkg.sh.in:2248 scripts/makepkg.sh.in:2374
 msgid "'%s' is not a valid archive extension."
 msgstr "「%s」並非有效的封存檔副檔名。"
 
-#: scripts/makepkg.sh.in:2276
+#: scripts/makepkg.sh.in:2256
 msgid "Failed to create package file."
 msgstr "套件檔案建立失敗。"
 
-#: scripts/makepkg.sh.in:2293
+#: scripts/makepkg.sh.in:2273
 msgid "Failed to create symlink to package file."
 msgstr "套件檔案的符號連結建立失敗。"
 
-#: scripts/makepkg.sh.in:2325
+#: scripts/makepkg.sh.in:2305
 msgid "Signing package..."
 msgstr "正在簽署套件..."
 
-#: scripts/makepkg.sh.in:2336
+#: scripts/makepkg.sh.in:2316
 msgid "Created signature file %s."
 msgstr "已建立簽章檔 %s。"
 
-#: scripts/makepkg.sh.in:2338
+#: scripts/makepkg.sh.in:2318
 msgid "Failed to sign package file."
 msgstr "套件檔案簽署失敗。"
 
-#: scripts/makepkg.sh.in:2344
+#: scripts/makepkg.sh.in:2324
 msgid "Creating source package..."
 msgstr "正在建立原始碼套件..."
 
-#: scripts/makepkg.sh.in:2348 scripts/makepkg.sh.in:2361
+#: scripts/makepkg.sh.in:2328 scripts/makepkg.sh.in:2341
 msgid "Adding %s..."
 msgstr "正在加入 %s..."
 
-#: scripts/makepkg.sh.in:2379
+#: scripts/makepkg.sh.in:2359
 msgid "Adding %s file (%s)..."
 msgstr "正在加入 %s 檔 (%s)..."
 
-#: scripts/makepkg.sh.in:2402
+#: scripts/makepkg.sh.in:2382
 msgid "Compressing source package..."
 msgstr "正在壓縮原始碼套件..."
 
-#: scripts/makepkg.sh.in:2405
+#: scripts/makepkg.sh.in:2385
 msgid "Failed to create source package file."
 msgstr "原始碼套件檔案建立失敗。"
 
-#: scripts/makepkg.sh.in:2422
+#: scripts/makepkg.sh.in:2402
 msgid "Failed to create symlink to source package file."
 msgstr "原始碼套件檔案的符號連結建立失敗。"
 
-#: scripts/makepkg.sh.in:2434
+#: scripts/makepkg.sh.in:2414
 msgid "Installing package %s with %s..."
-msgstr "正以 %2$s 安裝 %1$s 套件..."
+msgstr "正在安裝 %s 套件使用 %s..."
 
-#: scripts/makepkg.sh.in:2436
+#: scripts/makepkg.sh.in:2416
 msgid "Installing %s package group with %s..."
-msgstr "正以 %2$s 安裝 %1$s 套件群組..."
+msgstr "正在安裝 %s 套件群組使用 %s..."
 
-#: scripts/makepkg.sh.in:2454
+#: scripts/makepkg.sh.in:2434
 msgid "Failed to install built package(s)."
 msgstr "無法將 %s 檔加入套件中。"
 
-#: scripts/makepkg.sh.in:2546 scripts/makepkg.sh.in:2561
+#: scripts/makepkg.sh.in:2529 scripts/makepkg.sh.in:2544
 msgid "%s is not allowed to start with a hyphen."
 msgstr "不允許 %s 以 - 減號起頭。"
 
-#: scripts/makepkg.sh.in:2556 scripts/makepkg.sh.in:2580
-#: scripts/makepkg.sh.in:2869
+#: scripts/makepkg.sh.in:2539 scripts/makepkg.sh.in:2563
+#: scripts/makepkg.sh.in:2852
 msgid "%s is not allowed to be empty."
 msgstr "%s 不可以空白。"
 
-#: scripts/makepkg.sh.in:2565
+#: scripts/makepkg.sh.in:2548
 msgid "%s is not allowed to start with a dot."
 msgstr "%s 不允許以 . 點號起頭。"
 
-#: scripts/makepkg.sh.in:2569 scripts/makepkg.sh.in:2615
+#: scripts/makepkg.sh.in:2552 scripts/makepkg.sh.in:2598
 msgid "%s contains invalid characters: '%s'"
 msgstr "%s 包含無效字元：「%s」"
 
-#: scripts/makepkg.sh.in:2585
+#: scripts/makepkg.sh.in:2568
 msgid "%s must be a decimal, not %s."
 msgstr "%s 必須是小數，而不是 %s。"
 
-#: scripts/makepkg.sh.in:2601
+#: scripts/makepkg.sh.in:2584
 msgid "%s must be an integer, not %s."
 msgstr "%s 必須是整數，而不是 %s。"
 
-#: scripts/makepkg.sh.in:2622 scripts/makepkg.sh.in:2632
+#: scripts/makepkg.sh.in:2605 scripts/makepkg.sh.in:2615
 msgid "%s is not available for the '%s' architecture."
 msgstr "%s 並未提供「%s」架構使用。"
 
-#: scripts/makepkg.sh.in:2623
+#: scripts/makepkg.sh.in:2606
 msgid "Note that many packages may need a line added to their %s"
 msgstr "請注意許多套件可能需要在其 %s 中加入一列"
 
-#: scripts/makepkg.sh.in:2624
+#: scripts/makepkg.sh.in:2607
 msgid "such as %s."
 msgstr "如 %s。"
 
-#: scripts/makepkg.sh.in:2662
+#: scripts/makepkg.sh.in:2645
 msgid "%s array cannot contain comparison (< or >) operators."
 msgstr "%s 陣列不含比較運算子 (< 或 >)。"
 
-#: scripts/makepkg.sh.in:2682
+#: scripts/makepkg.sh.in:2665
 msgid "%s entry should not contain leading slash : %s"
 msgstr "%s 條目不應有起頭 / 斜線：%s"
 
-#: scripts/makepkg.sh.in:2715
+#: scripts/makepkg.sh.in:2698
 msgid "Invalid syntax for %s: '%s'"
 msgstr "%s 有無效的語法：「%s」"
 
-#: scripts/makepkg.sh.in:2728
+#: scripts/makepkg.sh.in:2711
 msgid "%s file (%s) does not exist or is not a regular file."
 msgstr "%s 檔 (%s) 不存在，或不是正規檔案。"
 
-#: scripts/makepkg.sh.in:2781
+#: scripts/makepkg.sh.in:2764
 msgid "%s array contains unknown option '%s'"
 msgstr "%s 陣列包含未知選項「%s」"
 
-#: scripts/makepkg.sh.in:2792
+#: scripts/makepkg.sh.in:2775
 msgid "Sparse arrays are not allowed for source"
 msgstr "來源不允許稀疏陣列"
 
-#: scripts/makepkg.sh.in:2802
+#: scripts/makepkg.sh.in:2785
 msgid "Requested package %s is not provided in %s"
 msgstr "需要的 %s 套件在 %s 中未提供"
 
-#: scripts/makepkg.sh.in:2815
+#: scripts/makepkg.sh.in:2798
 msgid "Missing %s function in %s"
-msgstr "%2$s 中遺失 %1$s 函式"
+msgstr "遺失 %s 函式於 %s 中"
 
-#: scripts/makepkg.sh.in:2821
+#: scripts/makepkg.sh.in:2804
 msgid "Missing %s function for split package '%s'"
 msgstr "遺失 %s 函式以切分「%s」套件"
 
-#: scripts/makepkg.sh.in:2862
+#: scripts/makepkg.sh.in:2845
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s 不允許包含 ; 分號，- 減號，或空白。"
 
-#: scripts/makepkg.sh.in:2907
+#: scripts/makepkg.sh.in:2890
 msgid "Cannot find the %s binary needed to check VCS source requirements."
 msgstr "找不到需要的 %s 函式庫以檢查 VCS 來源需求。"
 
-#: scripts/makepkg.sh.in:2925
+#: scripts/makepkg.sh.in:2918
 msgid "Cannot find the %s package needed to handle %s sources."
 msgstr "找不到需要的 %s 套件以處理 %s 個來源。"
 
-#: scripts/makepkg.sh.in:2948
+#: scripts/makepkg.sh.in:2941
 msgid "Cannot find the %s binary required for dependency operations."
 msgstr "找不到依賴關係操作需要的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:2956
+#: scripts/makepkg.sh.in:2949
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
 msgstr "找不到 %s 二進位檔。將使用 %s 以獲取 root 使用者特權。"
 
-#: scripts/makepkg.sh.in:2963
+#: scripts/makepkg.sh.in:2956
 msgid "Cannot find the %s binary."
 msgstr "找不到 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:2971
+#: scripts/makepkg.sh.in:2964
 msgid "Cannot find the %s binary required for signing packages."
 msgstr "找不到簽署套件所需要的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:2979
+#: scripts/makepkg.sh.in:2972
 msgid "Cannot find the %s binary required for verifying source files."
 msgstr "找不到核對來源檔案所需要的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:2987
+#: scripts/makepkg.sh.in:2980
 msgid "Cannot find the %s binary required for validating sourcefile checksums."
 msgstr "找不到核對來源檔完整性校驗碼所需要的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:2995
+#: scripts/makepkg.sh.in:2988
 msgid "Cannot find the %s binary required for compressing binaries."
 msgstr "找不到壓縮二進位檔所需要的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:3003
+#: scripts/makepkg.sh.in:2996
 msgid "Cannot find the %s binary required for distributed compilation."
 msgstr "找不到散布之編纂物所需的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:3011
+#: scripts/makepkg.sh.in:3004
 msgid "Cannot find the %s binary required for compiler cache usage."
 msgstr "找不到編譯器快取使用所需的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:3019
+#: scripts/makepkg.sh.in:3012
 msgid "Cannot find the %s binary required for object file stripping."
 msgstr "找不到目標檔去除所需的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:3027
+#: scripts/makepkg.sh.in:3020
 msgid "Cannot find the %s binary required for compressing man and info pages."
 msgstr "找不到壓縮 man 與 info 頁面所需的 %s 二進位檔。"
 
-#: scripts/makepkg.sh.in:3047
+#: scripts/makepkg.sh.in:3040
 msgid "A package has already been built, installing existing package..."
 msgstr "套件早已建置過，正在安裝既有的套件..."
 
-#: scripts/makepkg.sh.in:3051
+#: scripts/makepkg.sh.in:3044
 msgid "A package has already been built. (use %s to overwrite)"
 msgstr "套件早已建置過。(使用 %s 將之覆蓋)"
 
-#: scripts/makepkg.sh.in:3070
+#: scripts/makepkg.sh.in:3063
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "套件群組早已建置過，正在安裝既有的套件..."
 
-#: scripts/makepkg.sh.in:3074
+#: scripts/makepkg.sh.in:3067
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "套件群組早已建置過。(使用 %s 將之覆蓋)"
 
-#: scripts/makepkg.sh.in:3079
+#: scripts/makepkg.sh.in:3072
 msgid "Part of the package group has already been built. (use %s to overwrite)"
 msgstr "套件群組的其中一部份早已建置過。(使用 %s 將之覆蓋)"
 
-#: scripts/makepkg.sh.in:3149
+#: scripts/makepkg.sh.in:3142
 msgid "Make packages compatible for use with pacman"
 msgstr "讓套件可與 pacman 的使用相容"
 
-#: scripts/makepkg.sh.in:3151 scripts/pacman-db-upgrade.sh.in:37
+#: scripts/makepkg.sh.in:3144 scripts/pacman-db-upgrade.sh.in:40
 msgid "Usage: %s [options]"
 msgstr "用法：%s [選項]"
 
-#: scripts/makepkg.sh.in:3153 scripts/pacman-key.sh.in:81
+#: scripts/makepkg.sh.in:3146 scripts/pacman-key.sh.in:81
 msgid "Options:"
 msgstr "選項："
 
-#: scripts/makepkg.sh.in:3154
+#: scripts/makepkg.sh.in:3147
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
-msgstr "  -A, --ignorearch 忽略位在 %2$s 處的不完整 %1$s 欄位"
+msgstr "  -A, --ignorearch 忽略不完整 %s 欄位在 %s 處"
 
-#: scripts/makepkg.sh.in:3155
+#: scripts/makepkg.sh.in:3148
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      建置後清理工作檔案"
 
-#: scripts/makepkg.sh.in:3156
+#: scripts/makepkg.sh.in:3149
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
 msgstr "  -C, --cleanbuild 在建置套件之前移除 %s 目錄"
 
-#: scripts/makepkg.sh.in:3157
+#: scripts/makepkg.sh.in:3150
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     略過所有依賴關係檢查"
 
-#: scripts/makepkg.sh.in:3158
+#: scripts/makepkg.sh.in:3151
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
 msgstr "  -e, --noextract  不要抽出來源檔案 (使用既有的 %s 目錄)"
 
-#: scripts/makepkg.sh.in:3159
+#: scripts/makepkg.sh.in:3152
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆蓋既有的套件"
 
-#: scripts/makepkg.sh.in:3160
+#: scripts/makepkg.sh.in:3153
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   為來源檔案生成完整性校驗"
 
-#: scripts/makepkg.sh.in:3161
+#: scripts/makepkg.sh.in:3154
 msgid "  -h, --help       Show this help message and exit"
 msgstr "  -h, --help       顯示此說明訊息後離開"
 
-#: scripts/makepkg.sh.in:3162
+#: scripts/makepkg.sh.in:3155
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    建置成功後安裝套件"
 
-#: scripts/makepkg.sh.in:3163
+#: scripts/makepkg.sh.in:3156
 msgid "  -L, --log        Log package build process"
 msgstr "  -L, --log        紀錄套件建置過程"
 
-#: scripts/makepkg.sh.in:3164
+#: scripts/makepkg.sh.in:3157
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    停用色彩化輸出訊息"
 
-#: scripts/makepkg.sh.in:3165
+#: scripts/makepkg.sh.in:3158
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    僅只下載並抽出檔案"
 
-#: scripts/makepkg.sh.in:3166
+#: scripts/makepkg.sh.in:3159
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <file>        使用替代的建置指令稿 (不是用「%s」)"
 
-#: scripts/makepkg.sh.in:3167
+#: scripts/makepkg.sh.in:3160
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     在建置成功後移除安裝的依賴關係"
 
-#: scripts/makepkg.sh.in:3168
+#: scripts/makepkg.sh.in:3161
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  重新打包套件的內容但不重新建置"
 
-#: scripts/makepkg.sh.in:3169
+#: scripts/makepkg.sh.in:3162
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   以 %s 安裝缺少的依賴關係"
 
-#: scripts/makepkg.sh.in:3170
+#: scripts/makepkg.sh.in:3163
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr "  -S, --source     生成僅有源碼的 tarball，不含下載的來源檔案"
 
-#: scripts/makepkg.sh.in:3171
+#: scripts/makepkg.sh.in:3164
 msgid "  -V, --version    Show version information and exit"
 msgstr "  -V, --version    顯示版本資訊後離開"
 
-#: scripts/makepkg.sh.in:3172
+#: scripts/makepkg.sh.in:3165
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "  --allsource      生成僅有源碼的 tarball，內含下載的來源檔案"
 
-#: scripts/makepkg.sh.in:3173
+#: scripts/makepkg.sh.in:3166
 msgid "  --check          Run the %s function in the %s"
 msgstr "  --check          於 %s 中執行 %s "
 
-#: scripts/makepkg.sh.in:3174
+#: scripts/makepkg.sh.in:3167
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <檔案>  使用替代的設定檔 (而不是 '%s')"
 
-#: scripts/makepkg.sh.in:3175
+#: scripts/makepkg.sh.in:3168
 msgid "  --holdver        Do not update VCS sources"
 msgstr "  --holdver        不更新 VCS 來源檔案"
 
-#: scripts/makepkg.sh.in:3176
+#: scripts/makepkg.sh.in:3169
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
 msgstr "  --key <key>      指定一個金鑰用以簽署 %s ，而非使用預設的"
 
-#: scripts/makepkg.sh.in:3177
+#: scripts/makepkg.sh.in:3170
 msgid "  --noarchive      Do not create package archive"
 msgstr "  --noarchive      不要產生套件封裝檔"
 
-#: scripts/makepkg.sh.in:3178
+#: scripts/makepkg.sh.in:3171
 msgid "  --nocheck        Do not run the %s function in the %s"
-msgstr "  --nocheck        不執行 %2$s 的 %1$s 函數"
+msgstr "  --nocheck        不執行 %s 函數在 %s 中"
 
-#: scripts/makepkg.sh.in:3179
+#: scripts/makepkg.sh.in:3172
 msgid "  --noprepare      Do not run the %s function in the %s"
-msgstr "  --noprepare      不執行 %2$s 的 %1$s 函數"
+msgstr "  --noprepare      不執行 %s 函數在 %s 中"
 
-#: scripts/makepkg.sh.in:3180
+#: scripts/makepkg.sh.in:3173
 msgid "  --nosign         Do not create a signature for the package"
 msgstr "  --nosign         不產生套件的數位簽章"
 
-#: scripts/makepkg.sh.in:3181
+#: scripts/makepkg.sh.in:3174
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <list>     只從切分的套件中建立列出的套件"
 
-#: scripts/makepkg.sh.in:3182
+#: scripts/makepkg.sh.in:3175
 msgid "  --sign           Sign the resulting package with %s"
 msgstr "  --sign           以 %s 簽署產生的套件"
 
-#: scripts/makepkg.sh.in:3183
+#: scripts/makepkg.sh.in:3176
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  不要驗證原始檔案的校驗碼"
 
-#: scripts/makepkg.sh.in:3184
+#: scripts/makepkg.sh.in:3177
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
 msgstr "  --skipinteg      不要進行任何對原始檔案的驗證"
 
-#: scripts/makepkg.sh.in:3185
+#: scripts/makepkg.sh.in:3178
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "  --skippgpcheck   跳過原始檔案 PGP 簽章的核對"
 
-#: scripts/makepkg.sh.in:3186
+#: scripts/makepkg.sh.in:3179
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
 msgstr "  --verifysource   若必要的話下載程式碼並執行完整性檢查"
 
-#: scripts/makepkg.sh.in:3188
+#: scripts/makepkg.sh.in:3181
 msgid "These options can be passed to %s:"
 msgstr "這些選項可以傳給 %s："
 
-#: scripts/makepkg.sh.in:3190
+#: scripts/makepkg.sh.in:3183
 msgid "  --asdeps         Install packages as non-explicitly installed"
 msgstr "  --asdeps         視為相依性套件方式安裝"
 
-#: scripts/makepkg.sh.in:3191
+#: scripts/makepkg.sh.in:3184
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
 msgstr "  --needed         不重裝已經是最新的套件"
 
-#: scripts/makepkg.sh.in:3192
+#: scripts/makepkg.sh.in:3185
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "  --noconfirm      當需要解決相依性問題時不詢問確認"
 
-#: scripts/makepkg.sh.in:3193
+#: scripts/makepkg.sh.in:3186
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  當下載檔案時不顯示進度條"
 
-#: scripts/makepkg.sh.in:3195
+#: scripts/makepkg.sh.in:3188
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "若未指定 %s，則 %s 將查找「%s」"
 
-#: scripts/makepkg.sh.in:3201 scripts/pacman-optimize.sh.in:53
+#: scripts/makepkg.sh.in:3194 scripts/pacman-optimize.sh.in:53
 msgid ""
 "Copyright (c) 2006-2014 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
@@ -827,35 +818,35 @@ msgstr ""
 "權所有 (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>。\\n\\n這是自由軟體；請"
 "見源碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
-#: scripts/makepkg.sh.in:3302 scripts/repo-add.sh.in:612
+#: scripts/makepkg.sh.in:3295 scripts/repo-add.sh.in:612
 msgid "%s signal caught. Exiting..."
 msgstr "捕捉到 %s 訊號。離開中..."
 
-#: scripts/makepkg.sh.in:3326
+#: scripts/makepkg.sh.in:3319
 msgid "%s not found."
 msgstr "找不到 %s。"
 
-#: scripts/makepkg.sh.in:3374 scripts/makepkg.sh.in:3381
+#: scripts/makepkg.sh.in:3367 scripts/makepkg.sh.in:3374
 msgid "You do not have write permission to create packages in %s."
 msgstr "您尚未獲得在 %s 中建立套件的寫入許可。"
 
-#: scripts/makepkg.sh.in:3394
+#: scripts/makepkg.sh.in:3387
 msgid "You do not have write permission to store packages in %s."
 msgstr "您尚未獲得在 %s 中儲存套件的寫入許可。"
 
-#: scripts/makepkg.sh.in:3402
+#: scripts/makepkg.sh.in:3395
 msgid "You do not have write permission to store downloads in %s."
 msgstr "您尚未獲得在 %s 中儲存下載檔案的寫入許可。"
 
-#: scripts/makepkg.sh.in:3411
+#: scripts/makepkg.sh.in:3404
 msgid "You do not have write permission to store source tarballs in %s."
 msgstr "您尚未獲得在 %s 中儲存來源 tarball 的寫入許可。"
 
-#: scripts/makepkg.sh.in:3424
+#: scripts/makepkg.sh.in:3417
 msgid "You do not have write permission to store logs in %s."
 msgstr "您尚未獲得在 %s 中儲存記錄的寫入許可。"
 
-#: scripts/makepkg.sh.in:3437
+#: scripts/makepkg.sh.in:3430
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
@@ -863,79 +854,79 @@ msgstr ""
 "由於以 root 身份執行 %s 會導致永恆的、無法收拾的\\n悲劇性系統毀滅，所以抱歉不"
 "能允許。"
 
-#: scripts/makepkg.sh.in:3443
+#: scripts/makepkg.sh.in:3436
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "不要使用 %s 選項。這個選項僅可由 %s 使用。"
 
-#: scripts/makepkg.sh.in:3454
+#: scripts/makepkg.sh.in:3447
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: scripts/makepkg.sh.in:3458
+#: scripts/makepkg.sh.in:3451
 msgid "%s contains %s characters and cannot be sourced."
 msgstr "%s 包含 %s 個字元且無法作為來源。"
 
-#: scripts/makepkg.sh.in:3463
+#: scripts/makepkg.sh.in:3456
 msgid "%s must be in the current working directory."
 msgstr "%s 必須在目前的工作目錄中。"
 
-#: scripts/makepkg.sh.in:3544
+#: scripts/makepkg.sh.in:3537
 msgid "The key %s does not exist in your keyring."
 msgstr "%s 金鑰並不在您的鑰匙圈中。"
 
-#: scripts/makepkg.sh.in:3546 scripts/repo-add.sh.in:635
+#: scripts/makepkg.sh.in:3539 scripts/repo-add.sh.in:635
 msgid "There is no key in your keyring."
 msgstr "您的鑰匙圈中沒有金鑰。"
 
-#: scripts/makepkg.sh.in:3560 scripts/makepkg.sh.in:3578
+#: scripts/makepkg.sh.in:3553 scripts/makepkg.sh.in:3571
 msgid "Leaving %s environment."
 msgstr "正離開 %s 環境。"
 
-#: scripts/makepkg.sh.in:3582
+#: scripts/makepkg.sh.in:3575
 msgid "Making package: %s"
 msgstr "製作套件中：%s"
 
-#: scripts/makepkg.sh.in:3588
+#: scripts/makepkg.sh.in:3581
 msgid "A source package has already been built. (use %s to overwrite)"
 msgstr "原始碼套件早已建置過。(使用 %s 以將之覆蓋)"
 
-#: scripts/makepkg.sh.in:3607
+#: scripts/makepkg.sh.in:3600
 msgid "Source package created: %s"
 msgstr "已建立原始碼套件：%s"
 
-#: scripts/makepkg.sh.in:3614
+#: scripts/makepkg.sh.in:3607
 msgid "Skipping dependency checks."
 msgstr "略過依賴性關係檢查。"
 
-#: scripts/makepkg.sh.in:3622
+#: scripts/makepkg.sh.in:3615
 msgid "Checking runtime dependencies..."
 msgstr "正在檢查執行時期依賴關係..."
 
-#: scripts/makepkg.sh.in:3629
+#: scripts/makepkg.sh.in:3622
 msgid "Checking buildtime dependencies..."
 msgstr "正在檢查建置時期依賴關係..."
 
-#: scripts/makepkg.sh.in:3641
+#: scripts/makepkg.sh.in:3634
 msgid "Could not resolve all dependencies."
 msgstr "無法解析出所有的依賴關係。"
 
-#: scripts/makepkg.sh.in:3652
+#: scripts/makepkg.sh.in:3645
 msgid "Using existing %s tree"
 msgstr "使用既有的 %s 樹"
 
-#: scripts/makepkg.sh.in:3659 scripts/makepkg.sh.in:3680
+#: scripts/makepkg.sh.in:3652 scripts/makepkg.sh.in:3673
 msgid "Removing existing %s directory..."
 msgstr "正在移除既有的 %s 目錄..."
 
-#: scripts/makepkg.sh.in:3675
+#: scripts/makepkg.sh.in:3668
 msgid "Sources are ready."
 msgstr "來源檔案準備就緒。"
 
-#: scripts/makepkg.sh.in:3698
+#: scripts/makepkg.sh.in:3691
 msgid "Package directory is ready."
 msgstr "套件目錄準備就緒。"
 
-#: scripts/makepkg.sh.in:3702
+#: scripts/makepkg.sh.in:3695
 msgid "Finished making: %s"
 msgstr "製作完成：%s"
 
@@ -945,13 +936,8 @@ msgid "can't create '%s': %s"
 msgstr "無法建立「%s」：%s"
 
 #: scripts/makepkg-template.pl.in:73
-#, perl-format
-msgid ""
-"invalid key/value pair\n"
-"%s:%s: %s"
-msgstr ""
-"無效的鍵/值配對\n"
-"%s:%s：%s"
+msgid "invalid key/value pair\n"
+msgstr "無效的鍵/值配對\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
@@ -1031,39 +1017,39 @@ msgstr ""
 "這是自由軟體；請見源碼瞭解授權條款。\n"
 "於法律許可範圍之內「不予任何保證」。\n"
 
-#: scripts/pacman-db-upgrade.sh.in:35
+#: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
 msgstr "升級本地端 pacman 資料庫至新格式"
 
-#: scripts/pacman-db-upgrade.sh.in:39
+#: scripts/pacman-db-upgrade.sh.in:42
 msgid "options:"
 msgstr "選項："
 
-#: scripts/pacman-db-upgrade.sh.in:40
+#: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
 msgstr "  -b, --dbpath <path>  設定替換用資料庫位置"
 
-#: scripts/pacman-db-upgrade.sh.in:41
+#: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
 msgstr "  -h, --help                顯示此說明訊息後離開"
 
-#: scripts/pacman-db-upgrade.sh.in:42
+#: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
 msgstr "  -r, --root <path>    設定替換用安裝根基目錄"
 
-#: scripts/pacman-db-upgrade.sh.in:43
+#: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
 msgstr "  -V, --version        顯示版本資訊後離開"
 
-#: scripts/pacman-db-upgrade.sh.in:44
+#: scripts/pacman-db-upgrade.sh.in:47
 msgid "  --config <path>      set an alternate configuration file"
 msgstr "  --config <path>      設定替換用組態檔"
 
-#: scripts/pacman-db-upgrade.sh.in:45
+#: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
 msgstr "  --nocolor            停用色彩化輸出訊息"
 
-#: scripts/pacman-db-upgrade.sh.in:51 scripts/pacman-key.sh.in:94
+#: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
 "Copyright (c) 2010-2014 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
@@ -1072,36 +1058,36 @@ msgstr ""
 "著作權所有 (c) 2006-2014 Pacman 開發團隊 <pacman-dev@archlinux.org>。\\n\\n這"
 "是自由軟體；請見源碼瞭解授權規約。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
-#: scripts/pacman-db-upgrade.sh.in:129 scripts/pacman-optimize.sh.in:105
+#: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:459
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是目錄。"
 
-#: scripts/pacman-db-upgrade.sh.in:133
+#: scripts/pacman-db-upgrade.sh.in:136
 msgid "%s is not a pacman database directory."
 msgstr "%s 不是 pacman 資料庫目錄。"
 
-#: scripts/pacman-db-upgrade.sh.in:137
+#: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
 msgstr "您必須有適當的權限才得以升級資料庫。"
 
-#: scripts/pacman-db-upgrade.sh.in:147 scripts/pacman-optimize.sh.in:119
+#: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
 msgstr "發現 pacman 鎖定檔。當 pacman 在執行之時便無法執行。"
 
-#: scripts/pacman-db-upgrade.sh.in:159
+#: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
 msgstr "偵測到 pre-3.5 資料庫格式 - 升級中..."
 
-#: scripts/pacman-db-upgrade.sh.in:166
+#: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
 msgstr "完成。"
 
-#: scripts/pacman-db-upgrade.sh.in:183
+#: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
 msgstr "偵測到 pre-4.2 資料庫格式 - 升級中..."
 
-#: scripts/pacman-db-upgrade.sh.in:192
+#: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
 msgstr "「%s」符號連結指向 pacman 根基資料夾之外，需要手動修復"