From: Adam Heath <doogie@debian.org>
Date: Sat, 26 Apr 2003 19:47:08 +0000 (+0000)
Subject: Reverted back to previous version, reinstated the 2 broken translations,
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e42cd66384ff54c8213e9a8021ebdefe4d7a121;p=dpkg

Reverted back to previous version, reinstated the 2 broken translations,
and fixed them properly.
---

diff --git a/po/ja.po b/po/ja.po
index 981b50da..5d361fb4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.6.7\n"
-"POT-Creation-Date: 2002-05-27 19:05+0200\n"
+"POT-Creation-Date: 2001-07-16 02:32+0200\n"
 "PO-Revision-Date: 2000-03-04 14:39+09:00\n"
 "Last-Translator: Keita Maehara <maehara@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -175,43 +175,43 @@ msgstr "
 msgid "unable to install updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/dump.c:289
+#: lib/dump.c:250
 #, c-format
 msgid "failed to open `%s' for writing %s information"
 msgstr "%2$s ¾ðÊó¤ò½ñ¤­¹þ¤à¤¿¤á¤Î`%1$s'¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/dump.c:292
+#: lib/dump.c:253
 msgid "unable to set buffering on status file"
 msgstr "¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ëÍѤΥХåե¡¤ò³ÎÊݤǤ­¤Þ¤»¤ó¡£"
 
-#: lib/dump.c:303
+#: lib/dump.c:264
 #, c-format
 msgid "failed to write %s record about `%.50s' to `%.250s'"
 msgstr "`%2$.50s'¤Ë¤Ä¤¤¤Æ¤Î %1$s ¥ì¥³¡¼¥É¤ò`%3$.250s'¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: lib/dump.c:310
+#: lib/dump.c:271
 #, c-format
 msgid "failed to flush %s information to `%.250s'"
 msgstr "%s¾ðÊó¤ò`%.250s'¤Ø¥Õ¥é¥Ã¥·¥å¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: lib/dump.c:312
+#: lib/dump.c:273
 #, c-format
 msgid "failed to fsync %s information to `%.250s'"
 msgstr "%s¾ðÊó¤ò`%.250s'¤Ø fsync ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: lib/dump.c:314
+#: lib/dump.c:275
 #, c-format
 msgid "failed to close `%.250s' after writing %s information"
 msgstr "%2$s ¾ðÊó¤ò½ñ¤­¹þ¤ó¤À¸å¤Ë`%1$.250s'¤Î¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: lib/dump.c:318
+#: lib/dump.c:279
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
 msgstr ""
 "`%1$.250s'¤ò`%2$.250s'¤Ø¥ê¥ó¥¯¤Ç¤­¤Ê¤¤¤¿¤á¡¢%3$s ¾ðÊó¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ç¤­¤Þ¤»"
 "¤ó¡£"
 
-#: lib/dump.c:321
+#: lib/dump.c:282
 #, c-format
 msgid "failed to install `%.250s' as `%.250s' containing %s info"
 msgstr "`%1$.250s'¤ò %3$s ¾ðÊó¤ò´Þ¤ó¤À`%2$.250s'¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
@@ -252,93 +252,92 @@ msgstr "`%.250s'
 msgid "%s:%d: internal error `%s'\n"
 msgstr "%s:%d: ÆâÉô¥¨¥é¡¼ `%s' ¤Ç¤¹\n"
 
-#: lib/fields.c:44
+#: lib/fields.c:43
 #, c-format
 msgid "%s is missing"
 msgstr "%s ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:57
+#: lib/fields.c:56
 #, c-format
 msgid "`%.*s' is not allowed for %s"
 msgstr "`%.*s' ¤Ï%sÍѤ˵ö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:64
+#: lib/fields.c:63
 #, c-format
 msgid "junk after %s"
 msgstr "%s¸å¤Î¥´¥ß"
 
-#: lib/fields.c:74
+#: lib/fields.c:73
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾ (%.250s) ¤Ç¤¹¡£"
 
-#: lib/fields.c:91
+#: lib/fields.c:90
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "¥Õ¥¡¥¤¥ëµ­½Ò¥Õ¥£¡¼¥ë¥É`%s'¤¬¶õ¤Ç¤¹¡£"
 
-#: lib/fields.c:94
+#: lib/fields.c:93
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "¥Õ¥¡¥¤¥ëµ­½Ò¥Õ¥£¡¼¥ë¥É`%s'¤Ï¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë¤Ëµö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:104
+#: lib/fields.c:103
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "¥Õ¥¡¥¤¥ëµ­½Ò¥Õ¥£¡¼¥ë¥É`%s'¤ÎÃͤ¬(¾¤Î¥Õ¥£¡¼¥ë¥É¤ËÈæ¤Ù¤Æ)¿¤¹¤®¤Þ¤¹¡£"
 
-#: lib/fields.c:117
+#: lib/fields.c:116
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "¥Õ¥¡¥¤¥ëµ­½Ò¥Õ¥£¡¼¥ë¥É`%s'¤Ë(¾¤Î¥Õ¥£¡¼¥ë¥É¤ËÈæ¤Ù¤Æ)Ãͤ¬¾¯¤Ê¤¹¤®¤Þ¤¹¡£"
 
-#: lib/fields.c:133
-#, fuzzy
-msgid "yes/no in boolean field"
+#: lib/fields.c:132
+msgid "yes/no in `essential' field"
 msgstr "¡Öɬ¿Ü(essential)¡×¥Õ¥£¡¼¥ë¥É¤Ë¤ª¤±¤ë yes/no"
 
-#: lib/fields.c:166
+#: lib/fields.c:165
 msgid "value for `status' field not allowed in this context"
 msgstr "`status'¥Õ¥£¡¼¥ë¥É¤ÎÃͤϤ³¤Î¥³¥ó¥Æ¥­¥¹¥È¤Ëµö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:177
+#: lib/fields.c:176
 msgid "third (status) word in `status' field"
 msgstr "`status'¥Õ¥£¡¼¥ë¥É¤ÎÂè 3 ¥ï¡¼¥É(¥¹¥Æ¡¼¥¿¥¹)"
 
-#: lib/fields.c:188
+#: lib/fields.c:187
 #, c-format
 msgid "error in Version string `%.250s': %.250s"
 msgstr "Version ʸ»ú`%.250s'¤Î¥¨¥é¡¼: %.250s"
 
-#: lib/fields.c:199
+#: lib/fields.c:198
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "¸Å¤¤ `Revision' ¤« `Package-Revision' ¥Õ¥£¡¼¥ë¥É¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: lib/fields.c:217
+#: lib/fields.c:216
 msgid "value for `config-version' field not allowed in this context"
 msgstr "`config-version'¥Õ¥£¡¼¥ë¥É¤ÎÃͤϤ³¤Î¥³¥ó¥Æ¥­¥¹¥È¤Ëµö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:221
+#: lib/fields.c:220
 #, c-format
 msgid "error in Config-Version string `%.250s': %.250s"
 msgstr "Config-Versionʸ»ú`%.250s'¤Î¥¨¥é¡¼: %.250s"
 
-#: lib/fields.c:238
+#: lib/fields.c:237
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`conffiles'¤ÎÃͤ˶õÇò°Ê³°¤Îʸ»ú`%c'¤Ç»Ï¤Þ¤ë¹Ô¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: lib/fields.c:244
+#: lib/fields.c:243
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles'¤ÎÃͤËÉÔÀµ¤Ê·Á¼°¤ò»ý¤Ä¹Ô`%.*s'¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: lib/fields.c:250
+#: lib/fields.c:249
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 "¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤«¶õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: lib/fields.c:305
+#: lib/fields.c:304
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -346,12 +345,12 @@ msgstr ""
 "`%s'¥Õ¥£¡¼¥ë¥É¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬Â¸ºß¤·¤Ê¤¤¤«¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬Æþ¤ë¤È´üÂÔ¤µ¤ì¤ë¾ì"
 "½ê¤Ë¥´¥ß¤¬¤¢¤ê¤Þ¤¹"
 
-#: lib/fields.c:308
+#: lib/fields.c:307
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s'¥Õ¥£¡¼¥ë¥É¡¢Ìµ¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾ `%.255s': %s"
 
-#: lib/fields.c:339
+#: lib/fields.c:338
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -360,7 +359,7 @@ msgstr ""
 "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É:\n"
 " ¥Ð¡¼¥¸¥ç¥ó´Ø·¸ %3$c%4$c ¤ÏÉÔÀµ¤Ç¤¹¡£"
 
-#: lib/fields.c:345
+#: lib/fields.c:344
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -370,7 +369,7 @@ msgstr ""
 " `%3$c'¤Ï¸½ºß»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤«¤ï¤ê¤Ë `%4$c=' ¤« `%5$c%6$c' ¤ò»ÈÍѤ·¤Æ¤¯¤À"
 "¤µ¤¤¡£"
 
-#: lib/fields.c:355
+#: lib/fields.c:354
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -380,11 +379,11 @@ msgstr ""
 " ¥Ð¡¼¥¸¥ç¥óÈֹ椬¸·Ì©¤Ë°ìÃפ¹¤ë¤³¤È¤¬ÌÀ¼¨¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤«¤ï¤ê¤Ë`='¤ò»ÈÍѤ¹"
 "¤ë¤³¤È¤òÄó°Æ¤·¤Þ¤¹¡£"
 
-#: lib/fields.c:362
+#: lib/fields.c:361
 msgid "Only exact versions may be used for Provides"
 msgstr "Provides ¤Ë¤ÏÀµ³Î¤Ê¥Ð¡¼¥¸¥ç¥ó¤Î¤ß¤¬»ÈÍѤǤ­¤Þ¤¹¡£"
 
-#: lib/fields.c:366
+#: lib/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -393,32 +392,32 @@ msgstr ""
 "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É:\n"
 " ¥Ð¡¼¥¸¥ç¥óÃͤ¬Èó±Ñ¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£¶õÇò¤ò²Ã¤¨¤ë¤³¤È¤òÄó°Æ¤·¤Þ¤¹¡£"
 
-#: lib/fields.c:380
+#: lib/fields.c:379
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `('"
 msgstr "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É: ¥Ð¡¼¥¸¥ç¥ó¤¬ `(' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
-#: lib/fields.c:383
+#: lib/fields.c:382
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains ` '"
 msgstr "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É: ¥Ð¡¼¥¸¥ç¥ó¤¬ ` ' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
-#: lib/fields.c:386
+#: lib/fields.c:385
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É: ¥Ð¡¼¥¸¥ç¥ó¤¬´°·ë¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: lib/fields.c:397
+#: lib/fields.c:396
 #, c-format
 msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgstr "`%2$.255s'¤Î`%1$s'¥Õ¥£¡¼¥ë¥É: ¥Ð¡¼¥¸¥ç¥ó¥¨¥é¡¼: %3$.255s"
 
-#: lib/fields.c:406
+#: lib/fields.c:405
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s'¥Õ¥£¡¼¥ë¥É¡¢¥Ñ¥Ã¥±¡¼¥¸`%.255s'»²¾È¸å¤Î¹½Ê¸¥¨¥é¡¼"
 
-#: lib/fields.c:413
+#: lib/fields.c:412
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "ÁªÂòµ­¹æ(`|')¤Ï %s ¥Õ¥£¡¼¥ë¥ÉÆâ¤Ç¤Ïµö¤µ¤ì¤Þ¤»¤ó¡£"
@@ -517,8 +516,7 @@ msgid "unable to set close-on-exec flag for %.250s"
 msgstr "`%.250s' ¤Î¥Ð¥Ã¥Õ¥¡¤ò³ÎÊݤǤ­¤Þ¤»¤ó¡£"
 
 #: lib/mlib.c:199
-#, fuzzy
-msgid "failed in buffer_write(fd) (%i, ret=%zi %s): %s"
+msgid "failed in buffer_write(fd) (%i, ret=%zi %s)"
 msgstr "buffer_write(fd) ¤Ç¼ºÇÔ¤·¤Þ¤·¤¿(%i, ret=%zi %s)"
 
 #: lib/mlib.c:206
@@ -561,67 +559,62 @@ msgstr "buffer_copy 
 msgid "failed in buffer_copy (%s)"
 msgstr "buffer_copy Æâ¤Ç¼ºÇÔ¤·¤Þ¤·¤¿(%s)"
 
-#: lib/mlib.c:338
-#, fuzzy, c-format
-msgid "short read in buffer_copy (%s)"
-msgstr "buffer_copy Æâ¤Ç¼ºÇÔ¤·¤Þ¤·¤¿(%s)"
-
-#: lib/myopt.c:40
+#: lib/myopt.c:39
 #, c-format
 msgid "failed to open configuration file `%.255s' for reading"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë`%.255s'¤ÎÆɤ߹þ¤ß¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: lib/myopt.c:72
+#: lib/myopt.c:71
 #, c-format
 msgid "configuration error: unknown option %s"
 msgstr "ÀßÄꥨ¥é¡¼: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s"
 
-#: lib/myopt.c:75
+#: lib/myopt.c:74
 #, c-format
 msgid "configuration error: %s needs a value"
 msgstr "ÀßÄꥨ¥é¡¼: %s ¤Ë¤ÏÃͤ¬É¬ÍפǤ¹¡£"
 
-#: lib/myopt.c:79
+#: lib/myopt.c:78
 #, c-format
 msgid "configuration error: %s does not take a value"
 msgstr "ÀßÄꥨ¥é¡¼: %s ¤ÏÃͤò¤È¤ê¤Þ¤»¤ó¡£"
 
-#: lib/myopt.c:84
+#: lib/myopt.c:83
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë `%.255s' ¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
 
-#: lib/myopt.c:85
+#: lib/myopt.c:84
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë `%.255s' ¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
 
-#: lib/myopt.c:127
+#: lib/myopt.c:107
 #, c-format
 msgid "unknown option --%s"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó --%s"
 
-#: lib/myopt.c:131
+#: lib/myopt.c:111
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s :Ãͤ¬É¬ÍפǤ¹¡£"
 
-#: lib/myopt.c:136
+#: lib/myopt.c:116
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s :ÃͤÏɬÍפ¢¤ê¤Þ¤»¤ó¡£"
 
-#: lib/myopt.c:143
+#: lib/myopt.c:123
 #, c-format
 msgid "unknown option -%c"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó -%c"
 
-#: lib/myopt.c:148
+#: lib/myopt.c:128
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c :Ãͤ¬É¬ÍפǤ¹¡£"
 
-#: lib/myopt.c:156
+#: lib/myopt.c:136
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c :ÃͤÏɬÍפ¢¤ê¤Þ¤»¤ó¡£"
@@ -804,15 +797,6 @@ msgstr "%s 
 msgid "cannot open GPL file "
 msgstr "GPL ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/showpkg.c:69
-#, c-format
-msgid "invalid character `%c' in field width\n"
-msgstr ""
-
-#: lib/showpkg.c:156
-msgid "Closing brace missing in format\n"
-msgstr ""
-
 #: lib/varbuf.c:105
 msgid "failed to realloc for variable buffer"
 msgstr "²ÄÊÑĹ¥Ð¥Ã¥Õ¥¡¤ÎºÆ³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
@@ -898,7 +882,7 @@ msgstr ""
 #. Now that we have verified everything its time to actually
 #. * build something. Lets start by making the ar-wrapper.
 #.
-#: dpkg-deb/build.c:367 main/archives.c:496
+#: dpkg-deb/build.c:368 main/archives.c:496
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¡£"
@@ -1152,17 +1136,17 @@ msgstr "
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "`%.250s'¤Î¿·¤¿¤Ë²òÅष¤¿¥Ð¡¼¥¸¥ç¥ó¤òºï½ü¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/configure.c:86
+#: main/configure.c:80
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾`%s'¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢ÀßÄê¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/configure.c:88
+#: main/configure.c:82
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %.250s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤ÓÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: main/configure.c:90
+#: main/configure.c:84
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1171,7 +1155,7 @@ msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %.250s ¤ÏÀßÄê¤Î½àÈ÷¤¬½ÐÍè¤Æ¤¤¤Þ¤»¤ó¡£\n"
 " ÀßÄê¤Ç¤­¤Þ¤»¤ó(¸½ºß¤Î¥¹¥Æ¡¼¥¿¥¹ `%.250s')¡£"
 
-#: main/configure.c:109
+#: main/configure.c:101
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1180,11 +1164,11 @@ msgstr ""
 "dpkg: °Í¸´Ø·¸¤ÎÌäÂê¤Ë¤è¤ê %s ¤ÎÀßÄ꤬¤Ç¤­¤Þ¤»¤ó:\n"
 "%s"
 
-#: main/configure.c:112
+#: main/configure.c:104
 msgid "dependency problems - leaving unconfigured"
 msgstr "°Í¸´Ø·¸¤ÎÌäÂê - ÀßÄê¤ò¸«Á÷¤ê¤Þ¤¹"
 
-#: main/configure.c:116
+#: main/configure.c:108
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you request:\n"
@@ -1193,7 +1177,7 @@ msgstr ""
 "dpkg: %s: °Í¸´Ø·¸¤ÎÌäÂê¡¢¤·¤«¤·Í×µáÄ̤êÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹:\n"
 "%s"
 
-#: main/configure.c:124
+#: main/configure.c:116
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1201,23 +1185,33 @@ msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤¬Èó¾ï¤ËÌ·½â¤·¤¿¾õÂ֤˴٤ê¤Þ¤·¤¿¡£ÀßÄê¤ò»î¤ß¤ë\n"
 "Á°¤ËºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£"
 
-#: main/configure.c:127
+#: main/configure.c:119
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) ¤òÀßÄꤷ¤Æ¤¤¤Þ¤¹ ...\n"
 
-#: main/configure.c:174
+#: main/configure.c:167
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "¿·µ¬ÇÛÉÛÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó¡£"
 
-#: main/configure.c:184 main/configure.c:422
+#: main/configure.c:176
+#, c-format
+msgid "unable to change ownership of new dist conffile `%.250s'"
+msgstr "¿·µ¬ÇÛÉÛ conffile `%.250s'¤Î½êÍ­¼Ô¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£"
+
+#: main/configure.c:179
+#, c-format
+msgid "unable to set mode of new dist conffile `%.250s'"
+msgstr "¿·µ¬ÇÛÉÛ conffile `%.250s'¤Îµö²Ä¥â¡¼¥É¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+
+#: main/configure.c:182
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó¡£"
 
-#: main/configure.c:193
+#: main/configure.c:191
 #, c-format
 msgid ""
 "\n"
@@ -1228,140 +1222,7 @@ msgstr ""
 "ÀßÄê¥Õ¥¡¥¤¥ë`%s'¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Þ¤»¤ó¡£\n"
 "¤¢¤Ê¤¿¤¬Í×µá¤Ë½¾¤¤¡¢¿·µ¬ÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: main/configure.c:225
-#, c-format
-msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - ¸Å¤¤¥Ð¥Ã¥¯¥¢¥Ã¥×`%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: main/configure.c:233
-#, c-format
-msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤ò`%.250s'¤Ë̾Á°¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
-
-#: main/configure.c:241
-#, c-format
-msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: main/configure.c:249
-#, c-format
-msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - µìÇÛÉۥС¼¥¸¥ç¥ó`%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: main/configure.c:254
-#, c-format
-msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤Îºï½ü(¾å½ñ¤­Á°)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: main/configure.c:258
-#, c-format
-msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤«¤é`%.250s'¤Ø¤Î¥ê¥ó¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: main/configure.c:262
-#, c-format
-msgid "Installing new version of config file %s ...\n"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¿·µ¬¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹ ...\n"
-
-#: main/configure.c:266
-#, c-format
-msgid "unable to install `%.250s' as `%.250s'"
-msgstr "`%.250s'¤ò`%.250s'¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
-
-#: main/configure.c:327
-#, c-format
-msgid ""
-"dpkg: %s: warning - unable to stat config file `%s'\n"
-" (= `%s'): %s\n"
-msgstr ""
-"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó\n"
-" (= `%s'): %s\n"
-
-#: main/configure.c:338
-#, c-format
-msgid ""
-"dpkg: %s: warning - config file `%s' is a circular link\n"
-" (= `%s')\n"
-msgstr ""
-"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'¤¬¼«Ê¬¼«¿È¤Ø¤Î¥ê¥ó¥¯(= `%s')\n"
-"¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-
-#: main/configure.c:351
-#, c-format
-msgid ""
-"dpkg: %s: warning - unable to readlink conffile `%s'\n"
-" (= `%s'): %s\n"
-msgstr ""
-"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'(= `%s')¤Î¥ê¥ó¥¯Æɤ߹þ¤ß(readlink)\n"
-"¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
-
-#: main/configure.c:371
-#, c-format
-msgid ""
-"dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
-" (`%s' is a symlink to `%s')\n"
-msgstr ""
-"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤¬¥Õ¥¡¥¤¥ë̾¤Î½ÅÊ£¤ò²ò·è¤·¤Þ¤¹¡£\n"
-"(`%s'¤Ï`%s'¤Ø¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯)\n"
-
-#: main/configure.c:384
-#, c-format
-msgid ""
-"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
-"s')\n"
-msgstr ""
-"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤¬¥×¥ì¥¤¥ó¥Õ¥¡¥¤¥ë¤«¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯"
-"(= `%s')¤Ç¤¢¤ê¤Þ¤»¤ó¡£\n"
-
-#: main/configure.c:402
-msgid "md5hash"
-msgstr "md5 ¥Ï¥Ã¥·¥å"
-
-#: main/configure.c:408
-#, c-format
-msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
-msgstr "dpkg: %s: ·Ù¹ð - ¥Ï¥Ã¥·¥åÍÑ¤Ë conffile %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
-
-#: main/configure.c:426
-#, c-format
-msgid "unable to change ownership of new dist conffile `%.250s'"
-msgstr "¿·µ¬ÇÛÉÛ conffile `%.250s'¤Î½êÍ­¼Ô¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£"
-
-#: main/configure.c:429
-#, c-format
-msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr "¿·µ¬ÇÛÉÛ conffile `%.250s'¤Îµö²Ä¥â¡¼¥É¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#: main/configure.c:459
-#, fuzzy, c-format
-msgid "failed to run %s (%.250s)"
-msgstr "diff ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(%.250s)"
-
-#: main/configure.c:468 main/configure.c:506
-msgid "wait for shell failed"
-msgstr "¥·¥§¥ë¤¬½ªÎ»¤¹¤ë¤Þ¤ÇÂÔµ¡¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿(wait ¼ºÇÔ)¡£"
-
-#. Do not job control to suspend but fork and start a new shell
-#. * instead.
-#.
-#. waitpid status
-#. waitpid result
-#: main/configure.c:488
-msgid "Type `exit' when you're done.\n"
-msgstr "½ªÎ»¤·¤¿¤é `exit' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: main/configure.c:497
-#, c-format
-msgid "failed to exec shell (%.250s)"
-msgstr "¥·¥§¥ë¤Î¸Æ¤Ó½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(%.250s)"
-
-#: main/configure.c:509
-msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr ""
-"³Îǧ¤·¤¿¤é¤³¤Î¥×¥í¥»¥¹¤ò¥Õ¥©¥¢¥°¥é¥ó¥É(`fg')¤Ë¤¹¤ë¤Î¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤·¤ç"
-"¤¦!\n"
-
-#: main/configure.c:528
+#: main/configure.c:230
 #, c-format
 msgid ""
 "\n"
@@ -1370,12 +1231,12 @@ msgstr ""
 "\n"
 "ÀßÄê¥Õ¥¡¥¤¥ë`%s'"
 
-#: main/configure.c:530
+#: main/configure.c:232
 #, c-format
 msgid " (actually `%s')"
 msgstr " (¼ÂºÝ¤Ï `%s')"
 
-#: main/configure.c:534
+#: main/configure.c:237
 msgid ""
 "\n"
 " ==> File on system created by you or by a script.\n"
@@ -1385,7 +1246,7 @@ msgstr ""
 " ==> ¤¢¤Ê¤¿¤«¥¹¥¯¥ê¥×¥È¤Ë¤è¤Ã¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 " ==> ¥Ñ¥Ã¥±¡¼¥¸¥á¥ó¥Æ¥Ê¤¬Ä󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â¤³¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
 
-#: main/configure.c:539
+#: main/configure.c:244
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
@@ -1394,7 +1255,7 @@ msgstr ""
 " ==> ¤³¤ì¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é(¤¢¤Ê¤¿¤«¥¹¥¯¥ê¥×¥È¤Ë¤è¤Ã¤Æ)Êѹ¹¤µ¤ì¤Æ¤¤¤Þ"
 "¤¹¡£\n"
 
-#: main/configure.c:540
+#: main/configure.c:245
 msgid ""
 "\n"
 "     Not modified since installation.\n"
@@ -1402,31 +1263,31 @@ msgstr ""
 "\n"
 "     ¤³¤ì¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: main/configure.c:543
+#: main/configure.c:248
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> ¥Ñ¥Ã¥±¡¼¥¸ÇÛÉÛ¸µ¤¬¹¹¿·ÈǤòÄ󶡤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: main/configure.c:544
+#: main/configure.c:249
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     ¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Á°²ó¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤ÈƱ¤¸¤Ç¤¹¡£\n"
 
-#: main/configure.c:551
+#: main/configure.c:255
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Í׵ᤷ¤¿¤è¤¦¤Ë¿·µ¬¥Õ¥¡¥¤¥ë¤ò»È¤¦¡£\n"
 
-#: main/configure.c:555
+#: main/configure.c:259
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Í׵ᤷ¤¿¤è¤¦¤Ë¸Å¤¤¥Õ¥¡¥¤¥ë¤ò»È¤¦¡£\n"
 
-#: main/configure.c:565
+#: main/configure.c:266
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> ¥Ç¥Õ¥©¥ë¥È¤Ç¸Å¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤òÊÝ»ý¤¹¤ë¡£\n"
 
-#: main/configure.c:569
+#: main/configure.c:270
 msgid " ==> Using new config file as default.\n"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤¦¡£\n"
 
-#: main/configure.c:577
+#: main/configure.c:276
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
 "    Y or I  : install the package maintainer's version\n"
@@ -1440,38 +1301,175 @@ msgstr ""
 "      D     : ξ¥Ð¡¼¥¸¥ç¥ó¤Îº¹°Û¤òɽ¼¨¤¹¤ë\n"
 "      Z     : ¤³¤Î½èÍý¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ë¤·¡¢¾õ¶·¤ò³Îǧ¤¹¤ë\n"
 
-#: main/configure.c:584
+#: main/configure.c:283
 msgid " The default action is to keep your current version.\n"
 msgstr " ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¸½ºß»È¤Ã¤Æ¤¤¤ë¼«Ê¬¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»Ä¤·¤Þ¤¹¡£\n"
 
-#: main/configure.c:586
+#: main/configure.c:285
 msgid " The default action is to install the new version.\n"
 msgstr " ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£\n"
 
-#: main/configure.c:592
+#: main/configure.c:291
 msgid "[default=N]"
 msgstr "[¥Ç¥Õ¥©¥ë¥È=N]"
 
-#: main/configure.c:593
+#: main/configure.c:292
 msgid "[default=Y]"
 msgstr "[¥Ç¥Õ¥©¥ë¥È=Y]"
 
-#: main/configure.c:593
+#: main/configure.c:292
 msgid "[no default]"
 msgstr "[¥Ç¥Õ¥©¥ë¥È¤Ê¤·]"
 
-#: main/configure.c:596
+#: main/configure.c:295
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "ɸ½à¥¨¥é¡¼½ÐÎϤؤνñ¤­¹þ¤ß¥¨¥é¡¼(conffile ¥×¥í¥ó¥×¥ÈÁ°¤Ç¸¡½Ð)¤Ç¤¹¡£"
 
-#: main/configure.c:603
+#: main/configure.c:302
 msgid "read error on stdin at conffile prompt"
 msgstr "conffile ¥×¥í¥ó¥×¥È¤Ç¤Îɸ½àÆþÎϾå¤ÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: main/configure.c:604
+#: main/configure.c:303
 msgid "EOF on stdin at conffile prompt"
 msgstr "conffile ¥×¥í¥ó¥×¥È¤Çɸ½àÆþÎϾå¤Î EOF ¤Ç¤¹¡£"
 
+#: main/configure.c:323
+#, c-format
+msgid "failed to run diff (%.250s)"
+msgstr "diff ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(%.250s)"
+
+#: main/configure.c:326 main/configure.c:353
+msgid "wait for shell failed"
+msgstr "¥·¥§¥ë¤¬½ªÎ»¤¹¤ë¤Þ¤ÇÂÔµ¡¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿(wait ¼ºÇÔ)¡£"
+
+#: main/configure.c:334
+#, c-format
+msgid ""
+"Your currently installed version of the file is in:\n"
+" %s\n"
+"The version contained in the new version of the package is in:\n"
+" %s\n"
+"If you decide to take care of the update yourself, perhaps by editing\n"
+" the installed version, you should choose `N' when you return, so that\n"
+" I do not mess up your careful work.\n"
+msgstr ""
+"¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï\n"
+" %s ¤Ç¤¹¡£\n"
+"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï\n"
+" %s ¤Ç¤¹¡£\n"
+"¤â¤·¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¼«Ê¬¤Ç¹Ô¤ª¤¦¤È·è¤á¤¿¾ì¹ç(¤³¤ì¤ÏÂçÄñ¤Ï¥¤¥ó¥¹¥È¡¼¥ë\n"
+"ºÑ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼«Ê¬¤ÇÊÔ½¸¤¹¤ë¾ì¹ç)¤Ï¡¢¤³¤³¤Ç N ¤òÁª¤Ö¤Ù¤­¤Ç¤·¤ç¤¦¡£\n"
+"¤Ê¤¼¤Ê¤é Y ¤Ë¤¹¤ë¤È¥·¥¹¥Æ¥à¤¬¤¢¤Ê¤¿¤ÎÊÔ½¸¤òÂæ¤Ê¤·¤Ë¤·¤Æ¤·¤Þ¤¦¤«¤é¤Ç¤¹¡£\n"
+
+#: main/configure.c:345
+msgid "Type `exit' when you're done.\n"
+msgstr "½ªÎ»¤·¤¿¤é `exit' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: main/configure.c:350
+#, c-format
+msgid "failed to exec shell (%.250s)"
+msgstr "¥·¥§¥ë¤Î¸Æ¤Ó½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(%.250s)"
+
+#: main/configure.c:355
+msgid "Don't forget to foreground (`fg') this process when you're done !\n"
+msgstr ""
+"³Îǧ¤·¤¿¤é¤³¤Î¥×¥í¥»¥¹¤ò¥Õ¥©¥¢¥°¥é¥ó¥É(`fg')¤Ë¤¹¤ë¤Î¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤·¤ç"
+"¤¦!\n"
+
+#: main/configure.c:376
+#, c-format
+msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - ¸Å¤¤¥Ð¥Ã¥¯¥¢¥Ã¥×`%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#: main/configure.c:384
+#, c-format
+msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤ò`%.250s'¤Ë̾Á°¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: main/configure.c:392
+#, c-format
+msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#: main/configure.c:400
+#, c-format
+msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - µìÇÛÉۥС¼¥¸¥ç¥ó`%.250s'¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#: main/configure.c:405
+#, c-format
+msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤Îºï½ü(¾å½ñ¤­Á°)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#: main/configure.c:409
+#, c-format
+msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - `%.250s'¤«¤é`%.250s'¤Ø¤Î¥ê¥ó¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#: main/configure.c:413
+#, c-format
+msgid "Installing new version of config file %s ...\n"
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¿·µ¬¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹ ...\n"
+
+#: main/configure.c:417
+#, c-format
+msgid "unable to install `%.250s' as `%.250s'"
+msgstr "`%.250s'¤ò`%.250s'¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
+
+#: main/configure.c:475
+#, c-format
+msgid ""
+"dpkg: %s: warning - unable to stat config file `%s'\n"
+" (= `%s'): %s\n"
+msgstr ""
+"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó\n"
+" (= `%s'): %s\n"
+
+#: main/configure.c:486
+#, c-format
+msgid ""
+"dpkg: %s: warning - config file `%s' is a circular link\n"
+" (= `%s')\n"
+msgstr ""
+"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'¤¬¼«Ê¬¼«¿È¤Ø¤Î¥ê¥ó¥¯(= `%s')\n"
+"¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
+
+#: main/configure.c:499
+#, c-format
+msgid ""
+"dpkg: %s: warning - unable to readlink conffile `%s'\n"
+" (= `%s'): %s\n"
+msgstr ""
+"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%s'(= `%s')¤Î¥ê¥ó¥¯Æɤ߹þ¤ß(readlink)\n"
+"¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
+
+#: main/configure.c:518
+#, c-format
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
+" (`%s' is a symlink to `%s')\n"
+msgstr ""
+"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤¬¥Õ¥¡¥¤¥ë̾¤Î½ÅÊ£¤ò²ò·è¤·¤Þ¤¹¡£\n"
+"(`%s'¤Ï`%s'¤Ø¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯)\n"
+
+#: main/configure.c:531
+#, c-format
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: ·Ù¹ð - ÀßÄê¥Õ¥¡¥¤¥ë`%.250s'¤¬¥×¥ì¥¤¥ó¥Õ¥¡¥¤¥ë¤«¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯"
+"(= `%s')¤Ç¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#: main/configure.c:545
+msgid "md5hash"
+msgstr "md5 ¥Ï¥Ã¥·¥å"
+
+#: main/configure.c:551
+#, c-format
+msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
+msgstr "dpkg: %s: ·Ù¹ð - ¥Ï¥Ã¥·¥åÍÑ¤Ë conffile %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
+
 #: main/depcon.c:74
 #, c-format
 msgid "unable to check for existence of `%.250s'"
@@ -1587,7 +1585,7 @@ msgstr "  %2$.250s 
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %2$.250s ¤òÄ󶡤¹¤ë %1$.250s ¤¬ %3$s ¤Ç¤¹¡£\n"
 
-#: main/enquiry.c:56 main/query.c:96
+#: main/enquiry.c:56
 msgid "(no description available)"
 msgstr "(ÀâÌÀ(description)¤¬¤¢¤ê¤Þ¤»¤ó)"
 
@@ -1746,23 +1744,23 @@ msgstr "gcc-lib 
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr "dpkg: ·Ù¹ð¡¢¥ê¥Þ¥Ã¥Ô¥ó¥°É½¤Ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã `%s' ¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: main/enquiry.c:494
+#: main/enquiry.c:495
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--compare-versions ¤Ï 3 ¤Ä¤Î°ú¿ô(<¥Ð¡¼¥¸¥ç¥ó> <´Ø·¸> <¥Ð¡¼¥¸¥ç¥ó>)¤ò¼è¤ê¤Þ"
 "¤¹¡£"
 
-#: main/enquiry.c:499
+#: main/enquiry.c:500
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions ÉÔÀµ¤ÊÈæ³Ó"
 
-#: main/enquiry.c:504
+#: main/enquiry.c:505
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr "¥Ð¡¼¥¸¥ç¥ó a ¤ÏÉÔÀµ¤Ê¹½Ê¸¤Ç¤¹: %s\n"
 
-#: main/enquiry.c:514
+#: main/enquiry.c:515
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr "¥Ð¡¼¥¸¥ç¥ó b ¤ÏÉÔÀµ¤Ê¹½Ê¸¤Ç¤¹: %s\n"
@@ -1989,8 +1987,7 @@ msgid "not installed but configs remain"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢ÀßÄ꤬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
 #: main/help.c:87
-#, fuzzy
-msgid "dpkg - error: PATH is not set.\n"
+msgid "dpkg - warning: PATH is not set.\n"
 msgstr "dpkg - ·Ù¹ð: PATH ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
 #: main/help.c:102
@@ -2086,11 +2083,11 @@ msgstr "dpkg: ... OK 
 msgid "failed to rmdir/unlink `%.255s'"
 msgstr "`%.255s'¤Î rmdir/unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:54 main/help.c:477
+#: dpkg-deb/info.c:52 main/help.c:477
 msgid "failed to exec rm for cleanup"
 msgstr "¥¯¥ê¡¼¥ó¥¢¥Ã¥×ÍѤΠrm ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: main/main.c:44
+#: dpkg-deb/main.c:44 main/main.c:44
 msgid "Debian GNU/Linux `"
 msgstr "Debian GNU/Linux `"
 
@@ -2098,22 +2095,17 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥×¥í¥°¥é¥à ¥Ð¡¼¥¸¥ç¥ó "
 
-#: main/main.c:48 main/query.c:434
-#, fuzzy
+#: main/main.c:48
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
-"See "
+"See dpkg --licence for copyright and license details.\n"
 msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¤Ç¤¹; ¥³¥Ô¡¼¾ò·ï¤Ë¤Ä¤¤¤Æ¤Ï GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ\n"
 "¥Ð¡¼¥¸¥ç¥ó 2 ¤â¤·¤¯¤Ï¤½¤ì°Ê¹ß¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï\n"
 "̵ÊݾڤǤ¹¡£¥³¥Ô¡¼¥é¥¤¥È¤È¥é¥¤¥»¥ó¥¹¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï dpkg --licence \n"
 "¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: main/main.c:50 main/query.c:436
-msgid " --licence for copyright and license details.\n"
-msgstr ""
-
 #: main/main.c:58
 #, c-format
 msgid ""
@@ -2282,7 +2274,7 @@ msgstr ""
 "[*]¤Î¤¢¤ëʪ¤ÏÂçÎ̤ξðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£¥Ñ¥¤¥×¤ò»È¤¤`less'¤ä`more'¤Ç¸«¤Þ¤·¤ç"
 "¤¦!"
 
-#: dpkg-deb/main.c:157 main/main.c:185 main/query.c:502 split/main.c:144
+#: dpkg-deb/main.c:137 main/main.c:185 split/main.c:144
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "¥¢¥¯¥·¥ç¥ó --%s ¤È --%s ¤¬¶¥¹ç¤·¤Þ¤¹¡£"
@@ -2345,12 +2337,12 @@ msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends ¤ÏÀµÅö¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òɬÍפȤ·¤Þ¤¹¡£`%.250s' ¤ÏÉÔÀµ¤Ç¤¹; %s"
 
-#: main/main.c:263 main/main.c:274
+#: main/main.c:263 main/main.c:281
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s ¤ËÂФ¹¤ëÉÔÀµ¤ÊÀ°¿ô¤Ç¤¹: `%.250s'"
 
-#: main/main.c:292
+#: main/main.c:291
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2424,49 +2416,48 @@ msgstr ""
 "·Ù¹ð:[!]¤Î¤¢¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤ¹¤ë¤È¡¢¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¿¼¹ï¤Ê¥À¥á¡¼¥¸¤ò\n"
 "¼õ¤±¤ë¾ì¹ç¤¬¤¢¤ë¡£[*]¤Î¤Ä¤¤¤¿¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¡£\n"
 
-#: main/main.c:337
+#: main/main.c:336
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ÉÔÌÀ¤Ê¶¯À©¡¦µñÈÝ(force/refuse)¥ª¥×¥·¥ç¥ó `%.*s'"
 
-#: main/main.c:438 main/main.c:442
+#: main/main.c:437 main/main.c:441
 msgid "couldn't malloc in execbackend"
 msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: main/main.c:440 main/main.c:447
+#: main/main.c:439 main/main.c:446
 #, fuzzy
 msgid "couldn't strdup in execbackend"
 msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: main/main.c:451
+#: main/main.c:450
 #, fuzzy, c-format
 msgid "failed to exec %s"
 msgstr "tar ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: main/main.c:463
+#: main/main.c:462
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ¤Ï 1 ¤Ä¤Î°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£"
 
-#: main/main.c:464
+#: main/main.c:463
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ¤Ï°ú¿ô¤ò 1 ¤Ä¤À¤±°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£"
 
-#: main/main.c:466
+#: main/main.c:465
 msgid "invalid number for --command-fd"
 msgstr "--command-fd ¤Ø¤ÎÃͤ¬ÉÔÀµ¤Ç¤¹"
 
-#: main/main.c:468
+#: main/main.c:467
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' ¤ò¥¹¥È¥ê¡¼¥à¤È¤·¤Æ¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: main/main.c:493
+#: main/main.c:492
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d ¹ÔÌܤιÔËö¤Þ¤Ç¤Ëͽ´ü¤·¤Ê¤¤ eof ¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: dpkg-deb/main.c:169 main/main.c:537 main/main.c:552 main/query.c:537
-#: split/main.c:157
+#: dpkg-deb/main.c:158 main/main.c:536 main/main.c:570 split/main.c:166
 msgid "need an action option"
 msgstr "¥¢¥¯¥·¥ç¥ó¤ò»ØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£"
 
@@ -2475,7 +2466,7 @@ msgstr "
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending ¤Ï¥ª¥×¥·¥ç¥ó°Ê³°¤Î°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó¡£"
 
-#: main/packages.c:109 main/query.c:295
+#: main/packages.c:109
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s ¤Ï°ú¿ô¤Ë¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬É¬ÍפǤ¹¡£"
@@ -2602,17 +2593,17 @@ msgstr "
 msgid "failed to exec dpkg-deb to extract control information"
 msgstr "¥³¥ó¥È¥í¡¼¥ë¾ðÊó¤ò¼èÆÀ¤·¤è¤¦¤Ë¤â dpkg-deb ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: main/processarc.c:205
+#: main/processarc.c:204
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s ¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤ò %s ¤«¤éÅÐÏ¿¤·¤Þ¤¹¡£\n"
 
-#: main/processarc.c:214
+#: main/processarc.c:213
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥­¥Æ¥¯¥Á¥ã(%s)¤¬¥·¥¹¥Æ¥à(%s)¤È°ìÃפ·¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:265
+#: main/processarc.c:264
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2621,85 +2612,85 @@ msgstr ""
 "dpkg: %s ¤¬ %s ¤ò´Þ¤à¤³¤È¤ò¹Íθ¤¹¤ë¤È¡¢Àè¹Ô°Í¸¤ÎÌäÂ꤬¤¢¤ê¤Þ¤¹:\n"
 "%s"
 
-#: main/processarc.c:268
+#: main/processarc.c:267
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "Àè¹Ô°Í¸ÌäÂê - %.250s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:269
+#: main/processarc.c:268
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
 msgstr "dpkg: ·Ù¹ð - Àè¹Ô°Í¸¤ÎÌäÂê¤ò̵»ë¤·¤Æ¤¤¤Þ¤¹!\n"
 
-#: main/processarc.c:283
+#: main/processarc.c:282
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s ¤ò(%s ¤Ç)ÃÖ´¹¤¹¤ë¤¿¤á¤Î½àÈ÷¤ò¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: main/processarc.c:288
+#: main/processarc.c:287
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "(%2$s ¤«¤é) %1$s ¤òŸ³«¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: main/processarc.c:308
+#: main/processarc.c:307
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "(`%.250s'¤Ç»Ï¤Þ¤ë)ÀßÄê¥Õ¥¡¥¤¥ë̾¤¬Ä¹¤¹¤®¤Þ¤¹(>%d ʸ»ú)"
 
-#: main/processarc.c:362
+#: main/processarc.c:361
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s ¤ÇÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£"
 
 #. conff= fopen()
-#: main/processarc.c:364
+#: main/processarc.c:363
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s ¤Î¥¯¥í¡¼¥º¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: main/processarc.c:366
+#: main/processarc.c:365
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s ¤Î¥ª¡¼¥×¥ó¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: main/processarc.c:399
+#: main/processarc.c:398
 #, c-format
 msgid "De-configuring %s, so that we can remove %s ...\n"
 msgstr "%s ¤ÎÀßÄêºï½ü(deconfigure)¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£½¾¤Ã¤Æ %s ¤òºï½ü¤Ç¤­¤Þ¤¹ ...\n"
 
-#: main/processarc.c:457
+#: main/processarc.c:456
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "%.250s ¤òŸ³«¤·¡¢ÃÖ´¹¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: main/processarc.c:536
+#: main/processarc.c:535
 msgid "unable to exec dpkg-deb to get filesystem archive"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤·¤è¤¦¤Ë¤â dpkg-deb ¤Î¼Â¹Ô¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:549
+#: main/processarc.c:548
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb tar ½ÐÎϤÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: main/processarc.c:551
+#: main/processarc.c:550
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "²õ¤ì¤Æ¤¤¤ë tar ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à - ¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö¤¬²õ¤ì¤Æ¤¤¤Þ"
 "¤¹¡£"
 
-#: main/processarc.c:554
+#: main/processarc.c:553
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: ;·×¤Ê¥¼¥í¤ò¼è¤ê½ü¤­¤Þ¤¹"
 
-#: main/processarc.c:646
+#: main/processarc.c:645
 #, c-format
 msgid "dpkg: warning - unable to delete old file `%.250s': %s\n"
 msgstr "dpkg: ·Ù¹ð - ¸Å¤¤¥Õ¥¡¥¤¥ë`%.250s'¤Îºï½ü¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: main/processarc.c:668 main/processarc.c:905 main/remove.c:287
+#: main/processarc.c:667 main/processarc.c:902 main/remove.c:287
 msgid "cannot read info directory"
 msgstr "¾ðÊó¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:681
+#: main/processarc.c:680
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
@@ -2707,33 +2698,33 @@ msgstr ""
 "¤â\n"
 "Ť¹¤®¤Þ¤¹"
 
-#: main/processarc.c:693
+#: main/processarc.c:692
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "¸Å¤¤¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤òºï½ü¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:696
+#: main/processarc.c:695
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "(¤ª¤½¤é¤¯)¿·¤·¤¤¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:703
+#: main/processarc.c:702
 msgid "unable to open temp control directory"
 msgstr "°ì»þŪ¥³¥ó¥È¥í¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:712
+#: main/processarc.c:711
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë(`%.50s' ¤Ç»Ï¤Þ¤ë)¥³¥ó¥È¥í¡¼¥ë¾ðÊó¥Õ¥¡¥¤¥ë̾¤Ï¤¢¤Þ¤ê¤Ë¤â"
 "Ť¹¤®¤Þ¤¹¡£"
 
-#: main/processarc.c:717
+#: main/processarc.c:716
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥³¥ó¥È¥í¡¼¥ë¾ðÊó¤Ë¥Ç¥£¥ì¥¯¥È¥ê`%.250s'¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: main/processarc.c:719
+#: main/processarc.c:718
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
@@ -2744,22 +2735,22 @@ msgstr ""
 # #, c-format
 # msgid "package control info rmdir of `%.250s' didn't say not a dir"
 # msgstr "`%.250s' ¤Î¥Ñ¥Ã¥±¡¼¥¸¥³¥ó¥È¥í¡¼¥ë¾ðÊó rmdir ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¤È¸À¤Ã¤Æ¤¤¤Þ¤¹"
-#: main/processarc.c:725
+#: main/processarc.c:724
 #, c-format
 msgid "dpkg: warning - package %s contained list as info file"
 msgstr "dpkg: ·Ù¹ð - ¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬°ìÍ÷¤ò¾ðÊó¥Õ¥¡¥¤¥ë¤È¤·¤Æ´Þ¤ó¤Ç¤¤¤Þ¤·¤¿¡£"
 
-#: main/processarc.c:732
+#: main/processarc.c:731
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "¿·µ¬¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤ò`%.250s'¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/processarc.c:885
+#: main/processarc.c:882
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(%s ¤Ï´°Á´¤ËÃÖ´¹¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢¾Ã¤¨¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ)\n"
 
-#: main/processarc.c:921
+#: main/processarc.c:918
 #, c-format
 msgid "unable to delete disappearing control info file `%.250s'"
 msgstr "¥³¥ó¥È¥í¡¼¥ë¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤áºï½ü¤Ç¤­¤Þ¤»¤ó¡£"
@@ -2891,7 +2882,7 @@ msgstr "
 msgid "can't remove old postrm script"
 msgstr "¸Å¤¤ postrm ¥¹¥¯¥ê¥×¥È¤òºï½ü¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main/query.c:200 main/query.c:419 main/select.c:80
+#: main/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "%s ¤Ë°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
@@ -2979,154 +2970,6 @@ msgstr "%d 
 msgid "--forget-old-unavail takes no arguments"
 msgstr "--forget-old-unavail ¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó¡£"
 
-#: main/query.c:140
-msgid ""
-"Desired=Unknown/Install/Remove/Purge/Hold\n"
-"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
-"uppercase=bad)\n"
-msgstr ""
-"Í×˾=(U)ÉÔÌÀ/(I)¥¤¥ó¥¹¥È¡¼¥ë/(R)ºï½ü/(P)´°Á´ºï½ü/(H)°Ý»ý\n"
-"| ¾õÂÖ=(N)̵/(I)¥¤¥ó¥¹¥È¡¼¥ëºÑ/(C)ÀßÄê/(U)Ÿ³«/(F)ÀßÄ꼺ÇÔ/(H)Ⱦ¥¤¥ó¥¹¥È¡¼"
-"¥ë\n"
-"|/ ¥¨¥é¡¼=(¶õÍó)̵/(H)°Ý»ý/(R)Í׺ƥ¤¥ó¥¹¥È¡¼¥ë/X=ξÊý(¾õÂÖ,¥¨¥é¡¼¤ÎÂçʸ»ú=°Û"
-"¾ï)\n"
-
-#: main/query.c:144
-msgid "Name"
-msgstr "̾Á°"
-
-#: main/query.c:144
-msgid "Version"
-msgstr "¥Ð¡¼¥¸¥ç¥ó"
-
-#: dselect/methlist.cc:118 dselect/pkgtop.cc:295 main/query.c:144
-msgid "Description"
-msgstr "ÀâÌÀ"
-
-#: main/query.c:215
-#, c-format
-msgid "diversion by %s"
-msgstr "%s ¤Ë¤è¤ëÂàÈò(diversion)"
-
-#: main/query.c:216
-msgid "local diversion"
-msgstr "¥í¡¼¥«¥ë¤ÊÂàÈò(diversion)"
-
-#: main/query.c:217
-msgid "to"
-msgstr "¼¡¤Ø"
-
-#: main/query.c:217
-msgid "from"
-msgstr "¼¡¤«¤é"
-
-#: main/query.c:250
-msgid "--search needs at least one file name pattern argument"
-msgstr "--search ¤Ï°ú¿ô¤Ë¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤Î¥Õ¥¡¥¤¥ë̾¥Ñ¥¿¡¼¥ó¤¬É¬ÍפǤ¹¡£"
-
-#: main/query.c:278
-#, c-format
-msgid "dpkg: %s not found.\n"
-msgstr "dpkg: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
-
-#: main/query.c:315
-#, c-format
-msgid "Package `%s' is not installed and no info is available.\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¾ðÊó¤¬ÍøÍÑÉÔ²Äǽ¤Ç¤¹¡£\n"
-
-#: main/query.c:324
-#, c-format
-msgid "Package `%s' is not available.\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤ÀÍøÍѲÄǽ¤Ç¤¢¤ê¤Þ¤»¤ó¡£\n"
-
-#: main/query.c:334
-#, c-format
-msgid "Package `%s' is not installed.\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-
-#: main/query.c:343
-#, c-format
-msgid "Package `%s' does not contain any files (!)\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó¡£(!)\n"
-
-#: main/query.c:349
-msgid "locally diverted"
-msgstr "¥í¡¼¥«¥ë¤ËÂàÈò(divert)¤µ¤ì¤¿"
-
-#: main/query.c:350
-msgid "package diverts others"
-msgstr "¾¥Ñ¥Ã¥±¡¼¥¸¤ÎƱ̾¥Õ¥¡¥¤¥ë¤Ï¼¡¤Î̾¤ËÂàÈò¤·¤¿"
-
-#: main/query.c:351
-#, c-format
-msgid "diverted by %s"
-msgstr "%s ¤Ë¤è¤êÂàÈò(divert)¤µ¤ì¤¿"
-
-#: main/query.c:352
-#, c-format
-msgid " to: %s\n"
-msgstr " %s ¤Ø\n"
-
-#: main/query.c:371
-msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
-msgstr ""
-"¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤ë¤¿¤á¤Ë¤Ï dpkg --info (= dpkg-deb --info)¤ò¡¢\n"
-"¤½¤ÎÆâÍÆ°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï dpkg --contents (= dpkg-deb --contents)¤ò»È¤¤¤Þ"
-"¤¹¡£\n"
-
-#: dpkg-deb/main.c:46 main/query.c:430
-#, fuzzy
-msgid "Debian `"
-msgstr "Debian GNU/Linux `"
-
-#: main/query.c:432
-#, fuzzy
-msgid "' package management program query tool\n"
-msgstr "' ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥×¥í¥°¥é¥à ¥Ð¡¼¥¸¥ç¥ó "
-
-#: main/query.c:444
-msgid "Usage: "
-msgstr ""
-
-#: main/query.c:445
-#, c-format
-msgid ""
-" [<option>] <command>\n"
-"Commands:\n"
-"  -s|--status <package-name> ...      display package status details\n"
-"  -p|--print-avail <package-name> ... display available version details\n"
-"  -L|--listfiles <package-name> ...   list files `owned' by package(s)\n"
-"  -l|--list [<pattern> ...]           list packages concisely\n"
-"  -W|--show <pattern> ...             show information on package(s)\n"
-"  -S|--search <pattern> ...           find package(s) owning file(s)\n"
-"  --help | --version                  show this help / version number\n"
-"  --licence                           print copyright licensing terms\n"
-"\n"
-"Options:\n"
-"  --admindir=<directory>     Use <directory> instead of %s\n"
-"  --showformat=<format>      Use alternative format for --show\n"
-"\n"
-"Format syntax:\n"
-"  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
-"  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;"
-"width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in "
-"which\n"
-"   case left aligenment will be used. \n"
-msgstr ""
-
-#: main/query.c:472
-msgid ""
-"Use --help for help about querying packages;\n"
-"Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
-"\n"
-msgstr ""
-
 #: dpkg-deb/build.c:66
 #, c-format
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
@@ -3158,24 +3001,24 @@ msgid "%s: failed to exec gzip %s"
 msgstr "%s: gzip %s ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
 #. Decode our arguments
-#: dpkg-deb/build.c:223
+#: dpkg-deb/build.c:224
 msgid "--build needs a directory argument"
 msgstr "--build ¤Ï°ú¿ô¤È¤·¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤¬É¬ÍפǤ¹¡£"
 
-#: dpkg-deb/build.c:232
+#: dpkg-deb/build.c:233
 msgid "--build takes at most two arguments"
 msgstr "--build ¤Ï¿¤¯¤È¤â 2 ¤Ä¤Î°ú¿ô¤·¤«¼è¤ê¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:236
+#: dpkg-deb/build.c:237
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "¥¢¡¼¥«¥¤¥Ö `%.250s' ¤Î¸ºß¤Î³Îǧ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:251
+#: dpkg-deb/build.c:252
 msgid "target is directory - cannot skip control file check"
 msgstr "Âоݤ¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ë¸¡¾Ú¤ò¥¹¥­¥Ã¥×¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:252
+#: dpkg-deb/build.c:253
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3184,46 +3027,46 @@ msgstr ""
 "dpkg-deb: ·Ù¹ð¡¢¥³¥ó¥È¥í¡¼¥ë¥¨¥ê¥¢¤ÎÆâÍƤΥÁ¥§¥Ã¥¯¤ò¹Ô¤¤¤Þ¤»¤ó¡£\n"
 "dpkg-deb: `%s' ¤«¤éÉÔÌÀ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ò¹½ÃÛ¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: dpkg-deb/build.c:270
+#: dpkg-deb/build.c:271
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë¾®Ê¸»ú¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢±Ñ¿ô»ú¡¢`-+.'°Ê³°¤Îʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: dpkg-deb/build.c:272
+#: dpkg-deb/build.c:273
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "·Ù¹ð¡¢`%s' ¤¬¥æ¡¼¥¶ÄêµÁ¤ÎÍ¥ÀèÅÙ `%s' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n"
 
-#: dpkg-deb/build.c:277
+#: dpkg-deb/build.c:278
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "·Ù¹ð¡¢`%s' ¤¬¥æ¡¼¥¶ÄêµÁ¤Î¥Õ¥£¡¼¥ë¥É `%s' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n"
 
-#: dpkg-deb/build.c:283
+#: dpkg-deb/build.c:284
 #, c-format
 msgid "%d errors in control file"
 msgstr "¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ë¤Ç %d ¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: dpkg-deb/build.c:294
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: %2$s ¤Ë¥Ñ¥Ã¥±¡¼¥¸ `%1$s' ¤ò¹½ÃÛ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:303
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "¥³¥ó¥È¥í¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Îµö²Ä°À­ %03lo ¤ÏÉÔÀµ¤Ç¤¹(>=0755 ¤«¤Ä <=0775 ¤Ç¤Ê¤±"
 "¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
 
-#: dpkg-deb/build.c:313
+#: dpkg-deb/build.c:314
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "¥á¥ó¥Æ¥Ê¥¹¥¯¥ê¥×¥È `%.50s' ¤¬¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤«¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤Ï¤¢¤ê¤Þ¤»"
 "¤ó¡£"
 
-#: dpkg-deb/build.c:315
+#: dpkg-deb/build.c:316
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3232,125 +3075,125 @@ msgstr ""
 "¥á¥ó¥Æ¥Ê¥¹¥¯¥ê¥×¥È`%.50s'¤Îµö²Ä°À­ %03lo ¤ÏÉÔÀµ¤Ç¤¹( >=0555 ¤«¤Ä <=0775¤Ç¤Ê"
 "¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó)"
 
-#: dpkg-deb/build.c:319
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "¥á¥ó¥Æ¥Ê¥¹¥¯¥ê¥×¥È `%.50s' ¤¬Æɤ߹þ¤á¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:329
+#: dpkg-deb/build.c:330
 msgid "empty string from fgets reading conffiles"
 msgstr "conffiles ¤ÎÆɤ߹þ¤ß¤Ç fgets ¤«¤é¤Î¶õ¤Îʸ»ú"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:332
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "·Ù¹ð¡¢ÀßÄê¥Õ¥¡¥¤¥ë̾ `%.50s...' ¤ÏŤ¹¤®¤ë¤«¡¢ºÇ¸å¤Î²þ¹Ô¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: dpkg-deb/build.c:343
+#: dpkg-deb/build.c:344
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë `%.250s' ¤¬¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ë¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:345
+#: dpkg-deb/build.c:346
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë `%.250s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:347
+#: dpkg-deb/build.c:348
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "·Ù¹ð¡¢ÀßÄê¥Õ¥¡¥¤¥ë `%s' ¤¬¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: dpkg-deb/build.c:352
+#: dpkg-deb/build.c:353
 msgid "error reading conffiles file"
 msgstr "conffiles ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: dpkg-deb/build.c:355
+#: dpkg-deb/build.c:356
 msgid "error opening conffiles file"
 msgstr "conffiles ¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: dpkg-deb/build.c:358
+#: dpkg-deb/build.c:359
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ë¤Î %d ¸Ä¤Î·Ù¹ð¤ò̵»ë¤·¤Þ¤¹¡£\n"
 
-#: dpkg-deb/build.c:368
+#: dpkg-deb/build.c:369
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "`%.255s' ÍѤΥХåե¡¤ò³«Êü¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/build.c:373 dpkg-deb/build.c:446 dpkg-deb/build.c:467
+#: dpkg-deb/build.c:374 dpkg-deb/build.c:447 dpkg-deb/build.c:468
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ¤Ø¤Î chdir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/build.c:374
+#: dpkg-deb/build.c:375
 msgid "failed to chdir to .../DEBIAN"
 msgstr ".../DEBIAN ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î°ÜÆ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/build.c:375 dpkg-deb/build.c:448
+#: dpkg-deb/build.c:376 dpkg-deb/build.c:449
 msgid "failed to exec tar -cf"
 msgstr "tar -cf ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
 #. Create a temporary file to store the control data in. Immediately unlink
 #. * our temporary file so others can't mess with it.
 #.
-#: dpkg-deb/build.c:381
+#: dpkg-deb/build.c:382
 msgid "failed to make tmpfile (control)"
 msgstr "tmpfile ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(control)"
 
-#: dpkg-deb/build.c:382
+#: dpkg-deb/build.c:383
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "tmpfile %s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(control)"
 
 #. make sure it's gone, the fd will remain until we close it
-#: dpkg-deb/build.c:385
+#: dpkg-deb/build.c:386
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "tmpfile %s ¤Î unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(control)"
 
-#: dpkg-deb/build.c:393 dpkg-deb/build.c:422 dpkg-deb/build.c:457
+#: dpkg-deb/build.c:394 dpkg-deb/build.c:423 dpkg-deb/build.c:458
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:399
 msgid "failed to fstat tmpfile (control)"
 msgstr "tmpfile ¤Î fstat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(control)"
 
-#: dpkg-deb/build.c:421
+#: dpkg-deb/build.c:422
 msgid "failed to rewind tmpfile (control)"
 msgstr "tmpfile ¤Î rewind ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(control)"
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:430
 msgid "failed to make tmpfile (data)"
 msgstr "tmpfile ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(data)"
 
-#: dpkg-deb/build.c:430
+#: dpkg-deb/build.c:431
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "tmpfile %s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(data)"
 
 #. make sure it's gone, the fd will remain until we close it
-#: dpkg-deb/build.c:433
+#: dpkg-deb/build.c:434
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "tmpfile ¤Î unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(data), %s"
 
-#: dpkg-deb/build.c:469
+#: dpkg-deb/build.c:470
 msgid "failed to exec find"
 msgstr "find ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/build.c:480 dpkg-deb/build.c:487
+#: dpkg-deb/build.c:481 dpkg-deb/build.c:488
 msgid "failed to write filename to tar pipe (data)"
 msgstr "tar ¥Ñ¥¤¥×¤Ø¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(data)¡£"
 
-#: dpkg-deb/build.c:504
+#: dpkg-deb/build.c:505
 msgid "failed to rewind tmpfile (data)"
 msgstr "tmpfile ¤Î rewind ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿(data)¡£"
 
-#: dpkg-deb/build.c:505
+#: dpkg-deb/build.c:506
 msgid "cat (data)"
 msgstr "cat (¥Ç¡¼¥¿)"
 
@@ -3376,7 +3219,8 @@ msgstr "
 #: dpkg-deb/extract.c:79 split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
-msgstr "file `%.250s' is corrupt - bad digit (code %d) in %s"
+msgstr ""
+"¥Õ¥¡¥¤¥ë `%1$.250s' ¤Ï²õ¤ì¤Æ¤¤¤Þ¤¹ - %3$s ¤Ë¤¢¤ë¿ô»ú(¥³¡¼¥É %2$d)¤ÏÉÔÀµ¤Ç¤¹¡£"
 
 #: dpkg-deb/extract.c:108
 #, c-format
@@ -3551,7 +3395,7 @@ msgstr "
 msgid "failed to exec tar"
 msgstr "tar ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:66
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ¤Ï°ú¿ô¤È¤·¤Æ .deb ¥Õ¥¡¥¤¥ë̾¤¬É¬ÍפǤ¹¡£"
@@ -3575,167 +3419,137 @@ msgstr "--%s 
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ¤Ï°ú¿ô¤ò¤Ò¤È¤Ä(.deb¥Õ¥¡¥¤¥ë̾)¤À¤±¼è¤ê¤Þ¤¹¡£"
 
-#: dpkg-deb/info.c:49
+#: dpkg-deb/info.c:47
 msgid "failed to chdir to `/' for cleanup"
 msgstr "Áݽü¤Î¤¿¤á¤Î `/' ¤Ø¤Î chdir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:51
+#: dpkg-deb/info.c:49
 msgid "failed to fork for cleanup"
 msgstr "ÁݽüÍѤΠfork ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:56
+#: dpkg-deb/info.c:54
 msgid "failed to wait for rm cleanup"
 msgstr "rm ¤Ë¤è¤ëÁݽü¤Î wait ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:57
+#: dpkg-deb/info.c:55
 #, c-format
 msgid "rm cleanup failed, code %d\n"
 msgstr "rm ¤Ë¤è¤ëÁݽü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥³¡¼¥É %d\n"
 
-#: dpkg-deb/info.c:71
-#, fuzzy
-msgid "failed to make temporary directoryname"
+#: dpkg-deb/info.c:69
+msgid "failed to make temporary filename"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:75
+#: dpkg-deb/info.c:73
 msgid "failed to exec rm -rf"
 msgstr "rm -rf ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:95
+#: dpkg-deb/info.c:93
 msgid "info_spew"
 msgstr "¾ðÊóÃê½Ð"
 
-#: dpkg-deb/info.c:97
+#: dpkg-deb/info.c:95
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 "dpkg-deb: `%.255s' ¤Ï¥³¥ó¥È¥í¡¼¥ë¥³¥ó¥Ý¡¼¥Í¥ó¥È `%.255s' ¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: dpkg-deb/info.c:101
+#: dpkg-deb/info.c:99
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "(%2$.255s ¤Ë¤¢¤ë)¥³¥ó¥Ý¡¼¥Í¥ó¥È `%1$.255s' ¤Î¥ª¡¼¥×¥ó»þ¤Ëͽ´ü¤·¤Ê¤¤¼ºÇÔ¤¬µ¯¤³"
 "¤ê¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:106
-#, fuzzy
-msgid "One requested control component is missing"
-msgstr "¾¯¤Ê¤¯¤È¤â 1 ¤ÄɬÍ×¤Ê control ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬¤¢¤ê¤Þ¤»¤ó¡£"
-
-#: dpkg-deb/info.c:108
-#, fuzzy, c-format
-msgid "%d requested control components are missing"
+#: dpkg-deb/info.c:103
+msgid "at least one requested control component missing"
 msgstr "¾¯¤Ê¤¯¤È¤â 1 ¤ÄɬÍ×¤Ê control ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/info.c:121
+#: dpkg-deb/info.c:116
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%.255s' ¤ò¥¹¥­¥ã¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/info.c:126
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' ¤Ë¤¢¤ë) `%1$.255s' ¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/info.c:129
+#: dpkg-deb/info.c:124
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' ¤Ë¤¢¤ë) `%1$.255s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/info.c:143
+#: dpkg-deb/info.c:138
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' ¤Ë¤¢¤ë) `%1$.255s' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:141
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld ¥Ð¥¤¥È, %5d ¹Ô   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:152
+#: dpkg-deb/info.c:147
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     Èó¥×¥ì¡¼¥ó¥Õ¥¡¥¤¥ë          %.255s\n"
 
-#: dpkg-deb/info.c:157
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "failed to read `control' (in `%.255s')"
 msgstr "(`%.255s' ¤Ë¤¢¤ë) `control' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dpkg-deb/info.c:158
+#: dpkg-deb/info.c:153
 msgid "(no `control' file in control archive!)\n"
 msgstr "(¥³¥ó¥È¥í¡¼¥ë¥¢¡¼¥«¥¤¥Ö¤Ë `control' ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó!)\n"
 
-#: dpkg-deb/info.c:178
+#: dpkg-deb/info.c:173
 msgid "could not open the `control' component"
 msgstr "`control' ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: dpkg-deb/info.c:208
+#: dpkg-deb/info.c:203
 msgid "failed during read of `control' component"
 msgstr "`control' ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÎÆɤ߹þ¤ßÃ楨¥é¡¼¤Ç¤¹¡£"
 
-#: dpkg-deb/info.c:219
-msgid "Error in format"
-msgstr ""
-
-#: dpkg-deb/info.c:255
+#: dpkg-deb/info.c:235
 msgid "--contents takes exactly one argument"
 msgstr "--contents ¤Ï°ú¿ô¤ò 1 ¤Ä¤À¤±¼è¤ê¤Þ¤¹¡£"
 
-#: dpkg-deb/main.c:48
+#: dpkg-deb/main.c:46
 msgid "' package archive backend version "
 msgstr "' ¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö¥Ð¥Ã¥¯¥¨¥ó¥É¥Ð¡¼¥¸¥ç¥ó "
 
-#: dpkg-deb/main.c:50
-#, fuzzy
+#: dpkg-deb/main.c:48
 msgid ""
-"This is free software; see the GNU General Public Licence version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See dpkg-deb --licence for details.\n"
+"Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
+"GNU General Public Licence version 2 or later for copying conditions.\n"
+"There is NO warranty.  See dpkg-deb --licence for details.\n"
 msgstr ""
-"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¤Ç¤¹; ¥³¥Ô¡¼¾ò·ï¤Ë¤Ä¤¤¤Æ¤Ï GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ\n"
-"¥Ð¡¼¥¸¥ç¥ó 2 ¤â¤·¤¯¤Ï¤½¤ì°Ê¹ß¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï\n"
-"̵ÊݾڤǤ¹¡£¥³¥Ô¡¼¥é¥¤¥È¤È¥é¥¤¥»¥ó¥¹¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï dpkg --licence \n"
-"¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"Copyright (C) 1994-1996 Ian Jackson.  ¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¤Ç¤¹; ¥³¥Ô¡¼¾ò·ï¤Ë\n"
+"¤Ä¤¤¤Æ¤Ï GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¥Ð¡¼¥¸¥ç¥ó 2 ¤â¤·¤¯¤Ï¤½¤ì°Ê¹ß¤ò»²¾È¤·¤Æ¤¯¤À¤µ"
+"¤¤¡£\n"
+"̵ÊݾڤǤ¹¡£¾ÜºÙ¤Ï dpkg-deb --licence ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: dpkg-deb/main.c:57
-#, fuzzy
+#: dpkg-deb/main.c:55
 msgid ""
-"Command:\n"
-"  -b|--build <directory> [<deb>]    build an archive.\n"
-"  -c|--contents <deb>               list contents.\n"
-"  -I|--info <deb> [<cfile>...]      show info to stdout.\n"
-"  -W|--show <deb>                   Show information on package(s)\n"
-"  -f|--field <deb> [<cfield>...]    show field(s) to stdout.\n"
-"  -e|--control <deb> [<directory>]  extract control info.\n"
-"  -x|--extract <deb> <directory>    extract files.\n"
-"  -X|--vextract <deb> <directory>   extract & list files.\n"
-"  --fsys-tarfile <deb>              output filesystem tarfile.\n"
-"  -h|--help                         display this message.\n"
-"  --version | --licence             show version/licence.\n"
-"\n"
+"Usage: dpkg-deb -b|--build <directory> [<deb>]    Build an archive.\n"
+"       dpkg-deb -c|--contents <deb>               List contents.\n"
+"       dpkg-deb -I|--info <deb> [<cfile>...]      Show info to stdout.\n"
+"       dpkg-deb -f|--field <deb> [<cfield>...]    Show field(s) to stdout.\n"
+"       dpkg-deb -e|--control <deb> [<directory>]  Extract control info.\n"
+"       dpkg-deb -x|--extract <deb> <directory>    Extract files.\n"
+"       dpkg-deb -X|--vextract <deb> <directory>   Extract & list files.\n"
+"       dpkg-deb --fsys-tarfile <deb>              Output filesystem "
+"tarfile.\n"
+"       dpkg-deb -h|--help                         Display this message.\n"
+"       dpkg-deb --version | --licence             Show version/licence.\n"
 "<deb> is the filename of a Debian format archive.\n"
 "<cfile> is the name of an administrative file component.\n"
 "<cfield> is the name of a field in the main `control' file.\n"
-"\n"
-"Options:\n"
-"  --showformat=<format>      Use alternative format for --show\n"
-"  -D                         Enable debugging output\n"
-"  --old, --new               select archive format\n"
-"  --nocheck                  suppress control file check (build bad "
-"package).\n"
-"  -z# to set the compression when building\n"
-"\n"
-"Format syntax:\n"
-"  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
-"  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;"
-"width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in "
-"which\n"
-"   case left aligenment will be used. \n"
+"Options:  -D for debugging output; --old or --new controls archive format;\n"
+"          --nocheck to suppress control file check (build bad package).\n"
+"          -z# to set the compression when building\n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
 "`dselect' for user-friendly package management.  Packages unpacked\n"
@@ -3768,7 +3582,7 @@ msgstr ""
 "¥¸\n"
 "¤ÏÀµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤»¤ó!\n"
 
-#: dpkg-deb/main.c:98
+#: dpkg-deb/main.c:81
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4134,33 +3948,33 @@ msgstr "`%.250s' 
 msgid "Deleted %s.\n"
 msgstr "%s ¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: split/split.c:45
+#: split/split.c:46
 msgid "--split needs a source filename argument"
 msgstr "--split ¤Ï°ú¿ô¤Ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤¬É¬ÍפǤ¹¡£"
 
-#: split/split.c:48
+#: split/split.c:49
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split ¤Ï°ú¿ô¤È¤·¤Æ¥½¡¼¥¹¥Õ¥¡¥¤¥ë̾¤Èʬ³äÀè¥×¥ì¥Õ¥£¥¯¥¹¤¬É¬ÍפǤ¹¡£"
 
-#: split/split.c:62
+#: split/split.c:63
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë `%.250s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: split/split.c:63
+#: split/split.c:64
 msgid "unable to fstat source file"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤é¤ì¤Þ¤»¤ó(fstat ¼ºÇÔ)¡£"
 
-#: split/split.c:64
+#: split/split.c:65
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë `%.250s' ¤¬¥×¥ì¡¼¥ó¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: split/split.c:70
+#: split/split.c:71
 msgid "unable to exec mksplit"
 msgstr "mksplit ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: utils/md5sum.c:60
+#: utils/md5sum.c:61
 msgid "Type md5sum --help for help."
 msgstr "¥Ø¥ë¥×¤Ï md5sum --help ¤Ç»²¾È¤Ç¤­¤Þ¤¹¡£"
 
@@ -4171,7 +3985,7 @@ msgstr ""
 "%s: %s ¤ÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹(--%s):\n"
 " %s¡£\n"
 
-#: utils/md5sum.c:185
+#: utils/md5sum.c:169
 msgid ""
 "usage: md5sum [-bv] [-c [file]] | [file...]\n"
 "Generates or checks MD5 Message Digests\n"
@@ -4189,149 +4003,145 @@ msgstr ""
 "-c ¤ÎÆþÎϤϥá¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤È¥Õ¥¡¥¤¥ë̾¤Î°ìÍ÷¤Ç¤¢¤ë¡£°ìÍ÷¤Ë¤Ï¡¢¤³¤Î\n"
 "¥×¥í¥°¥é¥à¤Î¥À¥¤¥¸¥§¥¹¥ÈºîÀ®»þ¤Ëɸ½à½ÐÎϤ˽ÐÎϤµ¤ì¤ë¤â¤Î¤¬»ÈÍѤµ¤ì¤ë¡£\n"
 
-#: utils/md5sum.c:198
+#: utils/md5sum.c:182
 msgid "mdfile"
 msgstr "mdfile"
 
-#: utils/md5sum.c:238
+#: utils/md5sum.c:222
 #, c-format
 msgid "%s: unrecognized line: %s"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¹Ô: %s"
 
-#: utils/md5sum.c:268
+#: utils/md5sum.c:256
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: utils/md5sum.c:272
+#: utils/md5sum.c:261
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: %s ¤ÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: utils/md5sum.c:278
+#: utils/md5sum.c:269
 msgid "FAILED\n"
 msgstr "¼ºÇÔ\n"
 
-#: utils/md5sum.c:280
+#: utils/md5sum.c:271
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: '%s'¤ËÂФ¹¤ë MD5 ¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: utils/md5sum.c:283
+#: utils/md5sum.c:274
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:287
+#: utils/md5sum.c:278
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
-msgstr "%s: %d of %d file(s) failed MD5 check\n"
+msgstr "%1$s: %3$d ¥Õ¥¡¥¤¥ëÃæ %2$d ¥Õ¥¡¥¤¥ë¤¬ MD5 ¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: utils/md5sum.c:289
+#: utils/md5sum.c:280
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: dselect/basecmds.cc:120
+#: dselect/basecmds.cc:99
 msgid "Search for ? "
 msgstr "¸¡º÷¹àÌÜ?"
 
-#: dselect/basecmds.cc:142
-#, fuzzy
-msgid "Error: "
-msgstr "¥¨¥é¡¼"
-
-#: dselect/basecmds.cc:170
+#: dselect/basecmds.cc:131
 msgid "Help: "
 msgstr "¥Ø¥ë¥×: "
 
-#: dselect/basecmds.cc:176
-msgid "Press ? for help menu, <space> for next topic, <enter> to exit help."
+#: dselect/basecmds.cc:137
+msgid ""
+"? = help menu    Space = exit help    . = next help    or a help page key "
 msgstr ""
+"? =¥Ø¥ë¥×¥á¥Ë¥å¡¼  Space =¥Ø¥ë¥×¤Î½ªÎ»  . =¼¡¤Î¥Ø¥ë¥×¡¢¤Þ¤¿¤Ï¥Ø¥ë¥×Áàºî¥­¡¼ "
 
-#: dselect/basecmds.cc:183
+#: dselect/basecmds.cc:145
 msgid "Help information is available under the following topics:"
 msgstr "°Ê²¼¤Î¥È¥Ô¥Ã¥¯¥¹¤«¤é¥Ø¥ë¥×¾ðÊó¤¬ÍøÍѤǤ­¤Þ¤¹:"
 
-#: dselect/basecmds.cc:191
-#, fuzzy
+#: dselect/basecmds.cc:153
 msgid ""
-"Press a key from the list above, <enter>, `q' or `Q' to exit help,\n"
-"  or <space> to read each help page in turn. "
+"Press a key from the list above, Space to exit help,\n"
+"  or `.' (full stop) to read each help page in turn. "
 msgstr ""
 "¾å¤Î¥ê¥¹¥È¤«¤é¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¥Ø¥ë¥×¤ò½ªÎ»¤·¤Þ¤¹¡£\n"
 " '.'(¥Ô¥ê¥ª¥É)¥­¡¼¤Ç¥Ø¥ë¥×¥Ú¡¼¥¸¤ò½ç¼¡¸«¤Æ¤¤¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:159
 msgid "error reading keyboard in help"
 msgstr "¥Ø¥ë¥×¤Î¥­¡¼¥Ü¡¼¥ÉÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: dselect/baselist.cc:55
+#: dselect/baselist.cc:54
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: dselect/baselist.cc:58
+#: dselect/baselist.cc:57
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "SIGWINCH ¥Ï¥ó¥É¥éÆâ¤Î doupdate ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:65
+#: dselect/baselist.cc:64
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "¸Å¤¤ SIGWINCH sigact ¤ÎÉüµ¢¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:67
+#: dselect/baselist.cc:66
 msgid "failed to restore old signal mask"
 msgstr "¥Ú¡¼¥¹¥ÈÃæ¤Ë p1 ¤Î¥ª¡¼¥×¥ó(fdopen)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:77
+#: dselect/baselist.cc:76
 msgid "failed to get old signal mask"
 msgstr "¥Ú¡¼¥¹¥ÈÃæ¤Ë p1 ¤Î¥ª¡¼¥×¥ó(fdopen)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:78
+#: dselect/baselist.cc:77
 msgid "failed to get old SIGWINCH sigact"
 msgstr "¸Å¤¤ SIGWINCH sigact ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:82
+#: dselect/baselist.cc:81
 msgid "failed to block SIGWINCH"
 msgstr "SIGWINCH ¤Î¥Ö¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
 #. nsigact.sa_flags= SA_INTERRUPT;
-#: dselect/baselist.cc:87
+#: dselect/baselist.cc:86
 msgid "failed to set new SIGWINCH sigact"
 msgstr "¿·¤·¤¤ SIGWINCH sigact ¤Î¥»¥Ã¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:124
+#: dselect/baselist.cc:123
 #, fuzzy
 msgid "failed to allocate colour pair"
 msgstr "¥«¥é¡¼¥Ú¥¢¤Î³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:164
+#: dselect/baselist.cc:163
 msgid "failed to create title window"
 msgstr "¥¿¥¤¥È¥ë¥¦¥£¥ó¥É¥¦¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:168
+#: dselect/baselist.cc:167
 msgid "failed to create whatinfo window"
 msgstr "¾ðÊ󥦥£¥ó¥É¥¦¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:172
+#: dselect/baselist.cc:171
 msgid "failed to create baselist pad"
 msgstr "´ðËܥꥹ¥È¥Ñ¥Ã¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:175
+#: dselect/baselist.cc:174
 msgid "failed to create heading pad"
 msgstr "¥Ø¥Ç¥£¥ó¥°¥Ñ¥Ã¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:179
+#: dselect/baselist.cc:178
 msgid "failed to create thisstate pad"
 msgstr "¥Ç¥£¥¹¥¹¥Æ¡¼¥È¥Ñ¥Ã¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:183
+#: dselect/baselist.cc:182
 msgid "failed to create info pad"
 msgstr "¾ðÊó¥Ñ¥Ã¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:188
+#: dselect/baselist.cc:187
 msgid "failed to create query window"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/baselist.cc:201
+#: dselect/baselist.cc:200
 #, c-format
 msgid ""
 "baselist::startdisplay() done ...\n"
@@ -4356,21 +4166,21 @@ msgstr ""
 " whatinfo_row=%d, list_row=%d;\n"
 "\n"
 
-#: dselect/baselist.cc:257
+#: dselect/baselist.cc:256
 msgid "keybindings"
 msgstr "¥­¡¼ÀßÄê"
 
-#: dselect/baselist.cc:305
+#: dselect/baselist.cc:311
 #, c-format
 msgid "  -- %d%%, press "
 msgstr " -- %d%%¡¢"
 
-#: dselect/baselist.cc:308
+#: dselect/baselist.cc:314
 #, c-format
 msgid "%s for more"
 msgstr "%s ¤Ç¥¹¥¯¥í¡¼¥ë"
 
-#: dselect/baselist.cc:312
+#: dselect/baselist.cc:318
 #, c-format
 msgid "%s to go back"
 msgstr "%s ¥­¡¼¤ÇÌá¤ë"
@@ -4674,15 +4484,15 @@ msgid "screen part"
 msgstr ""
 
 #: dselect/main.cc:244
-msgid "Null colour specification\n"
+msgid "Null color specificaton\n"
 msgstr ""
 
 #: dselect/main.cc:252 dselect/main.cc:257
-msgid "colour"
+msgid "color"
 msgstr ""
 
 #: dselect/main.cc:265
-msgid "colour attribute"
+msgid "color attribute"
 msgstr ""
 
 #: dselect/main.cc:299
@@ -4733,49 +4543,53 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr "¥á¥¤¥ó¥á¥Ë¥å¡¼¤Ç¤Î getch ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: dselect/main.cc:489
+#: dselect/main.cc:496
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ÉÔÌÀ¤Ê¥¢¥¯¥·¥ç¥óʸ»úÎó `%.50s' ¤Ç¤¹¡£"
 
-#: dselect/methlist.cc:74
+#: dselect/methlist.cc:67
 msgid "dselect - list of access methods"
 msgstr "dselect - ¥¢¥¯¥»¥¹ÊýË¡¤Î°ìÍ÷"
 
-#: dselect/methlist.cc:83
+#: dselect/methlist.cc:76
 #, c-format
 msgid "Access method `%s'."
 msgstr "¥¢¥¯¥»¥¹ÊýË¡ `%s'¡£"
 
-#: dselect/methlist.cc:117
+#: dselect/methlist.cc:110
 msgid "Abbrev."
 msgstr "Ƭʸ»ú"
 
-#: dselect/methlist.cc:162
+#: dselect/methlist.cc:111 dselect/pkgtop.cc:295
+msgid "Description"
+msgstr "ÀâÌÀ"
+
+#: dselect/methlist.cc:155
 msgid "doupdate failed"
 msgstr "doupdate ¼ºÇÔ"
 
-#: dselect/methlist.cc:164
+#: dselect/methlist.cc:157
 msgid "failed to unblock SIGWINCH"
 msgstr "SIGWINCH ¤Î¥¢¥ó¥Ö¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: dselect/methlist.cc:168
+#: dselect/methlist.cc:161
 msgid "failed to re-block SIGWINCH"
 msgstr "SIGWINCH ¤Î¥ê¥Ö¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: dselect/methlist.cc:169
+#: dselect/methlist.cc:162
 msgid "getch failed"
 msgstr "getch ¼ºÇÔ"
 
-#: dselect/methlist.cc:173 dselect/pkgdepcon.cc:240
+#: dselect/methlist.cc:166 dselect/pkgdepcon.cc:242
 msgid "[none]"
 msgstr "[¤Ê¤·]"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc:180
 msgid "explanation of "
 msgstr "ÀâÌÀ: "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc:190
 msgid "No explanation available."
 msgstr "ÀâÌÀ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
@@ -5346,18 +5160,10 @@ msgstr "
 msgid "available version of control info for "
 msgstr "ÍøÍѲÄǽ¥Ð¡¼¥¸¥ç¥ó¤ÎÀ©¸æ¾ðÊó "
 
-#: dselect/pkglist.cc:121 dselect/pkglist.cc:122
+#: dselect/pkglist.cc:120 dselect/pkglist.cc:121
 msgid "<null>"
 msgstr "<¤Ê¤·>"
 
-#: dselect/pkglist.cc:505
-msgid "invalid search option given"
-msgstr ""
-
-#: dselect/pkglist.cc:519
-msgid "error in regular expression"
-msgstr ""
-
 #: dselect/pkgsublist.cc:103
 msgid " does not appear to be available\n"
 msgstr "ÍøÍѲÄǽ¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹\n"
@@ -5506,40 +5312,43 @@ msgstr ""
 "   D     ľÀÜÍ׵ᤵ¤ì¤¿¾õÂ֤ˤ¹¤Ù¤Æ½¾¤¦  \\   ¸¡º÷¼¡¸õÊä\n"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
-msgid "Introduction to package selections"
+msgid "Introduction to package list"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤Î¼ê°ú¤­"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
 msgid ""
-"Welcome to dselect's main package listing.\n"
+"Welcome to the main package listing.  Please read the help that is "
+"available!\n"
 "\n"
 "You will be presented with a list of packages which are installed or "
 "available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
+"\n"
 "Packages can be marked either singly or in groups; initially you will see "
 "that\n"
 "the line `All packages' is selected.  `+', `-' and so on will affect all "
 "the\n"
-"packages described by the highlighted line.\n"
+"packages described by the highlighted line.  Use `o' to change the order of "
+"the\n"
+"list (this also changes which kinds of group selections are possible).\n"
+"\n"
+"(Mainly for new installations:) Standard packages will be requested by "
+"default.\n"
+"Use capital `D' or `R' key to override this - see the keybindings help "
+"screen.\n"
 "\n"
 "Some of your choices will cause conflicts or dependency problems; you will "
 "be\n"
 "given a sub-list of the relevant packages, so that you can solve the "
 "problems.\n"
 "\n"
-"You should read the list of keys and the explanations of the display.\n"
-"Much on-line help is available, please make use of it - press `?' at\n"
-"any time for help.\n"
-"\n"
-"When you have finished selecting packages, press <enter> to confirm "
-"changes,\n"
-"or `Q' to quit without saving changes. A final check on conflicts and\n"
+"When you are satisfied with your choices you should press Return to confirm\n"
+"your changes and leave the package listing.  A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
-"Press <enter> to leave help and enter the list now.\n"
+"Press Space to leave help and enter the list; press `?' at any time for "
+"help.\n"
 msgstr ""
 "¥á¥¤¥ó¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤Ë¤è¤¦¤³¤½¡£¥Ø¥ë¥×¤¬ÍøÍѤǤ­¤Þ¤¹¤Î¤Ç¡¢¸æ°ìÆɤ¯¤À¤µ¤¤¡£\n"
 "\n"
@@ -5573,31 +5382,31 @@ msgstr ""
 "¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¥Ø¥ë¥×¤¬½ªÎ»¤·¡¢¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷²èÌ̤ˤʤê¤Þ¤¹¡£`?' ¥­¡¼¤Ç\n"
 "¤¤¤Ä¤Ç¤â¥Ø¥ë¥×¤¬»²¾È¤Ç¤­¤Þ¤¹¡£\n"
 
-#: dselect/helpmsgs.cc:57
-#, fuzzy
-msgid "Introduction to read-only package list browser"
+#: dselect/helpmsgs.cc:58
+msgid "Introduction to package list browser (read-only)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¥Ö¥é¥¦¥¶¤Î¼ê°ú¤­(¥ê¡¼¥É¥ª¥ó¥ê¡¼)"
 
-#: dselect/helpmsgs.cc:57
-#, fuzzy
+#: dselect/helpmsgs.cc:58
 msgid ""
-"Welcome to dselect's main package listing.\n"
-"\n"
-"You will be presented with a list of packages which are installed or "
-"available\n"
-"for installation.  Since you do not have the privilege necessary to update\n"
-"package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), "
-"observe\n"
-"the status of the packages and read information about them.\n"
+"Welcome to dselect's main package listing.  Since you do not have the\n"
+"privilege necessary to update package states you are in read-only mode.\n"
 "\n"
+"Much on-line help is available, please make use of it!  Press `?' for help.\n"
 "You should read the list of keys and the explanations of the display.\n"
-"Much on-line help is available, please make use of it - press `?' at\n"
-"any time for help.\n"
 "\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
+"for installation.  You can navigate around the list using the cursor keys "
+"(just\n"
+"as you would be able to do if you had read/write access - see the "
+"keystrokes\n"
+"help screen) and observe the status of the packages and read information "
+"about\n"
+"them.\n"
+"\n"
+"Press Space to leave help and enter the list; press `?' at any time for "
+"help.\n"
 "When you have finished browsing, press `Q' or <enter> to quit.\n"
-"\n"
-"Press <enter> to leave help and enter the list now.\n"
 msgstr ""
 "dselect ¥á¥¤¥ó¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤Ë¤è¤¦¤³¤½¡£¤¢¤Ê¤¿¤Ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¾õÂÖ¤ò¹¹¿·\n"
 "¤¹¤ë¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢¥ê¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
@@ -5620,7 +5429,6 @@ msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "¶¥¹ç¤ä°Í¸´Ø·¸²ò·èÍÑ¥µ¥Ö¥ê¥¹¥È¤Î¼ê°ú¤­"
 
 #: dselect/helpmsgs.cc:75
-#, fuzzy
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -5651,7 +5459,7 @@ msgid ""
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <enter> to leave help and enter the sub-list; remember: press `?' for "
+"Press Space to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
 "°Í¸´Ø·¸/¶¥¹ç²ò·è¤Î¤¿¤á¤Î¼ê°ú¤­\n"
@@ -5892,39 +5700,74 @@ msgstr ""
 "  \\                ¸¡º÷¼¡¸õÊä\n"
 
 #~ msgid ""
-#~ "Your currently installed version of the file is in:\n"
-#~ " %s\n"
-#~ "The version contained in the new version of the package is in:\n"
-#~ " %s\n"
-#~ "If you decide to take care of the update yourself, perhaps by editing\n"
-#~ " the installed version, you should choose `N' when you return, so that\n"
-#~ " I do not mess up your careful work.\n"
+#~ "Desired=Unknown/Install/Remove/Purge/Hold\n"
+#~ "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-"
+#~ "installed\n"
+#~ "|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+#~ "uppercase=bad)\n"
 #~ msgstr ""
-#~ "¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï\n"
-#~ " %s ¤Ç¤¹¡£\n"
-#~ "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï\n"
-#~ " %s ¤Ç¤¹¡£\n"
-#~ "¤â¤·¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¼«Ê¬¤Ç¹Ô¤ª¤¦¤È·è¤á¤¿¾ì¹ç(¤³¤ì¤ÏÂçÄñ¤Ï¥¤¥ó¥¹¥È¡¼"
+#~ "Í×˾=(U)ÉÔÌÀ/(I)¥¤¥ó¥¹¥È¡¼¥ë/(R)ºï½ü/(P)´°Á´ºï½ü/(H)°Ý»ý\n"
+#~ "| ¾õÂÖ=(N)̵/(I)¥¤¥ó¥¹¥È¡¼¥ëºÑ/(C)ÀßÄê/(U)Ÿ³«/(F)ÀßÄ꼺ÇÔ/(H)Ⱦ¥¤¥ó¥¹¥È¡¼"
 #~ "¥ë\n"
-#~ "ºÑ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼«Ê¬¤ÇÊÔ½¸¤¹¤ë¾ì¹ç)¤Ï¡¢¤³¤³¤Ç N ¤òÁª¤Ö¤Ù¤­¤Ç¤·¤ç¤¦¡£\n"
-#~ "¤Ê¤¼¤Ê¤é Y ¤Ë¤¹¤ë¤È¥·¥¹¥Æ¥à¤¬¤¢¤Ê¤¿¤ÎÊÔ½¸¤òÂæ¤Ê¤·¤Ë¤·¤Æ¤·¤Þ¤¦¤«¤é¤Ç¤¹¡£\n"
+#~ "|/ ¥¨¥é¡¼=(¶õÍó)̵/(H)°Ý»ý/(R)Í׺ƥ¤¥ó¥¹¥È¡¼¥ë/X=ξÊý(¾õÂÖ,¥¨¥é¡¼¤ÎÂçʸ»ú="
+#~ "°Û¾ï)\n"
 
-#~ msgid ""
-#~ "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
-#~ "GNU General Public Licence version 2 or later for copying conditions.\n"
-#~ "There is NO warranty.  See dpkg-deb --licence for details.\n"
+#~ msgid "Name"
+#~ msgstr "̾Á°"
+
+#~ msgid "Version"
+#~ msgstr "¥Ð¡¼¥¸¥ç¥ó"
+
+#~ msgid "diversion by %s"
+#~ msgstr "%s ¤Ë¤è¤ëÂàÈò(diversion)"
+
+#~ msgid "local diversion"
+#~ msgstr "¥í¡¼¥«¥ë¤ÊÂàÈò(diversion)"
+
+#~ msgid "to"
+#~ msgstr "¼¡¤Ø"
+
+#~ msgid "from"
+#~ msgstr "¼¡¤«¤é"
+
+#~ msgid "--search needs at least one file name pattern argument"
+#~ msgstr "--search ¤Ï°ú¿ô¤Ë¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤Î¥Õ¥¡¥¤¥ë̾¥Ñ¥¿¡¼¥ó¤¬É¬ÍפǤ¹¡£"
+
+#~ msgid "dpkg: %s not found.\n"
+#~ msgstr "dpkg: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
+
+#~ msgid "Package `%s' is not installed and no info is available.\n"
 #~ msgstr ""
-#~ "Copyright (C) 1994-1996 Ian Jackson.  ¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¤Ç¤¹; ¥³¥Ô¡¼¾ò·ï"
-#~ "¤Ë\n"
-#~ "¤Ä¤¤¤Æ¤Ï GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¥Ð¡¼¥¸¥ç¥ó 2 ¤â¤·¤¯¤Ï¤½¤ì°Ê¹ß¤ò»²¾È¤·¤Æ¤¯¤À"
-#~ "¤µ¤¤¡£\n"
-#~ "̵ÊݾڤǤ¹¡£¾ÜºÙ¤Ï dpkg-deb --licence ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+#~ "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¾ðÊó¤¬ÍøÍÑÉÔ²Äǽ¤Ç¤¹¡£\n"
+
+#~ msgid "Package `%s' is not available.\n"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤ÀÍøÍѲÄǽ¤Ç¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#~ msgid "Package `%s' is not installed.\n"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+
+#~ msgid "Package `%s' does not contain any files (!)\n"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó¡£(!)\n"
+
+#~ msgid "locally diverted"
+#~ msgstr "¥í¡¼¥«¥ë¤ËÂàÈò(divert)¤µ¤ì¤¿"
+
+#~ msgid "package diverts others"
+#~ msgstr "¾¥Ñ¥Ã¥±¡¼¥¸¤ÎƱ̾¥Õ¥¡¥¤¥ë¤Ï¼¡¤Î̾¤ËÂàÈò¤·¤¿"
+
+#~ msgid "diverted by %s"
+#~ msgstr "%s ¤Ë¤è¤êÂàÈò(divert)¤µ¤ì¤¿"
+
+#~ msgid " to: %s\n"
+#~ msgstr " %s ¤Ø\n"
 
 #~ msgid ""
-#~ "? = help menu    Space = exit help    . = next help    or a help page key "
+#~ "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#~ "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 #~ msgstr ""
-#~ "? =¥Ø¥ë¥×¥á¥Ë¥å¡¼  Space =¥Ø¥ë¥×¤Î½ªÎ»  . =¼¡¤Î¥Ø¥ë¥×¡¢¤Þ¤¿¤Ï¥Ø¥ë¥×Áàºî"
-#~ "¥­¡¼ "
+#~ "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤ë¤¿¤á¤Ë¤Ï dpkg --info (= dpkg-deb --info)¤ò¡¢\n"
+#~ "¤½¤ÎÆâÍÆ°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï dpkg --contents (= dpkg-deb --contents)¤ò»È¤¤¤Þ"
+#~ "¤¹¡£\n"
 
 #~ msgid "failed to exec dpkg-deb"
 #~ msgstr "dpkg-deb ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"