Merge branch 'maint'

1 files changed, 248 insertions, 262 deletions

diff --git a/scripts/po/ja.po b/scripts/po/ja.po
index d94f1eb4..aefe0a1e 100644
--- a/scripts/po/ja.po
+++ b/scripts/po/ja.po
@@ -7,8 +7,8 @@ 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-20 15:31+0000\n"
+"POT-Creation-Date: 2015-02-14 11:18+1000\n"
+"PO-Revision-Date: 2015-02-14 09:21+0000\n"
 "Last-Translator: kusakata <shohei@kusakata.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/archlinux-"
 "pacman/language/ja/)\n"
@@ -18,8 +18,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 "警告:"
 
@@ -35,27 +35,26 @@ msgstr "Cleaning up..."
 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 "中止..."
 
@@ -95,647 +94,639 @@ 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 "ローカル URL は %s です"
-
-#: scripts/makepkg.sh.in:491
+#: scripts/makepkg.sh.in:474
 msgid "Pulling %s ..."
 msgstr "Pulling %s ..."
 
-#: scripts/makepkg.sh.in:495
+#: scripts/makepkg.sh.in:478
 msgid "Failure while pulling %s"
 msgstr "Failure while pulling %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 "NOT FOUND"
 
-#: 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) で source 行のサイズが異なっています。"
 
-#: 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 "SIGNATURE NOT FOUND"
 
-#: scripts/makepkg.sh.in:1466
+#: scripts/makepkg.sh.in:1443
 msgid "SOURCE FILE NOT FOUND"
 msgstr "SOURCE FILE NOT FOUND"
 
-#: 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 "source に失敗 %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 にリストされているライブラリは共有オブジェクトではありません: %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 "パッケージ %s を %s でインストール..."
 
-#: scripts/makepkg.sh.in:2436
+#: scripts/makepkg.sh.in:2416
 msgid "Installing %s package group with %s..."
 msgstr "%s パッケージグループを %s でインストール..."
 
-#: scripts/makepkg.sh.in:2454
+#: scripts/makepkg.sh.in:2434
 msgid "Failed to install built package(s)."
 msgstr "ビルドしたパッケージのインストールがされませんでした。"
 
-#: 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 "%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 ""
 "VCS ソースの必要条件をチェックするのに必要な %s バイナリが見つかりません。"
 
-#: 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 不完全な %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"
@@ -743,64 +734,64 @@ 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 <file>  指定した設定ファイルを使う (デフォルトは '%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        %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      %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"
@@ -808,36 +799,36 @@ 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 "
@@ -849,35 +840,35 @@ msgstr ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\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."
@@ -885,80 +876,80 @@ msgstr ""
 "%s を root で実行することはできません。\\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"
 
@@ -968,13 +959,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 ""
-"無効な key/value ペア\n"
-"%s:%s: %s"
+msgid "invalid key/value pair\n"
+msgstr "無効な key/value ペア\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
@@ -1057,39 +1043,39 @@ msgstr ""
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\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 "
@@ -1099,39 +1085,39 @@ msgstr ""
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\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 "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 ""
 "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 のルートの外になっています。手動で修正"