* merged with apt--fixes--0

[apt.git] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index fb3b5a5acaf39f4162637ea0bd2a116a72653cc9..acd03c6cc83a222e24b916b0b361840a764e1ca3 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,155 +3,161 @@
 # Project Vine, Daisuke SUZUKI <daisuke@linux.or.jp>, 2001-2002
 # Debian Project, Masato Taruishi <taru@debian.org>, 2002
 # Debian Project, Keita Maehara <maehara@debian.org>, 2003
+# Debian Project, Kenshi Muto <kmuto@debian.org>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.5.5\n"
-"POT-Creation-Date: 2003-04-27 01:12-0500\n"
-"PO-Revision-Date: 2003-06-08 13:21+0900\n"
-"Last-Translator: Keita Maehara <maehara@debian.org>\n"
+"Project-Id-Version: apt 0.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"PO-Revision-Date: 2005-02-09 12:54+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8 bit\n"
 
-#: cmdline/apt-cache.cc:133
+#: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Ð¡¼¥¸¥ç¥ó %s ¤Ë¤Ï²ò·èÉÔ²Äǽ¤Ê°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:\n"
 
-#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
-#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1353
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-cache.cc:230
-msgid "Total Package Names : "
-msgstr "Áí¥Ñ¥Ã¥±¡¼¥¸¿ô: "
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô: "
 
-#: cmdline/apt-cache.cc:270
-msgid "  Normal Packages: "
+#: cmdline/apt-cache.cc:272
+msgid "  Normal packages: "
 msgstr "  Ä̾ï¥Ñ¥Ã¥±¡¼¥¸: "
 
-#: cmdline/apt-cache.cc:271
-msgid "  Pure Virtual Packages: "
+#: cmdline/apt-cache.cc:273
+msgid "  Pure virtual packages: "
 msgstr "  ½ã¿è²¾Áۥѥ屡¼¥¸: "
 
-#: cmdline/apt-cache.cc:272
-msgid "  Single Virtual Packages: "
+#: cmdline/apt-cache.cc:274
+msgid "  Single virtual packages: "
 msgstr "  ñ°ì²¾Áۥѥ屡¼¥¸: "
 
-#: cmdline/apt-cache.cc:273
-msgid "  Mixed Virtual Packages: "
+#: cmdline/apt-cache.cc:275
+msgid "  Mixed virtual packages: "
 msgstr "  Ê£¹ç²¾Áۥѥ屡¼¥¸: "
 
-#: cmdline/apt-cache.cc:274
-msgid "  Missing: "
-msgstr "  ÉÔÌÀ: "
-
 #: cmdline/apt-cache.cc:276
-msgid "Total Distinct Versions: "
-msgstr "¥Ð¡¼¥¸¥ç¥óÁí¿ô: "
+msgid "  Missing: "
+msgstr "  ·çÍî: "
 
 #: cmdline/apt-cache.cc:278
-msgid "Total Dependencies: "
+msgid "Total distinct versions: "
+msgstr "¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô: "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
 msgstr "°Í¸´Ø·¸Áí¿ô: "
 
-#: cmdline/apt-cache.cc:281
-msgid "Total Ver/File relations: "
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
 msgstr "¥Ð¡¼¥¸¥ç¥ó/¥Õ¥¡¥¤¥ë´Ø·¸Áí¿ô: "
 
-#: cmdline/apt-cache.cc:283
-msgid "Total Provides Mappings: "
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
 msgstr "Ä󶡥ޥåԥó¥°Áí¿ô: "
 
-#: cmdline/apt-cache.cc:295
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
 msgstr "Glob ʸ»úÎó¤ÎÁí¿ô: "
 
-#: cmdline/apt-cache.cc:309
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
 msgstr "Áí°Í¸´Ø·¸¡¦¥Ð¡¼¥¸¥ç¥óÍÆÎÌ: "
 
-#: cmdline/apt-cache.cc:314
-msgid "Total Slack space: "
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
 msgstr "Áí¶õ¤­ÍÆÎÌ: "
 
-#: cmdline/apt-cache.cc:322
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
 msgstr "ÁíÀêÍ­ÍÆÎÌ: "
 
-#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package ¥Õ¥¡¥¤¥ë %s ¤¬Æ±´ü¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: cmdline/apt-cache.cc:1229
+#: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ï¤Á¤ç¤¦¤É 1 ¤Ä¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: cmdline/apt-cache.cc:1453
-msgid "Package Files:"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë: "
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-cache.cc:1460 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "¥­¥ã¥Ã¥·¥å¤¬Æ±´ü¤·¤Æ¤ª¤é¤º¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÁê¸ß»²¾È¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-cache.cc:1461
+#: cmdline/apt-cache.cc:1470
 #, c-format
 msgid "%4i %s\n"
 msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1473
-msgid "Pinned Packages:"
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
 msgstr "Pin ¥Ñ¥Ã¥±¡¼¥¸:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgid "(not found)"
 msgstr "(¸«¤Ä¤«¤ê¤Þ¤»¤ó)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1506
+#: cmdline/apt-cache.cc:1515
 msgid "  Installed: "
 msgstr "  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: "
 
-#: cmdline/apt-cache.cc:1508 cmdline/apt-cache.cc:1516
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 msgid "(none)"
 msgstr "(¤Ê¤·)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1513
+#: cmdline/apt-cache.cc:1522
 msgid "  Candidate: "
 msgstr "  ¸õÊä: "
 
-#: cmdline/apt-cache.cc:1523
-msgid "  Package Pin: "
+#: cmdline/apt-cache.cc:1532
+msgid "  Package pin: "
 msgstr "  ¥Ñ¥Ã¥±¡¼¥¸ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1532
-msgid "  Version Table:"
+#: cmdline/apt-cache.cc:1541
+msgid "  Version table:"
 msgstr "  ¥Ð¡¼¥¸¥ç¥ó¥Æ¡¼¥Ö¥ë:"
 
-#: cmdline/apt-cache.cc:1547
+#: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1574 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544
-#: cmdline/apt-get.cc:2165 cmdline/apt-sortpkgs.cc:144
-#, c-format, fuzzy
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
+#, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s\n"
+msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s %s\n"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1658
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file1 ...]\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
@@ -183,7 +189,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "»ÈÍÑÊýË¡: apt-cache [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
@@ -219,8 +225,8 @@ msgstr ""
 "  -q   ¥×¥í¥°¥ì¥¹É½¼¨¤ò¤·¤Ê¤¤\n"
 "  -i   umnet ¥³¥Þ¥ó¥É¤Ç½ÅÍפʰ͸¾ðÊó¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
 "  -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à\n"
-"  -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òÆɤ߹þ¤à¡£(Îã: -o dir::cache=/tmp)\n"
-"¾ÜºÙ¤Ï¡¢apt-cache(8) ¤ä apt.conf(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
+"  -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òÆɤ߹þ¤à (Îã: -o dir::cache=/tmp)\n"
+"¾ÜºÙ¤Ï¡¢apt-cache(8) ¤ä apt.conf(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -239,7 +245,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "»ÈÍÑÊýË¡: apt-config [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
 "\n"
@@ -270,7 +276,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "»ÈÍÑÊýË¡: apt-extracttemplates ¥Õ¥¡¥¤¥ë̾1 [¥Õ¥¡¥¤¥ë̾2 ...]\n"
 "\n"
@@ -283,45 +289,48 @@ msgstr ""
 "  -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n"
 "  -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: cmdline/apt-extracttemplates.cc:302
+#: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£debconf ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¤«?"
+msgstr ""
+"debconf ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£debconf ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¤«?"
 
-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:336
+#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
 msgid "Package extension list is too long"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
 
 #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:251
-#: ftparchive/apt-ftparchive.cc:265 ftparchive/apt-ftparchive.cc:287
+#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
+#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format
-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: ftparchive/apt-ftparchive.cc:249
+#: ftparchive/apt-ftparchive.cc:250
 msgid "Source extension list is too long"
 msgstr "¥½¡¼¥¹³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
 
-#: ftparchive/apt-ftparchive.cc:366
+#: ftparchive/apt-ftparchive.cc:367
 msgid "Error writing header to contents file"
 msgstr "Contents ¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ø¥Ã¥À¤Î½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: ftparchive/apt-ftparchive.cc:396
+#: ftparchive/apt-ftparchive.cc:397
 #, c-format
-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"
 msgstr "Contents %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: ftparchive/apt-ftparchive.cc:550
+#: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
-"Commands: packges binarypath [overridefile [pathprefix]]\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
 "          sources srcpath [overridefile [pathprefix]]\n"
 "          contents path\n"
+"          release path\n"
 "          generate config [groups]\n"
 "          clean config\n"
 "\n"
@@ -339,9 +348,9 @@ msgid ""
 "\n"
 "The 'packages' and 'sources' command should be run in the root of the\n"
 "tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contian the override flags. Pathprefix is\n"
+"override file should contain the override flags. Pathprefix is\n"
 "appended to the filename fields if present. Example usage from the \n"
-"debian archive:\n"
+"Debian archive:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
@@ -354,12 +363,13 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "»ÈÍÑÊýË¡: apt-ftparchive [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
 "¥³¥Þ¥ó¥É: packages binarypath [overridefile [pathprefix]]\n"
 "          sources srcpath [overridefile [pathprefix]]\n"
 "          contents path\n"
+"          release path\n"
 "          generate config [groups]\n"
 "          clean config\n"
 "\n"
@@ -377,11 +387,10 @@ msgstr ""
 "»ØÄê¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 "'packages' ¤ª¤è¤Ó 'sources' ¥³¥Þ¥ó¥É¤Ï¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤Ç¼Â¹Ô¤¹¤ëɬÍפ¬¤¢\n"
-"¤ê¤Þ¤¹¡£binarypath ¤Ë¤ÏºÆµ¢¸¡º÷¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¡¢override \n"
+"¤ê¤Þ¤¹¡£BinaryPath ¤Ë¤ÏºÆµ¢¸¡º÷¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¡¢override \n"
 "¥Õ¥¡¥¤¥ë¤Ï override ¥Õ¥é¥°¤ò´Þ¤ó¤Ç¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤â¤· pathprefix \n"
 "¤¬Â¸ºß¤¹¤ì¤Ð¥Õ¥¡¥¤¥ë̾¥Õ¥£¡¼¥ë¥É¤ËÉղ䵤ì¤Þ¤¹¡£debian ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î\n"
 "»ÈÍÑÊýË¡¤ÎÎã:\n"
-"\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
@@ -396,120 +405,130 @@ msgstr ""
 "  -c=? »ØÄê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤà\n"
 "  -o=? Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë"
 
-#: ftparchive/apt-ftparchive.cc:731
+#: ftparchive/apt-ftparchive.cc:757
 msgid "No selections matched"
 msgstr "ÁªÂò¤Ë¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: ftparchive/apt-ftparchive.cc:804
+#: ftparchive/apt-ftparchive.cc:830
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¥°¥ë¡¼¥× `%s' ¤Ë¸«¤¢¤¿¤é¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:45
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB ¤¬²õ¤ì¤Æ¤¤¤¿¤¿¤á¡¢¥Õ¥¡¥¤¥ë̾¤ò %s.old ¤ËÊѹ¹¤·¤Þ¤·¤¿"
 
-#: ftparchive/cachedb.cc:59
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ¤¬¸Å¤¤¤¿¤á¡¢%s ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò»î¤ß¤Þ¤¹"
+
+#: ftparchive/cachedb.cc:73
 #, c-format
-msgid "Unable to open DB2 file %s"
-msgstr "DB2 ¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgid "Unable to open DB file %s: %s"
+msgstr "DB ¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:114
 #, c-format
 msgid "File date has changed %s"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÆüÉÕ¤¬ %s ¤ËÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¥Õ¥¡¥¤¥ë %s ¤ÎÆüÉÕ¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: ftparchive/cachedb.cc:140
+#: ftparchive/cachedb.cc:155
 msgid "Archive has no control record"
 msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÀ©¸æ¥ì¥³¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: ftparchive/cachedb.cc:253 ftparchive/cachedb.cc:257
+#: ftparchive/cachedb.cc:267
 msgid "Unable to get a cursor"
 msgstr "¥«¡¼¥½¥ë¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "·Ù¹ð: ¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬Æɤá¤Þ¤»¤ó\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "·Ù¹ð: %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: ftparchive/writer.cc:122
+#: ftparchive/writer.cc:126
 msgid "E: "
 msgstr "¥¨¥é¡¼: "
 
-#: ftparchive/writer.cc:124
+#: ftparchive/writer.cc:128
 msgid "W: "
 msgstr "·Ù¹ð: "
 
-#: ftparchive/writer.cc:131
+#: ftparchive/writer.cc:135
 msgid "E: Errors apply to file "
-msgstr "¥¨¥é¡¼: ¥¨¥é¡¼¤¬Å¬ÍѤµ¤ì¤ë¥Õ¥¡¥¤¥ë"
+msgstr "¥¨¥é¡¼: ¥¨¥é¡¼¤¬Å¬ÍѤµ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ï "
 
-#: ftparchive/writer.cc:148 ftparchive/writer.cc:178
+#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s ¤Î²ò·è¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:160
+#: ftparchive/writer.cc:164
 msgid "Tree walking failed"
 msgstr "¥Ä¥ê¡¼Æâ¤Ç¤Î°ÜÆ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:185
+#: ftparchive/writer.cc:189
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:242
+#: ftparchive/writer.cc:246
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " ¥ê¥ó¥¯ %s [%s] ¤ò³°¤·¤Þ¤¹\n"
 
-#: ftparchive/writer.cc:250
+#: ftparchive/writer.cc:254
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s ¤Î readlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:258
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s ¤Î unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:261
+#: ftparchive/writer.cc:265
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s ¤ò %s ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:271
+#: ftparchive/writer.cc:275
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ¥ê¥ó¥¯¤ò³°¤¹À©¸Â¤Î %sB ¤ËÅþ㤷¤Þ¤·¤¿¡£\n"
 
-#: ftparchive/writer.cc:338 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ftparchive/writer.cc:358
+#: ftparchive/writer.cc:378
 msgid "Archive had no package field"
 msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë¥Ñ¥Ã¥±¡¼¥¸¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: ftparchive/writer.cc:366 ftparchive/writer.cc:576
+#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ¤Ë override ¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:658
+#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %1$s ¥á¥ó¥Æ¥Ê¤Ï %3$s ¤Ç¤Ï¤Ê¤¯ %2$s ¤Ç¤¹\n"
 
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "ÆâÉô¥¨¥é¡¼¡¢¥á¥ó¥Ð %s ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - ¥á¥â¥ê¤Î³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
@@ -540,7 +559,7 @@ msgstr "override 
 
 #: ftparchive/multicompress.cc:75
 #, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"
 msgstr "'%s' ¤Ï̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
 #: ftparchive/multicompress.cc:105
@@ -561,12 +580,12 @@ msgid "Failed to fork"
 msgstr "fork ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+msgid "Compress child"
 msgstr "°µ½Ì»Ò¥×¥í¥»¥¹"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"
 msgstr "ÆâÉô¥¨¥é¡¼¡¢%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: ftparchive/multicompress.cc:289
@@ -575,7 +594,7 @@ msgstr "
 
 #: ftparchive/multicompress.cc:324
 msgid "Failed to exec compressor "
-msgstr "°µ½Ì¥Ä¡¼¥ë¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "°Ê²¼¤Î°µ½Ì¥Ä¡¼¥ë¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: "
 
 #: ftparchive/multicompress.cc:363
 msgid "decompressor"
@@ -599,360 +618,376 @@ msgstr "%s 
 msgid "Failed to rename %s to %s"
 msgstr "%s ¤ò %s ¤Ë¥ê¥Í¡¼¥à¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#. This needs to be a capital
-#: cmdline/apt-get.cc:116
+#: cmdline/apt-get.cc:118
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:220
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s"
+
+#: cmdline/apt-get.cc:235
 msgid "The following packages have unmet dependencies:"
 msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤ÏËþ¤¿¤»¤Ê¤¤°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:310
+#: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"
 msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: cmdline/apt-get.cc:312
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"
 msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
 
-#: cmdline/apt-get.cc:319
+#: cmdline/apt-get.cc:334
 msgid "but it is not installable"
 msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:321
+#: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"
 msgstr "¤·¤«¤·¡¢¤³¤ì¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹"
 
-#: cmdline/apt-get.cc:324
+#: cmdline/apt-get.cc:339
 msgid "but it is not installed"
 msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:324
+#: cmdline/apt-get.cc:339
 msgid "but it is not going to be installed"
 msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:344
 msgid " or"
 msgstr " ¤Þ¤¿¤Ï"
 
-#: cmdline/apt-get.cc:358
+#: cmdline/apt-get.cc:373
 msgid "The following NEW packages will be installed:"
 msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¿·¤¿¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:399
 msgid "The following packages will be REMOVED:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïºï½ü¤µ¤ì¤Þ¤¹:"
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Öºï½ü¡×¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:406
-msgid "The following packages have been kept back"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊÝᤵ¤ì¤Þ¤¹"
+#: cmdline/apt-get.cc:421
+msgid "The following packages have been kept back:"
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊÝᤵ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:427
-msgid "The following packages will be upgraded"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹"
+#: cmdline/apt-get.cc:442
+msgid "The following packages will be upgraded:"
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:448
-msgid "The following packages will be DOWNGRADED"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥À¥¦¥ó¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹"
+#: cmdline/apt-get.cc:463
+msgid "The following packages will be DOWNGRADED:"
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:468
+#: cmdline/apt-get.cc:483
 msgid "The following held packages will be changed:"
-msgstr "°Ê²¼¤ÎÊÝα¥Ñ¥Ã¥±¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Þ¤¹:"
+msgstr "°Ê²¼¤ÎÊѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:521
-#, c-format, fuzzy
+#: cmdline/apt-get.cc:536
+#, c-format
 msgid "%s (due to %s) "
-msgstr "%s (%s ¤Î¤¿¤á)"
+msgstr "%s (%s ¤Î¤¿¤á) "
 
-#: cmdline/apt-get.cc:529
+#: cmdline/apt-get.cc:544
+#, fuzzy
 msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"·Ù¹ð: °Ê²¼¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤Þ¤¹¡£\n"
+"·Ù¹ð: °Ê²¼¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤Þ¤¹\n"
 "²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤«¤¬¤Á¤ã¤ó¤È¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!"
 
-#: cmdline/apt-get.cc:559
+#: cmdline/apt-get.cc:575
 #, c-format
-msgid "%lu packages upgraded, %lu newly installed, "
+msgid "%lu upgraded, %lu newly installed, "
 msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É: %lu ¸Ä¡¢¿·µ¬¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:579
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ºÆ¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢"
 
-#: cmdline/apt-get.cc:565
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu downgraded, "
-msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É: %lu ¸Ä, "
+msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É: %lu ¸Ä¡¢"
 
-#: cmdline/apt-get.cc:567
+#: cmdline/apt-get.cc:583
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ºï½ü: %lu ¸Ä¡¢ÊÝα: %lu ¸Ä\n"
+msgstr "ºï½ü: %lu ¸Ä¡¢ÊÝα: %lu ¸Ä¡£\n"
 
-#: cmdline/apt-get.cc:571
+#: cmdline/apt-get.cc:587
 #, c-format
-msgid "%lu packages not fully installed or removed.\n"
+msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: cmdline/apt-get.cc:631
+#: cmdline/apt-get.cc:647
 msgid "Correcting dependencies..."
 msgstr "°Í¸´Ø·¸¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹..."
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:650
 msgid " failed."
 msgstr " ¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: cmdline/apt-get.cc:637
+#: cmdline/apt-get.cc:653
 msgid "Unable to correct dependencies"
 msgstr "°Í¸´Ø·¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:640
+#: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"
 msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥»¥Ã¥È¤òºÇ¾®²½¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:642
+#: cmdline/apt-get.cc:658
 msgid " Done"
 msgstr " ´°Î»"
 
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:662
 msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "¤³¤ì¤é¤òľ¤¹¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
+msgstr ""
+"¤³¤ì¤é¤òľ¤¹¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»"
+"¤ó¡£"
 
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:665
 msgid "Unmet dependencies. Try using -f."
 msgstr "̤²ò·è¤Î°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹¡£-f ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: cmdline/apt-get.cc:702
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:687
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "·Ù¹ð: °Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïǧ¾Ú¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification [y/N]? "
+msgstr "¸¡¾Ú¤Ê¤·¤Ë¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤« [y/N]? "
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ç§¾Ú¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "ÌäÂ꤬ȯÀ¸¤·¡¢-y ¥ª¥×¥·¥ç¥ó¤¬ --force-yes ¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
+
+#: cmdline/apt-get.cc:762
+msgid "Packages need to be removed but remove is disabled."
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ºï½ü¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: cmdline/apt-get.cc:728 cmdline/apt-get.cc:1694 cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
 msgid "Unable to lock the download directory"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:738 cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
-msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: cmdline/apt-get.cc:758
+#: cmdline/apt-get.cc:818
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%2$sB Ãæ %1$sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:761
+#: cmdline/apt-get.cc:821
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:766
+#: cmdline/apt-get.cc:826
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "Ÿ³«¸å¤ËÄÉ²Ã¤Ç %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¾ÃÈñ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:769
+#: cmdline/apt-get.cc:829
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Ÿ³«¸å¤Ë %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬²òÊü¤µ¤ì¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:846
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: cmdline/apt-get.cc:795
-msgid "There are problems and -y was used without --force-yes"
-msgstr "ÌäÂ꤬ȯÀ¸¤·¡¢-y ¥ª¥×¥·¥ç¥ó¤¬ --force-yes ¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
-
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¤³¤ì¤Ï´Êñ¤ÊÁàºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:803
+#: cmdline/apt-get.cc:863
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:805
-#, c-format
+#: cmdline/apt-get.cc:865
+#, fuzzy, c-format
 msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 "½ÅÂç¤ÊÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤Î¤¢¤ë¤³¤È¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n"
-"³¹Ô¤¹¤ë¤Ë¤Ï¡¢'%s'\n"
-" ?] ¤È¤¤¤¦¥Õ¥ì¡¼¥º¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"³¹Ô¤¹¤ë¤Ë¤Ï¡¢'%s' ¤È¤¤¤¦¥Õ¥ì¡¼¥º¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+" ?] "
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
 msgid "Abort."
 msgstr "ÃæÃǤ·¤Þ¤·¤¿¡£"
 
-#: cmdline/apt-get.cc:826
-msgid "Do you want to continue? [Y/n] "
-msgstr "³¹Ô¤·¤Þ¤¹¤«? [Y/n]"
+#: cmdline/apt-get.cc:886
+msgid "Do you want to continue [Y/n]? "
+msgstr "³¹Ô¤·¤Þ¤¹¤« [Y/n]? "
 
-#: cmdline/apt-get.cc:895 cmdline/apt-get.cc:1266 cmdline/apt-get.cc:1884
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+msgstr "%s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿  %s\n"
 
-#: cmdline/apt-get.cc:913
+#: cmdline/apt-get.cc:976
 msgid "Some files failed to download"
 msgstr "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: cmdline/apt-get.cc:914 cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
 msgid "Download complete and in download only mode"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿"
 
-#: cmdline/apt-get.cc:920
+#: cmdline/apt-get.cc:983
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£apt-get update ¤ò¼Â¹Ô¤¹¤ë¤« \n"
-"--fix-missing ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
+"¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£apt-get update ¤ò¼Â¹Ô¤¹¤ë¤« --fix-"
+"missing ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:987
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ¤È¥á¥Ç¥£¥¢¸ò´¹¤Ï¸½ºßƱ»þ¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:992
 msgid "Unable to correct missing packages."
 msgstr "­¤ê¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: cmdline/apt-get.cc:930
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:993
+msgid "Aborting install."
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤òÃæÃǤ·¤Þ¤¹¡£"
 
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:1026
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Ãí°Õ¡¢%2$s ¤ÎÂå¤ï¤ê¤Ë %1$s ¤òÁªÂò¤·¤Þ¤¹\n"
 
-#: cmdline/apt-get.cc:973
+#: cmdline/apt-get.cc:1036
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹¡£\n"
+msgstr ""
+"´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢%s ¤ò¥¹¥­¥Ã¥×"
+"¤·¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:1054
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢ºï½ü¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1065
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s ¤Ï°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë²¾Áۥѥ屡¼¥¸¤Ç¤¹:\n"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1077
 msgid " [Installed]"
 msgstr " [¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß]"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1082
 msgid "You should explicitly select one to install."
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨Åª¤ËÁªÂò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1087
 #, c-format
 msgid ""
-"Package %s has no available version, but exists in the database.\n"
-"This typically means that the package was mentioned in a dependency and\n"
-"never uploaded, has been obsoleted or is not available with the contents\n"
-"of sources.list\n"
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï¸ºß¤·¤Þ¤¹¤¬¡¢Æþ¼ê²Äǽ¤Ê¥Ð¡¼¥¸¥ç¥ó¤¬\n"
-"¤¢¤ê¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë°Í¸¤·¤Æ¤¤¤ë¤Èµ­½Ò¤µ¤ì¤Æ¤¤¤ë¤Ë¤â\n"
-"´Ø¤ï¤é¤º¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¸Å¤¯¤Ê¤Ã¤Æ¤¤¤¿¤ê¡¢¤Þ¤¿¡¢¤½¤Î \n"
-"sources.list ¤ÎÆâÍƤǤÏÆþ¼ê¤Ç¤­¤Ê¤¤¤È¤¤¤¦¾õ¶·¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£\n"
+"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï¸ºß¤·¤Þ¤¹¤¬¡¢ÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
+"¤ª¤½¤é¤¯¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¤â¤¦¸Å¤¯¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n"
+"¤¢¤ë¤¤¤ÏÊ̤Υ½¡¼¥¹¤«¤é¤Î¤ß¤·¤«ÍøÍѤǤ­¤Ê¤¤¤È¤¤¤¦¾õ¶·¤¬¹Í¤¨¤é¤ì¤Þ¤¹\n"
 
-#: cmdline/apt-get.cc:1044
+#: cmdline/apt-get.cc:1106
 msgid "However the following packages replace it:"
 msgstr "¤·¤«¤·¡¢°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:1047
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¸õÊ䤬¤¢¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1129
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢%s ¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ë¤ÏÉÔ²Äǽ¤Ç¤¹¡£\n"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1137
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ¤Ï´û¤ËºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£\n"
 
-#: cmdline/apt-get.cc:1102
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' ¤Î¥ê¥ê¡¼¥¹ '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1166
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' ¤Î¥Ð¡¼¥¸¥ç¥ó '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1172
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s ¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó %1$s (%2$s) ¤òÁªÂò¤·¤Þ¤·¤¿\n"
 
-#: cmdline/apt-get.cc:1220
+#: cmdline/apt-get.cc:1282
 msgid "The update command takes no arguments"
 msgstr "update ¥³¥Þ¥ó¥É¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1233
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
 msgid "Unable to lock the list directory"
 msgstr "list ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1285
+#: cmdline/apt-get.cc:1353
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢\n"
-"¤¢¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£"
+"¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢¤¢"
+"¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£"
 
-#: cmdline/apt-get.cc:1304
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1372
+msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿"
 
-#: cmdline/apt-get.cc:1394 cmdline/apt-get.cc:1430
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1407
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s"
-
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1494
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Ãí°Õ: Àµµ¬É½¸½ '%2$s' ¤ËÂФ·¤Æ %1$s ¤òÁªÂò¤·¤Þ¤·¤¿\n"
 
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1524
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "°Ê²¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì"
 "¤Þ¤»¤ó:"
 
-#: cmdline/apt-get.cc:1450
+#: cmdline/apt-get.cc:1527
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
-msgstr "̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£"
+msgstr ""
+"̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡"
+"¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£"
 
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1539
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -962,9 +997,9 @@ msgstr ""
 "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤·¤¿¡£¤ª¤½¤é¤¯¡¢¤¢¤ê¤¨\n"
 "¤Ê¤¤¾õ¶·¤òÍ׵ᤷ¤¿¤«¡¢É¬Íפʥѥ屡¼¥¸¤¬¤Þ¤ÀºîÀ®¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê \n"
 "Incoming ¤«¤é°ÜÆ°¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ°ÂÄêÈǥǥ£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ·\n"
-"¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£\""
+"¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£"
 
-#: cmdline/apt-get.cc:1470
+#: cmdline/apt-get.cc:1547
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -974,138 +1009,150 @@ msgstr ""
 "²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À\n"
 "¤µ¤¤¡£"
 
-#: cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:1552
 msgid "The following information may help to resolve the situation:"
 msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:"
 
-#: cmdline/apt-get.cc:1478
+#: cmdline/apt-get.cc:1555
 msgid "Broken packages"
 msgstr "²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸"
 
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1581
 msgid "The following extra packages will be installed:"
 msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1652
 msgid "Suggested packages:"
 msgstr "Äó°Æ¥Ñ¥Ã¥±¡¼¥¸:"
 
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1653
 msgid "Recommended packages:"
 msgstr "¿ä¾©¥Ñ¥Ã¥±¡¼¥¸:"
 
-#: cmdline/apt-get.cc:1589
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1673
+msgid "Calculating upgrade... "
 msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤·¤Æ¤¤¤Þ¤¹... "
 
-#: cmdline/apt-get.cc:1592 methods/ftp.cc:700 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
 msgid "Failed"
 msgstr "¼ºÇÔ"
 
-#: cmdline/apt-get.cc:1597
+#: cmdline/apt-get.cc:1681
 msgid "Done"
 msgstr "´°Î»"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1854
 msgid "Must specify at least one package to fetch source for"
-msgstr "¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
+msgstr ""
+"¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s ¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1928
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:1849
+#: cmdline/apt-get.cc:1933
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB Ãæ %1$sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:1852
+#: cmdline/apt-get.cc:1936
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1942
 #, c-format
-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"
 msgstr "¥½¡¼¥¹ %s ¤ò¼èÆÀ\n"
 
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1973
 msgid "Failed to fetch some archives."
 msgstr "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: cmdline/apt-get.cc:1917
+#: cmdline/apt-get.cc:2001
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "¤¹¤Ç¤Ë %s ¤ËŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤¬¤¢¤ë¤¿¤á¡¢Å¸³«¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
-#: cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:2013
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
+msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:2030
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "¥Ó¥ë¥É¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:2049
 msgid "Child process failed"
 msgstr "»Ò¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: cmdline/apt-get.cc:1981
+#: cmdline/apt-get.cc:2065
 msgid "Must specify at least one package to check builddeps for"
-msgstr "builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
+msgstr ""
+"builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: cmdline/apt-get.cc:2009
+#: cmdline/apt-get.cc:2093
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s ¤Î build-dependency ¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:2029
+#: cmdline/apt-get.cc:2113
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ¤Ë¤Ï build depends ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2165
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È"
+"¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:2106
+#: cmdline/apt-get.cc:2217
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢\n"
-"%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+"Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂÐ"
+"¤¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: cmdline/apt-get.cc:2133
-msgid ""
-"Some broken packages were found while trying to process build-dependencies.\n"
-"You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:2252
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"build-dependency ¤ò½èÍýÃæ¤Ë²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤¬¤¤¤¯¤Ä¤«¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£\n"
-"¤³¤ì¤ò½¤Àµ¤¹¤ë¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·\n"
-"¤ì¤Þ¤»¤ó¡£"
+"%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ %3$s ¥Ñ¥Ã"
+"¥±¡¼¥¸¤Ï¿·¤·¤¹¤®¤Þ¤¹"
+
+#: cmdline/apt-get.cc:2277
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %3$s"
+
+#: cmdline/apt-get.cc:2291
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s ¤Î Build-dependency ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2295
 msgid "Failed to process build dependencies"
 msgstr "build dependency ¤Î½èÍý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: cmdline/apt-get.cc:2170
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2327
+msgid "Supported modules:"
 msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë:"
 
-#: cmdline/apt-get.cc:2211
+#: cmdline/apt-get.cc:2368
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1141,13 +1188,14 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "»ÈÍÑË¡: apt-get [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
-"        apt-get [¥ª¥×¥·¥ç¥ó] install|remove ¥Ñ¥Ã¥±¡¼¥¸Ì¾1 [¥Ñ¥Ã¥±¡¼¥¸Ì¾2 ...]\n"
+"        apt-get [¥ª¥×¥·¥ç¥ó] install|remove ¥Ñ¥Ã¥±¡¼¥¸Ì¾1 [¥Ñ¥Ã¥±¡¼¥¸Ì¾"
+"2 ...]\n"
 "        apt-get [¥ª¥×¥·¥ç¥ó] source ¥Ñ¥Ã¥±¡¼¥¸Ì¾1 [¥Ñ¥Ã¥±¡¼¥¸Ì¾2 ...]\n"
 "\n"
 "apt-get ¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É/¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î´Êñ¤Ê¥³¥Þ\n"
@@ -1163,7 +1211,7 @@ msgstr ""
 "   source - ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹\n"
 "   build-dep - ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Î¹½Ã۰͸´Ø·¸¤òÀßÄꤷ¤Þ¤¹\n"
 "   dist-upgrade - ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n"
-"                  (apt-get(8) »²¾È)\n"
+"                  (apt-get(8) ¤ò»²¾È)\n"
 "   dselect-upgrade - dselect ¤ÎÁªÂò¤Ë¤·¤¿¤¬¤¤¤Þ¤¹\n"
 "   clean - ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹\n"
 "   autoclean - ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¸Å¤¤¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹\n"
@@ -1185,6 +1233,7 @@ msgstr ""
 "  -o=? Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë, Îã -o dir::cache=/tmp\n"
 "¥ª¥×¥·¥ç¥ó¡¦ÀßÄê¤Ë´Ø¤·¤Æ¤Ï¡¢¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸ apt-get(8)¡¢sources.list(5)¡¢\n"
 "apt.conf(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"                        ¤³¤Î APT ¤Ï Super Cow Powers ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1205,16 +1254,17 @@ msgstr "
 #: cmdline/acqprogress.cc:135
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB ¤ò %s ÉäǼèÆÀ¤·¤Þ¤·¤¿ (%sB/s)\n"
+msgstr "%sB ¤ò %s ¤Ç¼èÆÀ¤·¤Þ¤·¤¿ (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225
+#, c-format
 msgid " [Working]"
 msgstr " [½èÍýÃæ]"
 
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
@@ -1237,7 +1287,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "»ÈÍÑÊýË¡: apt-sortpkgs [¥ª¥×¥·¥ç¥ó] ¥Õ¥¡¥¤¥ë̾1 [¥Õ¥¡¥¤¥ë̾2 ...]\n"
 "\n"
@@ -1277,28 +1327,28 @@ msgid ""
 msgstr "¤¬½ÅÍפǤ¹¡£¤³¤ì¤ò½¤Àµ¤·¤Æ [I]nstall ¤òºÆÅټ¹Ԥ·¤Æ¤¯¤À¤µ¤¤"
 
 #: dselect/update:30
-msgid "Merging Available information"
+msgid "Merging available information"
 msgstr "Æþ¼ê²Äǽ¾ðÊó¤ò¥Þ¡¼¥¸¤·¤Æ¤¤¤Þ¤¹"
 
-#: apt-inst/contrib/extracttar.cc:115
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "¥Ñ¥¤¥×¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: apt-inst/contrib/extracttar.cc:140
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "gzip ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 msgid "Corrupted archive"
 msgstr "²õ¤ì¤¿¥¢¡¼¥«¥¤¥Ö"
 
-#: apt-inst/contrib/extracttar.cc:192
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
 msgstr "tar ¥Á¥§¥Ã¥¯¥µ¥à¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£¥¢¡¼¥«¥¤¥Ö¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: apt-inst/contrib/extracttar.cc:295
+#: apt-inst/contrib/extracttar.cc:298
 #, c-format
-msgid "Unkown TAR header type %u, member %s"
+msgid "Unknown TAR header type %u, member %s"
 msgstr "̤ÃΤΠTAR ¥Ø¥Ã¥À¥¿¥¤¥× %u¡¢¥á¥ó¥Ð %s"
 
 #: apt-inst/contrib/arfile.cc:73
@@ -1334,7 +1384,7 @@ msgid "Failed to allocate diversion"
 msgstr "diversion ¤Î³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"
 msgstr "AddDiversion ¤Ç¤ÎÆâÉô¥¨¥é¡¼"
 
 #: apt-inst/filelist.cc:481
@@ -1353,8 +1403,8 @@ msgid "Duplicate conf file %s/%s"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s/%s ¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
 msgstr "%s ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1380,7 +1430,8 @@ msgstr "
 #: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï diversion ¤Î¥¿¡¼¥²¥Ã¥È¤Î %s/%s ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+msgstr ""
+"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï diversion ¤Î¥¿¡¼¥²¥Ã¥È¤Î %s/%s ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
@@ -1409,8 +1460,8 @@ msgstr "%s 
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "¥Õ¥¡¥¤¥ë %s/%s ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹"
 
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:701
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:412 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
@@ -1441,9 +1492,9 @@ msgstr "info 
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
-msgid "Reading Package Lists"
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹"
 
 #: apt-inst/deb/dpkgdb.cc:180
@@ -1453,11 +1504,11 @@ msgstr "
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾¼èÆÀÃæ¤ÎÆâÉô¥¨¥é¡¼"
 
 #: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+msgid "Reading file listing"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹"
 
 #: apt-inst/deb/dpkgdb.cc:216
@@ -1467,9 +1518,9 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"¥ê¥¹¥È¥Õ¥¡¥¤¥ë '%sinfo/%s' ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸µ\n"
-"¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Ê¤é¡¢¤½¤ÎÆâÍƤò¶õ¤Ë¤·¤Æ¨ºÂ¤ËƱ¤¸¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã\n"
-"¥±¡¼¥¸¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤!"
+"¥ê¥¹¥È¥Õ¥¡¥¤¥ë '%sinfo/%s' ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸µ¤ËÌ᤹¤³"
+"¤È¤¬¤Ç¤­¤Ê¤¤¤Ê¤é¡¢¤½¤ÎÆâÍƤò¶õ¤Ë¤·¤Æ¨ºÂ¤ËƱ¤¸¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºÆ¥¤¥ó"
+"¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤!"
 
 #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
@@ -1477,7 +1528,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr "¥ê¥¹¥È¥Õ¥¡¥¤¥ë %sinfo/%s ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"
 msgstr "ÆâÉô¥¨¥é¡¼¡¢¥Î¡¼¥É¤Î¼èÆÀ"
 
 #: apt-inst/deb/dpkgdb.cc:309
@@ -1496,21 +1547,21 @@ msgid "Invalid line in the diversion file: %s"
 msgstr "diversion ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¹Ô¤¬¤¢¤ê¤Þ¤¹: %s"
 
 #: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"
 msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ"
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr "ºÇ½é¤Ë¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò½é´ü²½¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
 #: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+msgid "Reading file list"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
-msgid "Failed to find a Package: Header, offset %lu"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¥Ø¥Ã¥À¡¢¥ª¥Õ¥»¥Ã¥È %lu"
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Package: ¥Ø¥Ã¥À¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥ª¥Õ¥»¥Ã¥È %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 #, c-format
@@ -1522,31 +1573,32 @@ msgstr "status 
 msgid "Error parsing MD5. Offset %lu"
 msgstr "MD5 ¤Î²òÀÏ¥¨¥é¡¼¡£¥ª¥Õ¥»¥Ã¥È %lu"
 
-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "'%s' ¥á¥ó¥Ð¤¬¤Ê¤¤¤¿¤á¡¢Àµ¤·¤¤ DEB ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52
 #, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢¥á¥ó¥Ð %s ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr ""
+"'%s' ¤Þ¤¿¤Ï '%s' ¥á¥ó¥Ð¤¬¤Ê¤¤¤¿¤á¡¢¤³¤ì¤ÏÀµ¤·¤¤ DEB ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-inst/deb/debfile.cc:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
 msgstr "ÆâÉô¥¨¥é¡¼¡¢¥á¥ó¥Ð¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
 msgid "Failed to locate a valid control file"
 msgstr "Àµ¤·¤¤À©¸æ¥Õ¥¡¥¤¥ë¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-inst/deb/debfile.cc:243
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
 msgstr "²òÀϤǤ­¤Ê¤¤À©¸æ¥Õ¥¡¥¤¥ë"
 
 #: methods/cdrom.cc:113
@@ -1556,14 +1608,14 @@ msgstr "cdrom 
 
 #: methods/cdrom.cc:122
 msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
-"¤³¤Î CD ¤ò APT ¤Ëǧ¼±¤µ¤»¤ë¤Ë¤Ï apt-cdrom ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¿·¤·¤¤ \n"
-"CD ¤òÄɲ乤뤿¤á¤Ë apt-get update ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
+"¤³¤Î CD ¤ò APT ¤Ëǧ¼±¤µ¤»¤ë¤Ë¤Ï apt-cdrom ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¿·¤·¤¤ CD ¤òÄÉ"
+"²Ã¤¹¤ë¤¿¤á¤Ë apt-get update ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+msgid "Wrong CD-ROM"
 msgstr "CD ¤¬°ã¤¤¤Þ¤¹"
 
 #: methods/cdrom.cc:163
@@ -1571,9 +1623,9 @@ msgstr "CD 
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "%s ¤Î CD-ROM ¤Ï»ÈÍÑÃæ¤Î¤¿¤á¥¢¥ó¥Þ¥¦¥ó¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
 msgid "File not found"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
 msgid "Failed to stat"
@@ -1600,9 +1652,9 @@ msgstr "
 msgid "Unable to determine the local name"
 msgstr "¥í¡¼¥«¥ë¥Í¡¼¥à¤ò·èÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: methods/ftp.cc:204 methods/ftp.cc:230
+#: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"
 msgstr "¥µ¡¼¥Ð¤«¤éÀܳ¤òµñÀ䤵¤ì¤Þ¤·¤¿¡£±þÅú: %s"
 
 #: methods/ftp.cc:210
@@ -1610,132 +1662,134 @@ msgstr "
 msgid "USER failed, server said: %s"
 msgstr "USER ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
 
-#: methods/ftp.cc:235
+#: methods/ftp.cc:237
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
-msgstr "¥×¥í¥­¥·¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥í¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Acquire::ftp::ProxyLogin ¤¬¶õ¤Ç¤¹¡£"
+msgstr ""
+"¥×¥í¥­¥·¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥í¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+"Acquire::ftp::ProxyLogin ¤¬¶õ¤Ç¤¹¡£"
 
-#: methods/ftp.cc:263
+#: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "¥í¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤Î¥³¥Þ¥ó¥É '%s' ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
 
-#: methods/ftp.cc:289
+#: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
 
-#: methods/ftp.cc:327 methods/ftp.cc:438 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
 msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È"
 
-#: methods/ftp.cc:333
+#: methods/ftp.cc:335
 msgid "Server closed the connection"
 msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀÚÃǤ·¤Þ¤·¤¿"
 
-#: methods/ftp.cc:336 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
 msgid "Read error"
 msgstr "Æɤ߹þ¤ß¥¨¥é¡¼"
 
-#: methods/ftp.cc:343 methods/rsh.cc:197
+#: methods/ftp.cc:345 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
 msgstr "¥ì¥¹¥Ý¥ó¥¹¤¬¥Ð¥Ã¥Õ¥¡¤ò¥ª¡¼¥Ð¥Õ¥í¡¼¤µ¤»¤Þ¤·¤¿¡£"
 
-#: methods/ftp.cc:360 methods/ftp.cc:372
+#: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
 msgstr "¥×¥í¥È¥³¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: methods/ftp.cc:444 methods/rsh.cc:232
-msgid "Write Error"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
 msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
 
-#: methods/ftp.cc:685 methods/ftp.cc:691 methods/ftp.cc:727
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
 msgstr "¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
-#: methods/ftp.cc:696
+#: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
 msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£"
 
-#: methods/ftp.cc:702
+#: methods/ftp.cc:704
 msgid "Could not connect passive socket."
 msgstr "¼õÆ°¥½¥±¥Ã¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: methods/ftp.cc:720
+#: methods/ftp.cc:722
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ¤Ï¥ê¥¹¥Ë¥ó¥°¥Ý¡¼¥È¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: methods/ftp.cc:734
+#: methods/ftp.cc:736
 msgid "Could not bind a socket"
 msgstr "¥½¥±¥Ã¥È¤ò bind ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: methods/ftp.cc:738
+#: methods/ftp.cc:740
 msgid "Could not listen on the socket"
 msgstr "¥½¥±¥Ã¥È¤ò listen ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:747
 msgid "Could not determine the socket's name"
 msgstr "¥½¥±¥Ã¥È¤Î̾Á°¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: methods/ftp.cc:777
+#: methods/ftp.cc:779
 msgid "Unable to send PORT command"
 msgstr "PORT ¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:789
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "̤ÃΤΥ¢¥É¥ì¥¹¥Õ¥¡¥ß¥ê %u (AF_*)"
 
-#: methods/ftp.cc:796
+#: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥µ¡¼¥Ð±þÅú: %s"
 
-#: methods/ftp.cc:816
+#: methods/ftp.cc:818
 msgid "Data socket connect timed out"
 msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥ÈÀܳ¥¿¥¤¥à¥¢¥¦¥È"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:825
 msgid "Unable to accept connection"
 msgstr "Àܳ¤ò accept ¤Ç¤­¤Þ¤»¤ó"
 
-#: methods/ftp.cc:862 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ç¤ÎÌäÂê"
 
-#: methods/ftp.cc:875
+#: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£¥µ¡¼¥Ð±þÅú '%s'"
 
-#: methods/ftp.cc:890 methods/rsh.cc:322
+#: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
 msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¥¿¥¤¥à¥¢¥¦¥È"
 
-#: methods/ftp.cc:920
+#: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "¥Ç¡¼¥¿Å¾Á÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥µ¡¼¥Ð±þÅú '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:995
+#: methods/ftp.cc:997
 msgid "Query"
 msgstr "Ì䤤¹ç¤ï¤»"
 
-#: methods/ftp.cc:1102
+#: methods/ftp.cc:1106
 msgid "Unable to invoke "
 msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
 
 #: methods/connect.cc:64
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "%s (%s)¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s (%s) ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹"
 
 #: methods/connect.cc:71
 #, c-format
@@ -1745,22 +1799,22 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:80
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "%s (f=%u t=%u p=%u)¤ËÂФ¹¤ë¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s (f=%u t=%u p=%u) ¤ËÂФ¹¤ë¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
 #: methods/connect.cc:86
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "%s:%s (%s)¤Ø¤ÎÀܳ¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "%s:%s (%s) ¤Ø¤ÎÀܳ¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
 #: methods/connect.cc:92
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s)¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£"
+msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿"
 
 #: methods/connect.cc:104
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "%s:%s (%s)¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
@@ -1799,79 +1853,83 @@ msgstr "%s 
 msgid "Read error from %s process"
 msgstr "%s ¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
 
-#: methods/http.cc:340
+#: methods/http.cc:344
 msgid "Waiting for headers"
 msgstr "¥Ø¥Ã¥À¤ÎÂÔµ¡Ãæ¤Ç¤¹"
 
-#: methods/http.cc:486
+#: methods/http.cc:490
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u ʸ»ú¤ò±Û¤¨¤ë 1 ¹Ô¤Î¥Ø¥Ã¥À¤ò¼èÆÀ¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:494
+#: methods/http.cc:498
 msgid "Bad header line"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¹Ô¤Ç¤¹"
 
-#: methods/http.cc:513 methods/http.cc:520
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:517 methods/http.cc:524
+msgid "The HTTP server sent an invalid reply header"
 msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê¥ê¥×¥é¥¤¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
 
-#: methods/http.cc:549
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:553
+msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Length ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
 
-#: methods/http.cc:564
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:568
+msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Range ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
 
-#: methods/http.cc:566
-msgid "This http server has broken range support"
+#: methods/http.cc:570
+msgid "This HTTP server has broken range support"
 msgstr "http ¥µ¡¼¥Ð¤Î¥ì¥ó¥¸¥µ¥Ý¡¼¥È¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: methods/http.cc:590
+#: methods/http.cc:594
 msgid "Unknown date format"
 msgstr "ÉÔÌÀ¤ÊÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤¹"
 
-#: methods/http.cc:733
+#: methods/http.cc:741
 msgid "Select failed"
-msgstr "select ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
+msgstr "select ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:738
+#: methods/http.cc:746
 msgid "Connection timed out"
 msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È"
 
-#: methods/http.cc:761
+#: methods/http.cc:769
 msgid "Error writing to output file"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:789
+#: methods/http.cc:797
 msgid "Error writing to file"
 msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:814
+#: methods/http.cc:822
 msgid "Error writing to the file"
 msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:828
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:836
+msgid "Error reading from server. Remote end closed connection"
 msgstr "¥ê¥â¡¼¥È¦¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Æ¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:830
+#: methods/http.cc:838
 msgid "Error reading from server"
 msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: methods/http.cc:1061
-msgid "Bad header Data"
+#: methods/http.cc:1069
+msgid "Bad header data"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¤Ç¤¹"
 
-#: methods/http.cc:1078
+#: methods/http.cc:1086
 msgid "Connection failed"
 msgstr "Àܳ¼ºÇÔ"
 
-#: methods/http.cc:1169
+#: methods/http.cc:1177
 msgid "Internal error"
 msgstr "ÆâÉô¥¨¥é¡¼"
 
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿"
+
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
 msgstr "¶õ¤Î¥Õ¥¡¥¤¥ë¤ò mmap ¤Ç¤­¤Þ¤»¤ó"
@@ -1886,47 +1944,57 @@ msgstr "%lu 
 msgid "Selection %s not found"
 msgstr "ÁªÂò¤µ¤ì¤¿ %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: apt-pkg/contrib/configuration.cc:449
+#: apt-pkg/contrib/configuration.cc:395
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Íý²ò¤Ç¤­¤Ê¤¤¾Êά·Á¼°¤Ç¤¹: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:453
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-pkg/contrib/configuration.cc:559
+#: apt-pkg/contrib/configuration.cc:471
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "%d ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹ (ºÇÂç¤Ï %d)"
+
+#: apt-pkg/contrib/configuration.cc:567
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Ö¥í¥Ã¥¯¤¬Ì¾Á°¤Ê¤·¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹"
+msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Ö¥í¥Ã¥¯¤¬Ì¾Á°¤Ê¤·¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: apt-pkg/contrib/configuration.cc:578
+#: apt-pkg/contrib/configuration.cc:586
 #, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ÉÔÀµ¤Ê¥¿¥°¤Ç¤¹"
 
-#: apt-pkg/contrib/configuration.cc:595
+#: apt-pkg/contrib/configuration.cc:603
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ãͤθå¤Ë;ʬ¤Ê¥´¥ß¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: apt-pkg/contrib/configuration.cc:635
+#: apt-pkg/contrib/configuration.cc:643
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ì¿Îá¤Ï¥È¥Ã¥×¥ì¥Ù¥ë¤Ç¤Î¤ß¼Â¹Ô¤Ç¤­¤Þ¤¹"
 
-#: apt-pkg/contrib/configuration.cc:642
+#: apt-pkg/contrib/configuration.cc:650
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥¤¥ó¥¯¥ë¡¼¥É¤Î¥Í¥¹¥È¤¬Â¿²á¤®¤Þ¤¹"
 
-#: apt-pkg/contrib/configuration.cc:646 apt-pkg/contrib/configuration.cc:651
+#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¤³¤³¤«¤é¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: apt-pkg/contrib/configuration.cc:655
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ̤Âбþ¤ÎÌ¿Îá '%s'"
 
-#: apt-pkg/contrib/configuration.cc:689
+#: apt-pkg/contrib/configuration.cc:697
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë;·×¤Ê¥´¥ß¤¬¤¢¤ê¤Þ¤¹"
@@ -1965,7 +2033,7 @@ msgstr "
 #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "¥ª¥×¥·¥ç¥ó %s: ÀßÄꥪ¥×¥·¥ç¥ó¤Ë¤Ï =<ÃÍ> ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+msgstr "¥ª¥×¥·¥ç¥ó %s: ÀßÄê¹àÌÜ¤Ë¤Ï =<ÃÍ> ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
@@ -1992,7 +2060,7 @@ msgstr "
 msgid "Unable to stat the mount point %s"
 msgstr "¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó"
 
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s ¤ØÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
@@ -2021,54 +2089,50 @@ msgstr "nfs 
 msgid "Could not get lock %s"
 msgstr "¥í¥Ã¥¯ %s ¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
 #, c-format
-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"
 msgstr "%s ¤òÂÔ¤Á¤Þ¤·¤¿¤¬¡¢¤½¤³¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó°ãÈ¿¤ò¼õ¤±¤È¤ê¤Þ¤·¤¿¡£"
 
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥¨¥é¡¼¥³¡¼¥É¤òÊÖ¤·¤Þ¤·¤¿(%u)"
+msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥¨¥é¡¼¥³¡¼¥É (%u) ¤òÊÖ¤·¤Þ¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬Í½´ü¤»¤º½ªÎ»¤·¤Þ¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Could not open file %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:474
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "Æɤ߹þ¤ß¤¬ %lu »Ä¤Ã¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¤¬¡¢²¿¤â»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "¤¢¤È %lu ½ñ¤­¹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
 msgid "Problem closing the file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
 msgid "Problem unlinking the file"
 msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
 
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
 msgid "Problem syncing the file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î sync ¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
 
@@ -2086,12 +2150,12 @@ msgstr "
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"
 msgstr "¤³¤Î APT ¤Ï¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à '%s' ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
 #: apt-pkg/pkgcache.cc:147
 msgid "The package cache was built for a different architecture"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤¬Â¾¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤ˹½ÃÛ¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤¬°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤ˹½ÃÛ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
 #: apt-pkg/pkgcache.cc:218
 msgid "Depends"
@@ -2142,86 +2206,76 @@ msgid "extra"
 msgstr "ÆÃÊÌ"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+msgid "Building dependency tree"
 msgstr "°Í¸´Ø·¸¥Ä¥ê¡¼¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹"
 
 #: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+msgid "Candidate versions"
 msgstr "¸õÊä¥Ð¡¼¥¸¥ç¥ó"
 
 #: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+msgid "Dependency generation"
 msgstr "°Í¸´Ø·¸¤ÎÀ¸À®"
 
-#: apt-pkg/tagfile.cc:81
+#: apt-pkg/tagfile.cc:73
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó(1)"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (1)"
 
-#: apt-pkg/tagfile.cc:174
+#: apt-pkg/tagfile.cc:160
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó(2)"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (2)"
 
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %lu ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(URI)"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI)"
 
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %lu ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(dist)"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist)"
 
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %lu ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(URI parse)"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI parse)"
 
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
 #, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %lu ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %lu ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(dist parse)"
-
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "¥Ù¥ó¥À¥Ö¥í¥Ã¥¯ %s ¤¬ÉÔÀµ¤Ç¤¹"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist parse)"
 
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
 #, c-format
 msgid "Opening %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹"
 
-#: apt-pkg/sourcelist.cc:249
-#, c-format, fuzzy
+#: apt-pkg/sourcelist.cc:170
+#, c-format
 msgid "Line %u too long in source list %s."
-msgstr "sources.list ¤Î %u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£"
 
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %u ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(type)"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (type)"
 
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
 #, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤Ë¤¢¤ë¥¿¥¤¥× '%1$s' ¤ÏÉÔÌÀ¤Ç¤¹"
 
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "ÉÔÀµ¤Ê¥é¥¤¥ó %u ¤¬¥½¡¼¥¹¥ê¥¹¥È %s ¤Ë¤¢¤ê¤Þ¤¹(vendor id)"
-
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %s ¤Î %u ¹Ô¤ËÉÔÌÀ¤Ê¥Ù¥ó¥À ID '%s' ¤¬¤¢¤ê¤Þ¤¹"
+msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (vendor id)"
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
@@ -2230,35 +2284,34 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢¶¥¹ç/Àè¹Ô°Í¸¤Î¥ë¡¼¥×¤¬¸¶°ø¤Ç¡¢°ì»þŪ¤Ë½ÅÍפÊÉÔ²Ä\n"
-"·ç¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºï½ü¤·¤Þ¤¹¡£¤³¤ì¤Ï¿¤¯¤Î¾ì¹ç¤ËÌäÂ꤬µ¯¤³¤ë¸¶°ø¤È¤Ê¤ê\n"
-"¤Þ¤¹¡£ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤¤¤¿¤¤¤Ê¤é¡¢APT::Force-LoopBreak ¥ª¥×¥·¥ç¥ó¤òÍ­¸ú\n"
-"¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢¶¥¹ç/Àè¹Ô°Í¸¤Î¥ë¡¼¥×¤¬¸¶°ø¤Ç¡¢°ì»þŪ¤Ë½ÅÍפÊÉԲķç¥Ñ¥Ã"
+"¥±¡¼¥¸ %s ¤òºï½ü¤·¤Þ¤¹¡£¤³¤ì¤Ï¿¤¯¤Î¾ì¹ç¤ËÌäÂ꤬µ¯¤³¤ë¸¶°ø¤È¤Ê¤ê¤Þ¤¹¡£ËÜÅö¤Ë"
+"¤³¤ì¤ò¹Ô¤¤¤¿¤¤¤Ê¤é¡¢APT::Force-LoopBreak ¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: apt-pkg/pkgrecords.cc:37
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥× '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: apt-pkg/algorithms.cc:238
+#: apt-pkg/algorithms.cc:241
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¤¿¤á¤Î¥¢¡¼¥«¥¤\n"
-"¥Ö¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+"¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¤¿¤á¤Î¥¢¡¼¥«¥¤¥Ö¤ò¸«"
+"¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"¥¨¥é¡¼¡¢pkgProblemResolver::Resolve ¤ÏÄä»ß¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯ÊÝᤵ¤ì¤¿\n"
-"¥Ñ¥Ã¥±¡¼¥¸¤¬¸¶°ø¤Ç¤¹¡£"
+"¥¨¥é¡¼¡¢pkgProblemResolver::Resolve ¤ÏÄä»ß¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼"
+"¥¸¤¬¸¶°ø¤Ç¤¹¡£"
 
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "ÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£"
+msgstr "ÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£²õ¤ì¤¿Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£"
 
 #: apt-pkg/acquire.cc:61
 #, c-format
@@ -2286,79 +2339,83 @@ msgid "Packaging system '%s' is not supported"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¥·¥¹¥Æ¥à '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable system type"
-msgstr "ŬÀڤʥ·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+msgid "Unable to determine a suitable packaging system type"
+msgstr "ŬÀڤʥѥ屡¼¥¸¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
 
 #: apt-pkg/clean.cc:61
 #, c-format
 msgid "Unable to stat %s."
-msgstr "%s ¤ò stat ¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s ¤ò stat ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list ¤Ë '¥½¡¼¥¹' URI ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Þ¤¿¤Ï¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë¤ò²ò¼á¤Þ¤¿¤Ï¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤¬\n"
-"¤Ç¤­¤Þ¤»¤ó¡£"
+"¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Þ¤¿¤Ï¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë¤ò²ò¼á¤Þ¤¿¤Ï¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ"
+"¤»¤ó¡£"
 
 #: apt-pkg/cachefile.cc:77
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"¤³¤ì¤é¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¤Ï apt-get update ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â\n"
-"¤·¤ì¤Þ¤»¤ó"
+"¤³¤ì¤é¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¤Ï apt-get update ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ"
+"¤»¤ó"
 
 #: apt-pkg/policy.cc:269
 msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
-"ÉÔÀµ¤Ê¥ì¥³¡¼¥É¤¬ preferences ¥Õ¥¡¥¤¥ë¤Ë¸ºß¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤¬\n"
-"¤¢¤ê¤Þ¤»¤ó"
+"ÉÔÀµ¤Ê¥ì¥³¡¼¥É¤¬ preferences ¥Õ¥¡¥¤¥ë¤Ë¸ºß¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤¬¤¢¤ê¤Þ¤»"
+"¤ó"
 
 #: apt-pkg/policy.cc:291
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "pin ¥¿¥¤¥× %s ¤¬Íý²ò¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "pin ¤ÇÍ¥ÀèÅÙ (¤Þ¤¿¤Ï 0) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
 #: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
 msgstr "¥­¥ã¥Ã¥·¥å¤ËÈó¸ß´¹¤Ê¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à¤¬¤¢¤ê¤Þ¤¹"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2374,13 +2431,13 @@ msgstr "
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿(CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
@@ -2396,54 +2453,151 @@ msgstr "
 msgid "Collecting File Provides"
 msgstr "¥Õ¥¡¥¤¥ëÄ󶡾ðÊó¤ò¼ý½¸¤·¤Æ¤¤¤Þ¤¹"
 
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 msgid "IO Error saving source cache"
 msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ÎÊݸÃæ¤Ë IO ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó"
+
+#: apt-pkg/acquire-item.cc:714
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸\n"
-"¤ò¼êÆ°¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹(¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£"
+"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°"
+"¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£"
 
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:767
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸\n"
-"¤ò¼êÆ°¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°"
+"¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:803
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: \n"
+"¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: "
 "¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:890
 msgid "Size mismatch"
 msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó"
 
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "¥Ù¥ó¥À¥Ö¥í¥Ã¥¯ %s ¤Ï¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+#: apt-pkg/cdrom.cc:504
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n"
+"CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿"
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+msgid "Identifying.. "
+msgstr "³Îǧ¤·¤Æ¤¤¤Þ¤¹.. "
+
+#: apt-pkg/cdrom.cc:538
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "³ÊǼ¤µ¤ì¤¿¥é¥Ù¥ë: %s \n"
+
+#: apt-pkg/cdrom.cc:558
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n"
+
+#: apt-pkg/cdrom.cc:576
+msgid "Unmounting CD-ROM\n"
+msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n"
+
+#: apt-pkg/cdrom.cc:580
+msgid "Waiting for disc...\n"
+msgstr "¥Ç¥£¥¹¥¯¤òÂԤäƤ¤¤Þ¤¹...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:588
+msgid "Mounting CD-ROM...\n"
+msgstr "CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹...\n"
+
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"
+msgstr "¥Ç¥£¥¹¥¯¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÁöºº¤·¤Æ¤¤¤Þ¤¹..\n"
+
+#: apt-pkg/cdrom.cc:644
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+"%i ¤Î¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î½ð̾¤ò¸«¤Ä¤±¤Þ¤·"
+"¤¿\n"
+
+#: apt-pkg/cdrom.cc:701
+msgid "That is not a valid name, try again.\n"
+msgstr "¤³¤ì¤ÏÍ­¸ú¤Ê̾Á°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ºÆ»î¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: apt-pkg/cdrom.cc:717
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"¤³¤Î¥Ç¥£¥¹¥¯¤Ï°Ê²¼¤Î¤è¤¦¤Ë¸Æ¤Ð¤ì¤Þ¤¹: \n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:721
+msgid "Copying package lists..."
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò¥³¥Ô¡¼¤·¤Æ¤¤¤Þ¤¹..."
+
+#: apt-pkg/cdrom.cc:745
+msgid "Writing new source list\n"
+msgstr "¿·¤·¤¤¥½¡¼¥¹¥ê¥¹¥È¤ò½ñ¤­¹þ¤ó¤Ç¤¤¤Þ¤¹\n"
+
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"
+msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Î¥½¡¼¥¹¥ê¥¹¥È¤Î¥¨¥ó¥È¥ê:\n"
+
+#: apt-pkg/cdrom.cc:788
+msgid "Unmounting CD-ROM..."
+msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤º¡¢%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤"
+"¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n"
 
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤ËÉÔÌÀ¤Ê¥Ù¥ó¥À ID '%1$s' ¤¬¤¢¤ê¤Þ¤¹"