diff --git a/m4/estream.m4 b/m4/estream.m4
index 4b6c745aa..b61059a47 100644
--- a/m4/estream.m4
+++ b/m4/estream.m4
@@ -16,6 +16,7 @@ dnl
 AC_DEFUN([estream_PRINTF_INIT],
 [ 
   AC_MSG_NOTICE([checking system features for estream-printf])
+  AC_CHECK_HEADERS(stdint.h)
   AC_TYPE_LONG_LONG_INT  
   AC_TYPE_LONG_DOUBLE  
   AC_TYPE_INTMAX_T
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a007352d0..567987eb8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -45,28 +45,12 @@ msgstr "無法鎖定 `%s': %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: cipher/random.c:446
-#: g10/card-util.c:784
-#: g10/dearmor.c:59
-#: g10/dearmor.c:108
-#: g10/encode.c:182
-#: g10/encode.c:472
-#: g10/gpg.c:1015
-#: g10/gpg.c:3607
-#: g10/import.c:193
-#: g10/keygen.c:2572
-#: g10/keyring.c:1551
-#: g10/openfile.c:188
-#: g10/openfile.c:356
-#: g10/plaintext.c:490
-#: g10/sign.c:776
-#: g10/sign.c:969
-#: g10/sign.c:1083
-#: g10/sign.c:1234
-#: g10/tdbdump.c:139
-#: g10/tdbdump.c:147
-#: g10/tdbio.c:538
-#: g10/tdbio.c:604
+#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108
+#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607
+#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188
+#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969
+#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147
+#: g10/tdbio.c:538 g10/tdbio.c:604
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -98,25 +82,15 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未更新\n"
 
-#: cipher/random.c:542
-#: g10/card-util.c:830
-#: g10/exec.c:479
-#: g10/gpg.c:1014
-#: g10/keygen.c:3055
-#: g10/keygen.c:3085
-#: g10/keyring.c:1204
-#: g10/keyring.c:1527
-#: g10/openfile.c:277
-#: g10/openfile.c:371
-#: g10/sign.c:794
-#: g10/sign.c:1099
+#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014
+#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527
+#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099
 #: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:554
-#: cipher/random.c:564
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
@@ -179,18 +153,15 @@ msgstr "存放創生日期失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: g10/app-openpgp.c:1157
-#: g10/app-openpgp.c:2875
+#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: g10/app-openpgp.c:1165
-#: g10/app-openpgp.c:2883
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: g10/app-openpgp.c:1174
-#: g10/app-openpgp.c:2893
+#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
@@ -209,44 +180,32 @@ msgstr "以 %s 做為預設個人識別碼 (PIN) 時失敗: %s - 正在停用接
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: g10/app-openpgp.c:1527
-#: g10/app-openpgp.c:1981
+#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981
 msgid "||Please enter the PIN"
 msgstr "||請輸入 PIN"
 
-#: g10/app-openpgp.c:1542
-#: g10/app-openpgp.c:1561
-#: g10/app-openpgp.c:1722
-#: g10/app-openpgp.c:1739
-#: g10/app-openpgp.c:1987
-#: g10/app-openpgp.c:2032
+#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722
+#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:1568
-#: g10/app-openpgp.c:1746
-#: g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: g10/app-openpgp.c:1581
-#: g10/app-openpgp.c:1620
-#: g10/app-openpgp.c:1758
+#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758
 #: g10/app-openpgp.c:3193
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: g10/app-openpgp.c:1649
-#: g10/app-openpgp.c:2013
-#: g10/app-openpgp.c:3489
+#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:1655
-#: g10/app-openpgp.c:3498
+#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
@@ -270,8 +229,7 @@ msgstr "|A|請輸入管理者 PIN"
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: g10/app-openpgp.c:2022
-#: g10/card-util.c:108
+#: g10/app-openpgp.c:2022 g10/card-util.c:108
 msgid "Reset Code not or not anymore available\n"
 msgstr "沒有重設碼或無法再用重設碼\n"
 
@@ -279,8 +237,7 @@ msgstr "沒有重設碼或無法再用重設碼\n"
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片重設碼"
 
-#: g10/app-openpgp.c:2038
-#: g10/app-openpgp.c:2090
+#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
@@ -302,13 +259,11 @@ msgstr "|N|新增 PIN"
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: g10/app-openpgp.c:2171
-#: g10/app-openpgp.c:2961
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: g10/app-openpgp.c:2177
-#: g10/app-openpgp.c:2968
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
@@ -342,8 +297,7 @@ msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: g10/app-openpgp.c:2662
-#: g10/app-openpgp.c:2670
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
@@ -385,11 +339,11 @@ msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
 #: g10/app-openpgp.c:3503
-msgid "verification of Admin PIN is currently prohibited through this command\n"
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者個人識別碼 (PIN) 驗證被禁止了\n"
 
-#: g10/app-openpgp.c:3728
-#: g10/app-openpgp.c:3739
+#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -427,8 +381,7 @@ msgstr "未預期的封裝: "
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:813
-#: g10/armor.c:1423
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 已跳過\n"
@@ -445,8 +398,7 @@ msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:902
-#: g10/armor.c:1460
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
@@ -469,11 +421,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
 #: g10/armor.c:1246
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:85
-#: g10/card-util.c:371
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -483,13 +435,8 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:98
-#: g10/card-util.c:1770
-#: g10/delkey.c:126
-#: g10/keyedit.c:1516
-#: g10/keygen.c:2756
-#: g10/revoke.c:216
-#: g10/revoke.c:454
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -497,19 +444,13 @@ msgstr "無法在批次模式中這樣做\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "這個指令僅能用於第二版卡片\n"
 
-#: g10/card-util.c:141
-#: g10/card-util.c:1455
-#: g10/card-util.c:1565
-#: g10/keyedit.c:423
-#: g10/keyedit.c:444
-#: g10/keyedit.c:458
-#: g10/keygen.c:1434
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434
 #: g10/keygen.c:1514
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:269
-#: g10/card-util.c:319
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未設定]"
 
@@ -572,8 +513,7 @@ msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "分派足夠的記憶體時出錯: %s\n"
 
-#: g10/card-util.c:803
-#: g10/import.c:279
+#: g10/card-util.c:803 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
@@ -672,15 +612,12 @@ msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1306
-#: g10/keygen.c:1648
-#: g10/keygen.c:1654
+#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/card-util.c:1314
-#: g10/keygen.c:1635
+#: g10/card-util.c:1314 g10/keygen.c:1635
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@ -722,28 +659,20 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1448
-#: g10/card-util.c:1556
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1449
-#: g10/card-util.c:1558
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1450
-#: g10/card-util.c:1560
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1466
-#: g10/card-util.c:1585
-#: g10/keyedit.c:938
-#: g10/keygen.c:1438
-#: g10/keygen.c:1466
-#: g10/keygen.c:1567
-#: g10/revoke.c:681
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938
+#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -768,8 +697,7 @@ msgstr "私鑰已經存放在卡片上了\n"
 msgid "error writing key to card: %s\n"
 msgstr "金鑰寫入卡片時出錯: %s\n"
 
-#: g10/card-util.c:1679
-#: g10/keyedit.c:1349
+#: g10/card-util.c:1679 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -777,8 +705,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1682
-#: g10/keyedit.c:1352
+#: g10/card-util.c:1682 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -834,8 +761,7 @@ msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 msgid "unblock the PIN using a Reset Code"
 msgstr "以重設碼來解開個人識別碼 (PIN) 鎖定狀態"
 
-#: g10/card-util.c:1820
-#: g10/keyedit.c:1619
+#: g10/card-util.c:1820 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "指令> "
 
@@ -851,8 +777,7 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1985
-#: g10/keyedit.c:2242
+#: g10/card-util.c:1985 g10/keyedit.c:2242
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -906,43 +831,29 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 msgid "PIN not correctly repeated; try again"
 msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 
-#: g10/decrypt.c:67
-#: g10/decrypt.c:158
-#: g10/gpg.c:3970
-#: g10/keyring.c:375
-#: g10/keyring.c:666
-#: g10/verify.c:101
-#: g10/verify.c:156
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
+#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:103
-#: g10/encode.c:823
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/delkey.c:73
-#: g10/export.c:309
-#: g10/keyedit.c:3390
-#: g10/keyserver.c:1741
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81
-#: g10/export.c:339
-#: g10/import.c:2378
-#: g10/keyserver.c:1755
-#: g10/revoke.c:232
-#: g10/revoke.c:476
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時出錯: %s\n"
 
-#: g10/delkey.c:127
-#: g10/delkey.c:134
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非你用指紋指定了金鑰)\n"
 
@@ -976,8 +887,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:211
-#: g10/sign.c:1254
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
@@ -991,15 +901,12 @@ msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encode.c:239
-#: g10/encode.c:534
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:290
-#: g10/encode.c:568
-#: g10/sign.c:559
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是個空檔案\n"
@@ -1014,18 +921,21 @@ msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
 #: g10/encode.c:506
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "你正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:516
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:612
-#: g10/sign.c:931
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:699
@@ -1033,9 +943,7 @@ msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:769
-#: g10/pkclist.c:805
-#: g10/pkclist.c:853
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "你不能夠將 %s 用於 %s 模式中\n"
@@ -1045,20 +953,19 @@ msgstr "你不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encr-data.c:89
-#: g10/mainproc.c:296
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/encr-data.c:91
-#: g10/mainproc.c:300
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
 #: g10/encr-data.c:115
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:126
@@ -1069,14 +976,14 @@ msgstr "處理已加密封包有問題\n"
 msgid "no remote program execution supported\n"
 msgstr "沒有支援的遠端程式執行\n"
 
-#: g10/exec.c:174
-#: g10/openfile.c:429
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
 #: g10/exec.c:315
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
 #: g10/exec.c:345
@@ -1098,8 +1005,7 @@ msgstr "無法執行 shell `%s': %s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:522
-#: g10/exec.c:588
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
@@ -1112,8 +1018,7 @@ msgstr "無法執行外部程式\n"
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:599
-#: g10/exec.c:606
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
@@ -1313,8 +1218,7 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:444
-#: g10/gpgv.c:68
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1348,8 +1252,7 @@ msgstr "使用標準的文字模式"
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:481
-#: g10/gpgv.c:70
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -1397,10 +1300,10 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:769
-#: g10/gpgv.c:95
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
+msgstr ""
+"請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
 #: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
@@ -1428,8 +1331,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:809
-#: g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2308
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1437,8 +1339,7 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:821
-#: g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2354
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -1492,7 +1393,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1294
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1297
@@ -1507,7 +1409,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1306
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1309
@@ -1584,9 +1487,7 @@ msgstr "選項檔 `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: g10/gpg.c:2292
-#: g10/gpg.c:2953
-#: g10/gpg.c:2972
+#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
@@ -1596,8 +1497,7 @@ msgstr "請注意: 一般情況下不會用到 %s!\n"
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未載入\n"
 
-#: g10/gpg.c:2494
-#: g10/gpg.c:2506
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
@@ -1607,9 +1507,7 @@ msgstr "`%s' 不是個有效的簽章使用期限\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2607
-#: g10/gpg.c:2796
-#: g10/keyedit.c:4084
+#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
@@ -1761,13 +1659,11 @@ msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3087
-#: g10/gpg.c:3111
+#: g10/gpg.c:3087 g10/gpg.c:3111
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3093
-#: g10/gpg.c:3117
+#: g10/gpg.c:3093 g10/gpg.c:3117
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -1999,10 +1895,7 @@ msgstr "pk 快取裡有太多項目 - 已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:946
-#: g10/getkey.c:956
-#: g10/getkey.c:966
-#: g10/getkey.c:982
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
 #: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
@@ -2013,8 +1906,7 @@ msgstr "已自動取回 `%s' (經由 %s )\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2435
-#: g10/keyedit.c:3726
+#: g10/getkey.c:2435 g10/keyedit.c:3726
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -2082,7 +1974,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果你無論如何都想要用這把未被信任的金鑰, 請回答 \"yes\"."
 
 #: g10/helptext.c:64
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入你要遞送的訊息接收者的使用者 ID."
 
 #: g10/helptext.c:68
@@ -2123,13 +2016,8 @@ msgstr ""
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰尺寸"
 
-#: g10/helptext.c:93
-#: g10/helptext.c:98
-#: g10/helptext.c:110
-#: g10/helptext.c:142
-#: g10/helptext.c:170
-#: g10/helptext.c:175
-#: g10/helptext.c:180
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
@@ -2180,26 +2068,36 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -2522,8 +2420,7 @@ msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719
-#: g10/import.c:1117
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
@@ -2547,8 +2444,7 @@ msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:781
-#: g10/import.c:1239
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
@@ -2563,20 +2459,13 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:801
-#: g10/openfile.c:281
-#: g10/sign.c:799
-#: g10/sign.c:1104
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "寫入 `%s' 中\n"
 
-#: g10/import.c:805
-#: g10/import.c:900
-#: g10/import.c:1157
-#: g10/import.c:1300
-#: g10/import.c:2392
-#: g10/import.c:2414
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2392 g10/import.c:2414
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
@@ -2591,14 +2480,12 @@ msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:865
-#: g10/import.c:1257
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:873
-#: g10/import.c:1264
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
@@ -2667,8 +2554,7 @@ msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:1151
-#: g10/import.c:2407
+#: g10/import.c:1151 g10/import.c:2407
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -2723,8 +2609,7 @@ msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 
-#: g10/import.c:1419
-#: g10/import.c:1469
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
@@ -2840,8 +2725,7 @@ msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' 鑰匙圈已建立\n"
 
-#: g10/keydb.c:319
-#: g10/keydb.c:322
+#: g10/keydb.c:319 g10/keydb.c:322
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' 金鑰區塊資源: %s\n"
@@ -2859,35 +2743,29 @@ msgstr "[撤銷]"
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:343
-#: g10/keylist.c:388
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 份損壞的簽章\n"
 
-#: g10/keyedit.c:345
-#: g10/keylist.c:390
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 份損壞的簽章\n"
 
-#: g10/keyedit.c:347
-#: g10/keylist.c:392
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:349
-#: g10/keylist.c:394
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351
-#: g10/keylist.c:396
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因錯誤而未被檢查\n"
 
-#: g10/keyedit.c:353
-#: g10/keylist.c:398
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因錯誤而未被檢查\n"
@@ -2901,23 +2779,22 @@ msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:413
-#: g10/pkclist.c:265
+#: g10/keyedit.c:413 g10/pkclist.c:265
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:417
-#: g10/pkclist.c:277
+#: g10/keyedit.c:417 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:418
-#: g10/pkclist.c:279
+#: g10/keyedit.c:418 g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
@@ -2941,19 +2818,12 @@ msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
 
-#: g10/keyedit.c:607
-#: g10/keyedit.c:635
-#: g10/keyedit.c:662
-#: g10/keyedit.c:828
-#: g10/keyedit.c:888
-#: g10/keyedit.c:1738
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "你仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:621
-#: g10/keyedit.c:649
-#: g10/keyedit.c:676
-#: g10/keyedit.c:834
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
 #: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
@@ -3049,7 +2919,9 @@ msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
 
 #: g10/keyedit.c:881
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "你不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
 #: g10/keyedit.c:883
@@ -3058,7 +2930,8 @@ msgstr "這會讓這把金鑰在 PGP 2.x 模式下無法使用.\n"
 
 #: g10/keyedit.c:908
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
@@ -3133,12 +3006,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1059
-#: g10/keyedit.c:4833
-#: g10/keyedit.c:4924
-#: g10/keyedit.c:4988
-#: g10/keyedit.c:5049
-#: g10/sign.c:317
+#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988
+#: g10/keyedit.c:5049 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -3147,24 +3016,19 @@ msgstr "簽署時失敗: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1135
-#: g10/keygen.c:3412
+#: g10/keyedit.c:1135 g10/keygen.c:3412
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1139
-#: g10/keygen.c:3400
-#: g10/revoke.c:535
+#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1143
-#: g10/keygen.c:3415
+#: g10/keyedit.c:1143 g10/keygen.c:3415
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1147
-#: g10/keygen.c:3419
+#: g10/keyedit.c:1147 g10/keygen.c:3419
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3181,8 +3045,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1186
-#: g10/keygen.c:2004
+#: g10/keyedit.c:1186 g10/keygen.c:2004
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3373,7 +3236,8 @@ msgstr "請先使用 \"toggle\" 指令.\n"
 
 #: g10/keyedit.c:1692
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
@@ -3403,9 +3267,7 @@ msgstr "未知的 `%s' 簽章種類\n"
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1812
-#: g10/keyedit.c:1832
-#: g10/keyedit.c:1998
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "你至少得選擇一個使用者 ID.\n"
 
@@ -3525,13 +3387,11 @@ msgstr "特點: "
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2409
-#: g10/keylist.c:306
+#: g10/keyedit.c:2409 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2417
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2417 g10/keyedit.c:2418
 msgid "Notations: "
 msgstr "註記: "
 
@@ -3553,45 +3413,27 @@ msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2730
-#: g10/keyedit.c:2786
-#: g10/keyedit.c:2847
-#: g10/keyedit.c:2862
-#: g10/keylist.c:192
-#: g10/keyserver.c:520
+#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:192 g10/keyserver.c:520
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2733
-#: g10/keylist.c:784
-#: g10/keylist.c:878
-#: g10/mainproc.c:997
+#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2735
-#: g10/keylist.c:755
-#: g10/keylist.c:790
-#: g10/keylist.c:884
+#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2737
-#: g10/keyedit.c:2788
-#: g10/keyedit.c:2849
-#: g10/keyedit.c:2864
-#: g10/keylist.c:194
-#: g10/keylist.c:761
-#: g10/keylist.c:796
-#: g10/keylist.c:890
-#: g10/keylist.c:911
-#: g10/keyserver.c:526
-#: g10/mainproc.c:1003
+#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890
+#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
@@ -3615,8 +3457,7 @@ msgstr "有效性: %s"
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2793
-#: g10/keylist.c:198
+#: g10/keyedit.c:2793 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
@@ -3628,21 +3469,13 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:2881
-#: g10/keyedit.c:3227
-#: g10/keyserver.c:530
-#: g10/mainproc.c:1816
-#: g10/trustdb.c:1198
-#: g10/trustdb.c:1718
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530
+#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2883
-#: g10/keyedit.c:3229
-#: g10/keyserver.c:534
-#: g10/mainproc.c:1818
-#: g10/trustdb.c:551
-#: g10/trustdb.c:1720
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534
+#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720
 msgid "expired"
 msgstr "已過期"
 
@@ -3656,14 +3489,14 @@ msgstr ""
 
 #: g10/keyedit.c:3009
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3014
-#: g10/keyedit.c:3349
+#: g10/keyedit.c:3014 g10/keyedit.c:3349
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
@@ -3701,8 +3534,7 @@ msgstr "已經刪除了 %d 份簽章.\n"
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3231
-#: g10/trustdb.c:1722
+#: g10/keyedit.c:3231 g10/trustdb.c:1722
 msgid "invalid"
 msgstr "無效"
 
@@ -3733,7 +3565,8 @@ msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
 #: g10/keyedit.c:3344
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
@@ -3767,7 +3600,8 @@ msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
 #: g10/keyedit.c:3462
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
 #: g10/keyedit.c:3524
@@ -3808,10 +3642,7 @@ msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3895
-#: g10/keyedit.c:4005
-#: g10/keyedit.c:4125
-#: g10/keyedit.c:4266
+#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
@@ -3856,16 +3687,12 @@ msgstr "索引 %d 沒有對應到子鑰\n"
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4645
-#: g10/keyedit.c:4739
-#: g10/keyedit.c:4782
+#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4647
-#: g10/keyedit.c:4741
-#: g10/keyedit.c:4784
+#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
@@ -3971,19 +3798,13 @@ msgstr "寫入自我簽章中\n"
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1052
-#: g10/keygen.c:1135
-#: g10/keygen.c:1140
-#: g10/keygen.c:1265
+#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265
 #: g10/keygen.c:2952
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1057
-#: g10/keygen.c:1146
-#: g10/keygen.c:1154
-#: g10/keygen.c:1270
+#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270
 #: g10/keygen.c:2958
 #, c-format
 msgid "keysize rounded up to %u bits\n"
@@ -4152,8 +3973,7 @@ msgstr "金鑰的有效期限是多久? (0) "
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1776
-#: g10/keygen.c:1801
+#: g10/keygen.c:1776 g10/keygen.c:1801
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
@@ -4190,7 +4010,8 @@ msgstr "以上正確嗎? (y/N) "
 #: g10/keygen.c:1822
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -4288,8 +4109,7 @@ msgstr ""
 "你需要一個密語來保護你的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2005
-#: g10/passphrase.c:808
+#: g10/keygen.c:2005 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4321,20 +4141,17 @@ msgstr ""
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3098
-#: g10/keygen.c:3265
+#: g10/keygen.c:3098 g10/keygen.c:3265
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3100
-#: g10/keygen.c:3268
+#: g10/keygen.c:3100 g10/keygen.c:3268
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3103
-#: g10/keygen.c:3271
+#: g10/keygen.c:3103 g10/keygen.c:3271
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
@@ -4371,34 +4188,28 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3331
-#: g10/keygen.c:3463
-#: g10/keygen.c:3580
+#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3383
-#: g10/keygen.c:3513
-#: g10/sign.c:242
+#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3385
-#: g10/keygen.c:3515
-#: g10/sign.c:244
+#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3394
-#: g10/keygen.c:3526
+#: g10/keygen.c:3394 g10/keygen.c:3526
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3433
-#: g10/keygen.c:3559
+#: g10/keygen.c:3433 g10/keygen.c:3559
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
@@ -4417,10 +4228,7 @@ msgstr "無法建立備份檔案 `%s': %s\n"
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:496
-#: g10/keyid.c:508
-#: g10/keyid.c:520
-#: g10/keyid.c:532
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "永遠不過期"
 
@@ -4467,8 +4275,7 @@ msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1533
-#: g10/keylist.c:1537
+#: g10/keylist.c:1533 g10/keylist.c:1537
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
@@ -4560,8 +4367,7 @@ msgstr "已停用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:817
-#: g10/keyserver.c:1462
+#: g10/keyserver.c:817 g10/keyserver.c:1462
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
@@ -4615,8 +4421,7 @@ msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1422
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1422 g10/keyserver.c:1518
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
@@ -4629,8 +4434,7 @@ msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1541
-#: g10/keyserver.c:2063
+#: g10/keyserver.c:1541 g10/keyserver.c:2063
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
@@ -4666,8 +4470,7 @@ msgstr "金鑰伺服器內部錯誤\n"
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1618
-#: g10/keyserver.c:1652
+#: g10/keyserver.c:1618 g10/keyserver.c:1652
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
@@ -4726,8 +4529,7 @@ msgstr "公鑰加密過的資料: 完好的 DEK\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:486
-#: g10/pkclist.c:220
+#: g10/mainproc.c:486 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
@@ -4751,8 +4553,7 @@ msgstr "已用 %lu 個密語加密了\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:551
-#: g10/mainproc.c:573
+#: g10/mainproc.c:551 g10/mainproc.c:573
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
@@ -4827,20 +4628,17 @@ msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1719
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1719 g10/mainproc.c:1767
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1721
-#: g10/mainproc.c:1769
+#: g10/mainproc.c:1721 g10/mainproc.c:1769
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1723
-#: g10/mainproc.c:1771
+#: g10/mainproc.c:1723 g10/mainproc.c:1771
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
@@ -4877,8 +4675,7 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1917
-#: g10/trustdb.c:550
+#: g10/mainproc.c:1917 g10/trustdb.c:550
 msgid "unknown"
 msgstr "未知"
 
@@ -4887,14 +4684,13 @@ msgstr "未知"
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2006
-#: g10/mainproc.c:2022
-#: g10/mainproc.c:2108
+#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
 #: g10/mainproc.c:2049
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
 #: g10/mainproc.c:2057
@@ -4915,9 +4711,7 @@ msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:140
-#: g10/misc.c:168
-#: g10/misc.c:240
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
@@ -4950,10 +4744,7 @@ msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:459
-#: g10/misc.c:477
-#: g10/misc.c:492
-#: g10/sig-check.c:101
+#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
@@ -5085,14 +4876,11 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:377
-#: g10/passphrase.c:653
-#: g10/passphrase.c:743
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 停用代理程式中\n"
 
-#: g10/passphrase.c:530
-#: g10/passphrase.c:912
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -5120,13 +4908,11 @@ msgstr "請輸入密語\n"
 msgid "cancelled by user\n"
 msgstr "由使用者所取消\n"
 
-#: g10/passphrase.c:803
-#: g10/passphrase.c:972
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:810
-#: g10/passphrase.c:977
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
@@ -5202,28 +4988,23 @@ msgstr "沒有設定照片檢視程式\n"
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:63
-#: g10/revoke.c:619
+#: g10/pkclist.c:63 g10/revoke.c:619
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:65
-#: g10/revoke.c:621
+#: g10/pkclist.c:65 g10/revoke.c:621
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:67
-#: g10/revoke.c:620
+#: g10/pkclist.c:67 g10/revoke.c:620
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:69
-#: g10/revoke.c:622
+#: g10/pkclist.c:69 g10/revoke.c:622
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:71
-#: g10/revoke.c:623
+#: g10/pkclist.c:71 g10/revoke.c:623
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -5250,7 +5031,8 @@ msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
 #: g10/pkclist.c:258
-msgid "How much do you trust that this key actually belongs to the named user?\n"
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
 msgstr "你有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
 #: g10/pkclist.c:273
@@ -5289,8 +5071,7 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:301
-#: g10/revoke.c:648
+#: g10/pkclist.c:301 g10/revoke.c:648
 msgid "Your decision? "
 msgstr "你的決定是甚麼? "
 
@@ -5389,7 +5170,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
 #: g10/pkclist.c:606
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
 #: g10/pkclist.c:614
@@ -5401,23 +5183,20 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
 #: g10/pkclist.c:623
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
 #: g10/pkclist.c:625
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:824
-#: g10/pkclist.c:866
-#: g10/pkclist.c:1078
-#: g10/pkclist.c:1148
+#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:836
-#: g10/pkclist.c:1116
+#: g10/pkclist.c:836 g10/pkclist.c:1116
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已存在\n"
@@ -5442,8 +5221,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:971
-#: g10/pkclist.c:1045
+#: g10/pkclist.c:971 g10/pkclist.c:1045
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
@@ -5473,9 +5251,7 @@ msgstr "沒有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 
-#: g10/plaintext.c:139
-#: g10/plaintext.c:144
-#: g10/plaintext.c:162
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
@@ -5533,12 +5309,8 @@ msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已撤銷"
 
-#: g10/revoke.c:102
-#: g10/revoke.c:116
-#: g10/revoke.c:128
-#: g10/revoke.c:174
-#: g10/revoke.c:186
-#: g10/revoke.c:584
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:584
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -5560,13 +5332,11 @@ msgstr "(這是把機密的撤銷金鑰)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:327
-#: g10/revoke.c:550
+#: g10/revoke.c:327 g10/revoke.c:550
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:342
-#: g10/revoke.c:564
+#: g10/revoke.c:342 g10/revoke.c:564
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -5735,12 +5505,14 @@ msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
 #: g10/sig-check.c:203
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:205
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:215
@@ -5770,12 +5542,15 @@ msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:116
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:139
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:312
@@ -5794,7 +5569,8 @@ msgstr "你在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分
 
 #: g10/sign.c:830
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
 #: g10/sign.c:956
@@ -5810,8 +5586,7 @@ msgstr "你在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:126
-#: g10/skclist.c:190
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
@@ -5820,9 +5595,7 @@ msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:165
-#: g10/skclist.c:175
-#: g10/skclist.c:184
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
@@ -5835,8 +5608,7 @@ msgstr "已跳過: 私鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:58
-#: g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -5850,10 +5622,7 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:158
-#: g10/tdbdump.c:166
-#: g10/tdbdump.c:171
-#: g10/tdbdump.c:176
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
@@ -5884,20 +5653,17 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:226
-#: g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:127
-#: g10/tdbio.c:1444
+#: g10/tdbio.c:127 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:133
-#: g10/tdbio.c:1451
+#: g10/tdbio.c:133 g10/tdbio.c:1451
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -5916,15 +5682,12 @@ msgstr "無法存取 `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:521
-#: g10/tdbio.c:544
-#: g10/tdbio.c:587
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:523
-#: g10/tdbio.c:590
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
@@ -5963,13 +5726,8 @@ msgstr "%s: 建立雜湊表失敗: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:675
-#: g10/tdbio.c:695
-#: g10/tdbio.c:711
-#: g10/tdbio.c:725
-#: g10/tdbio.c:755
-#: g10/tdbio.c:1377
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725
+#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
@@ -6099,8 +5857,7 @@ msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:528
-#: g10/trustdb.c:533
+#: g10/trustdb.c:528 g10/trustdb.c:533
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
@@ -6148,8 +5905,7 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:602
-#: g10/trustdb.c:2468
+#: g10/trustdb.c:602 g10/trustdb.c:2468
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -6164,8 +5920,7 @@ msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:858
-#: g10/trustdb.c:1296
+#: g10/trustdb.c:858 g10/trustdb.c:1296
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
@@ -6199,7 +5954,8 @@ msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小
 
 #: g10/trustdb.c:2399
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
 #: g10/trustdb.c:2474
@@ -6461,24 +6217,20 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:380
-#: util/miscutil.c:417
+#: util/miscutil.c:380 util/miscutil.c:417
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:381
-#: util/miscutil.c:422
+#: util/miscutil.c:381 util/miscutil.c:422
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:383
-#: util/miscutil.c:419
+#: util/miscutil.c:383 util/miscutil.c:419
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:384
-#: util/miscutil.c:423
+#: util/miscutil.c:384 util/miscutil.c:423
 msgid "nN"
 msgstr "nN"
 
@@ -6527,35 +6279,48 @@ msgstr "(也許你選錯程式來做這件事了)\n"
 
 #~ msgid "DSA keypair will have %u bits.\n"
 #~ msgstr "DSA 金鑰對會有 %u 位元長.\n"
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
+
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|管理者 PIN"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
+
 #~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+
 #~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
+
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
 #~ msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+
 #~ msgid "a user notation name must contain the '@' character\n"
 #~ msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+
 #~ msgid "a notation name must not contain more than one '@' character\n"
 #~ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+
 #~ msgid "a notation value must not use any control characters\n"
 #~ msgstr "標記值一定不能使用任何的控制字符\n"
+
 #~ msgid "WARNING: invalid notation data found\n"
 #~ msgstr "警告: 找到無效的標記資料\n"
+
 #~ msgid "not human readable"
 #~ msgstr "不是人類能讀得懂的"
+
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
-
diff --git a/util/ChangeLog b/util/ChangeLog
index be3a4bf35..152b859e3 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-03  Werner Koch  <wk@g10code.com>
+
+	* estream-printf.c: Include stdint.h only if HAVE_STDINT_H is
+	defined.  Problem reported by Nelson H. F. Beebe.
+	* estream.m4: Check for stdint.h.
+
+	* estream-printf.c: Remove all test code.  Use macro DEBUG instead
+	of TEST for debugging.
+
 2009-08-25  Werner Koch  <wk@g10code.com>
 
 	* compat.c: Change license to all-permissive.  The GPL and the
diff --git a/util/estream-printf.c b/util/estream-printf.c
index 8ea602e69..54ecb2377 100644
--- a/util/estream-printf.c
+++ b/util/estream-printf.c
@@ -1,5 +1,5 @@
 /* estream-printf.c - Versatile C-99 compliant printf formatting
- * Copyright (C) 2007, 2008 g10 Code GmbH
+ * Copyright (C) 2007, 2008, 2009 g10 Code GmbH
  *
  * This file is part of Libestream.
  *
@@ -34,6 +34,7 @@
 
   Missing stuff:  wchar and wint_t
                   thousands_sep in pr_float.
+
 */
 
 #ifdef HAVE_CONFIG_H
@@ -49,27 +50,28 @@
 #include <stddef.h>
 #include <assert.h>
 #if defined(HAVE_INTMAX_T) || defined(HAVE_UINTMAX_T)
-# include <stdint.h>
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif 
 #endif
 #ifdef HAVE_LANGINFO_THOUSANDS_SEP
 #include <langinfo.h>
 #endif
-#ifdef TEST
-# include <locale.h>
-#else
-# ifdef _ESTREAM_PRINTF_EXTRA_INCLUDE
-#  include _ESTREAM_PRINTF_EXTRA_INCLUDE
-# endif
+#ifdef _ESTREAM_PRINTF_EXTRA_INCLUDE
+# include _ESTREAM_PRINTF_EXTRA_INCLUDE
 #endif
 #include "estream-printf.h"
 
+/* #define DEBUG 1 */
+
+
 /* Allow redefinition of asprintf used malloc functions.  */
-#if defined(_ESTREAM_PRINTF_MALLOC) && !defined(TEST)
+#if defined(_ESTREAM_PRINTF_MALLOC)
 #define my_printf_malloc(a) _ESTREAM_PRINTF_MALLOC((a))  
 #else
 #define my_printf_malloc(a) malloc((a))
 #endif
-#if defined(_ESTREAM_PRINTF_FREE) && !defined(TEST)
+#if defined(_ESTREAM_PRINTF_FREE)
 #define my_printf_free(a)   _ESTREAM_PRINTF_FREE((a))  
 #else
 #define my_printf_free(a)   free((a))
@@ -257,9 +259,7 @@ struct valueitem_s
 typedef struct valueitem_s *valueitem_t;
 
 
-#ifdef TEST
-static int verbose; 
-
+#ifdef DEBUG
 static void
 dump_argspecs (argspec_t arg, size_t argcount)
 {
@@ -281,7 +281,7 @@ dump_argspecs (argspec_t arg, size_t argcount)
              arg->width_pos,
              arg->precision_pos);
 }
-#endif /*TEST*/
+#endif /*DEBUG*/
 
 
 /* Set the vt field for ARG.  */
@@ -1482,8 +1482,7 @@ estream_format (estream_printf_out_t outfnc,
   if (max_pos < 0 || max_pos >= strlen (format))
     goto leave_einval;
 
-#ifdef TEST
-  if (verbose > 1)
+#ifdef DEBUG
     dump_argspecs (argspecs, argspecs_len);
 #endif
 
@@ -1787,324 +1786,3 @@ estream_asprintf (char **bufp, const char *format, ...)
 }
 
 
-#ifdef TEST
-
-static int
-one_test (const char *format, ...)
-{
-#ifdef _WIN32
-  {
-    static int show;
-
-    if (!show)
-      {
-        /* We do not have a system vasprintf.  */
-        printf ("one-test: disabled under W32\n");
-        show = 1;
-      }
-  }
-#else    
-  int rc1, rc2;
-  va_list arg_ptr;
-  char *buf1, *buf2;
-
-  if (verbose)
-    printf ("format: ->%s<-\n", format);
-
-  va_start (arg_ptr, format);
-  rc1 = vasprintf (&buf1, format, arg_ptr);
-  va_end (arg_ptr);
-  if (rc1 == -1)
-    {
-      printf ("   sys: errno=%d (%s)\n", errno, strerror (errno));
-      buf1 = NULL;
-    }
-  else if (verbose)
-    printf ("   sys: ->%s<-\n", buf1);
-  
-  va_start (arg_ptr, format);
-  rc2 = estream_vasprintf (&buf2, format, arg_ptr);
-  va_end (arg_ptr);
-  if (rc2 == -1)
-    printf ("   our: errno=%d (%s)\n", errno, strerror (errno));
-  else if (verbose)
-    printf ("   our: ->%s<-\n", buf2);
-
-  if (rc1 != -1 && rc2 != -1 && strcmp (buf1, buf2))
-    printf ("error: output does not match\n"
-            "format: ->%s<-\n   sys: ->%s<-\n   our: ->%s<-\n",
-            format, buf1, buf2);
-  else if ( rc1 != rc2 )
-    printf ("error: return codes are different: sys_rc=%d our_rc=%d\n",
-            rc1, rc2);
-
-  free (buf2);
-  free (buf1);
-#endif
-  return 0;
-}
-
-
-static void
-run_tests (void)
-{
-  /*one_test ("%d %% %'d", 17, 19681977);*/
-
-  one_test ("%d %% %d", 17, 768114563);
-  one_test ("%d %% %d", 17, -768114563);
-
-  one_test ("%d", 17);
-  one_test ("%4d", 17);
-  one_test ("%40d", 17);
-  one_test ("%-d", 17);
-  one_test ("%-4d", 17);
-  one_test ("%-140d", 17);
-  one_test ("%d", -17);
-  one_test ("%4d", -17);
-  one_test ("%40d", -17);
-  one_test ("%-d", -17);
-  one_test ("%-4d", -17);
-  one_test ("%-40d", -17);
-
-  one_test ("%+4d", 17);
-  one_test ("%+4d", -17);
-  one_test ("%-+4d", 17);
-  one_test ("%-+4d", -17);
-  one_test ("% 4d", 17);
-  one_test ("% 4d", -17);
-  one_test ("%- +4d", 17);
-  one_test ("%- +4d", -17);
-
-  one_test ("%.4d", 17);
-  one_test ("%.0d", 17);
-  one_test ("%.0d", 0);
-  one_test ("%.4d", -17);
-  one_test ("%.0d", -17);
-  one_test ("%6.4d", 17);
-  one_test ("%6.4d", -17);
-  one_test ("%6.0d", 0);
-  one_test ("%4.6d", 17);
-  one_test ("%4.6d", -17);
-
-  one_test ("% 4.6d", 17);
-  one_test ("% 6.0d", 0);
-
-  one_test ("%.4d", 17);
-  one_test ("%04d", 17);
-  one_test ("%.4d", -17);
-  one_test ("%04d", -17);
-  one_test ("%0.d", 0);
-
-  one_test ("%*d", 7, 42);
-  one_test ("%*d", -7, 42);
-  one_test ("%.*d", 7, 42);
-  one_test ("%.*d", -7, 42);
-  one_test ("%*.*d", 10, 7, 42);
-  one_test ("%*.*d", 10, -7, 42);
-  one_test ("%*.*d", -10, 7, 42);
-  one_test ("%*.*d", -10, -7, 42);
-
-  one_test ("%*x", 7, 42);
-  one_test ("%*x", -7, 42);
-  one_test ("%.*x", 7, 42);
-  one_test ("%.*x", -7, 42);
-  one_test ("%*.*x", 10, 7, 42);
-  one_test ("%*.*x", 10, -7, 42);
-  one_test ("%*.*x", -10, 7, 42);
-  one_test ("%*.*x", -10, -7, 42);
-  one_test ("%#*x", 7, 42);
-  one_test ("%#*x", -7, 42);
-  one_test ("%#.*x", 7, 42);
-  one_test ("%#.*x", -7, 42);
-  one_test ("%#*.*x", 10, 7, 42);
-  one_test ("%#*.*x", 10, -7, 42);
-  one_test ("%#*.*x", -10, 7, 42);
-  one_test ("%#*.*x", -10, -7, 42);
-
-  one_test ("%*X", 7, 42);
-  one_test ("%*X", -7, 42);
-  one_test ("%.*X", 7, 42);
-  one_test ("%.*X", -7, 42);
-  one_test ("%*.*X", 10, 7, 42);
-  one_test ("%*.*X", 10, -7, 42);
-  one_test ("%*.*X", -10, 7, 42);
-  one_test ("%*.*X", -10, -7, 42);
-  one_test ("%#*X", 7, 42);
-  one_test ("%#*X", -7, 42);
-  one_test ("%#.*X", 7, 42);
-  one_test ("%#.*X", -7, 42);
-  one_test ("%#*.*X", 10, 7, 42);
-  one_test ("%#*.*X", 10, -7, 42);
-  one_test ("%#*.*X", -10, 7, 42);
-  one_test ("%#*.*X", -10, -7, 42);
-
-  one_test ("%*o", 7, 42);
-  one_test ("%*o", -7, 42);
-  one_test ("%.*o", 7, 42);
-  one_test ("%.*o", -7, 42);
-  one_test ("%*.*o", 10, 7, 42);
-  one_test ("%*.*o", 10, -7, 42);
-  one_test ("%*.*o", -10, 7, 42);
-  one_test ("%*.*o", -10, -7, 42);
-  one_test ("%#*o", 7, 42);
-  one_test ("%#*o", -7, 42);
-  one_test ("%#.*o", 7, 42);
-  one_test ("%#.*o", -7, 42);
-  one_test ("%#*.*o", 10, 7, 42);
-  one_test ("%#*.*o", 10, -7, 42);
-  one_test ("%#*.*o", -10, 7, 42);
-  one_test ("%#*.*o", -10, -7, 42);
-
-  one_test ("%s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.0s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.10s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.48s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.49s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.50s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%.51s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%48s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%49s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%50s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%51s", "the quick brown fox jumps over the lazy dogs back");
-  one_test ("%-51s", "the quick brown fox jumps over the lazy dogs back");
-
-  one_test ("/%s=", "CN");
-
-  one_test ("%f", 3.1415926535);
-  one_test ("%f", -3.1415926535);
-  one_test ("%.10f", 3.1415926535);
-  one_test ("%.2f", 3.1415926535);
-  one_test ("%.1f", 3.1415926535);
-  one_test ("%.0f", 3.1415926535);
-  one_test ("%.20f", 3.1415926535);
-  one_test ("%10.10f", 3.1415926535);
-  one_test ("%10.2f", 3.1415926535);
-  one_test ("%10.1f", 3.1415926535);
-  one_test ("%10.0f", 3.1415926535);
-  one_test ("%30.20f", 3.1415926535);
-  one_test ("%10.10f", -3.1415926535);
-  one_test ("%10.2f", -3.1415926535);
-  one_test ("%10.1f", -3.1415926535);
-  one_test ("%10.0f", -3.1415926535);
-  one_test ("%30.20f", -3.1415926535);
-
-  one_test ("%-10f", 3.1415926535);
-  one_test ("%-10.10f", 3.1415926535);
-  one_test ("%-10.2f", 3.1415926535);
-  one_test ("%-10.1f", 3.1415926535);
-  one_test ("%-10.0f", 3.1415926535);
-  one_test ("%-30.20f", 3.1415926535);
-  one_test ("%-10f", -3.1415926535);
-  one_test ("%-10.10f", -3.1415926535);
-  one_test ("%-10.2f", -3.1415926535);
-  one_test ("%-10.1f", -3.1415926535);
-  one_test ("%-10.0f", -3.1415926535);
-  one_test ("%-30.20f", -3.1415926535);
-
-  one_test ("%#.0f",  3.1415926535);
-  one_test ("%#10.0f",  3.1415926535);
-  one_test ("%#10.0f", -3.1415926535);
-  one_test ("%-#10.0f",  3.1415926535);
-  one_test ("%-#10.0f", -3.1415926535);
-
-  one_test ("%e", 3.1415926535);
-  one_test ("%g", 3.1415926535);
-
-  one_test ("%a", 1);
-  one_test ("%a", -1);
-  one_test ("%a", 3.1415926535);
-
-#ifdef HAVE_LONG_DOUBLE
-  one_test ("%La", 1);
-  one_test ("%La", -1);
-  one_test ("%La", 3.1415926535);
-#endif
-
-#ifdef __GLIBC__
-  /* "%m" is a glibc extension so this _test_ will only work on such a
-     system.  */
-  errno = ENOENT;
-  one_test ("%m");
-  errno = ENOENT;
-  one_test ("%d=%m", 17);
-  errno = ENOENT;
-  one_test ("%2$d:%m:%1$d", 42, 17);
-#endif /*__GLIBC__*/
-
-}
-
-static void
-check_snprintf (void)
-{
-  char buffer[20];
-  int rc, rc2;
-  size_t tmplen, blen, blen2;
-
-  rc = estream_snprintf (buffer, 0, "%*s", 18, "");
-  if (rc != 18)
-    printf ("rc=%d\n", rc );
-  rc = estream_snprintf (buffer, sizeof buffer, "%*s", 18, "");
-  if (rc != 18)
-    printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer));
-  rc = estream_snprintf (buffer, sizeof buffer, "%*s", 19, "");
-  if (rc != 19)
-    printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer));
-  rc = estream_snprintf (buffer, sizeof buffer, "%*s", 20, "");
-  if (rc != 20)
-    printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer));
-  rc = estream_snprintf (buffer, sizeof buffer, "%*s", 21, "");
-  if (rc != 21)
-    printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer));
-
-  for (tmplen = 0; tmplen <= sizeof buffer; tmplen++)
-    {
-      rc = estream_snprintf (buffer, tmplen, "%04d%02d%02dT%02d%02d%02d",
-                             1998, 9, 7, 16, 56, 05);
-      blen = strlen (buffer);
-      rc2 = snprintf (buffer, tmplen, "%04d%02d%02dT%02d%02d%02d",
-                     1998, 9, 7, 16, 56, 05);
-      blen2 = strlen (buffer);
-      if (rc != rc2 || blen != blen2)
-        printf ("snprintf test with len %u gives %d instead of %d (%d,%d)\n",
-                (unsigned int)tmplen, rc, rc2, blen, blen2);
-    }
-}
-
-
-
-int
-main (int argc, char **argv)
-{
-  int rc;
-
-  if (argc) {argc--; argv++; }
-
-  setlocale (LC_NUMERIC, "");
-
-  while (argc && !strcmp (*argv, "--verbose"))
-    {
-      verbose++;
-      argc--;
-      argv++;
-    }
-
-  if (!argc)
-    {
-      run_tests ();
-      check_snprintf () ;
-    }
-  else
-    {
-      rc = estream_vfprintf (stdout, argv[0], NULL);
-      fflush (stdout);
-      fprintf (stderr, "[estream_vfprintf returns: %d]\n", rc);
-    }
-
-  return 0;
-}
-#endif /*TEST*/
-/*
-Local Variables:
-compile-command: "cc -Wall -O3 -g -I.. -DHAVE_CONFIG_H -DTEST -o estream-printf estream-printf.c"
-End:
-*/