X-Git-Url: https://git.hcoop.net/ntk/apt.git/blobdiff_plain/31a53f84623324cd7452e9d1091236b1c8919753..640c5d948afa27a8e71eb6c03f1e0d55f81773c5:/po/apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 473f59bd..93485a4d 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-25 20:21-0400\n"
+"POT-Creation-Date: 2004-07-29 09:38-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,145 +15,145 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:133
+#: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: 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:1355
-#: cmdline/apt-cache.cc:1506
+#: 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 ""
 
-#: cmdline/apt-cache.cc:230
+#: cmdline/apt-cache.cc:232
 msgid "Total Package Names : "
 msgstr ""
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:272
 msgid "  Normal Packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:271
+#: cmdline/apt-cache.cc:273
 msgid "  Pure Virtual Packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:274
 msgid "  Single Virtual Packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:275
 msgid "  Mixed Virtual Packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:276
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:278
 msgid "Total Distinct Versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:280
 msgid "Total Dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:281
+#: cmdline/apt-cache.cc:283
 msgid "Total Ver/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:285
 msgid "Total Provides Mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:297
 msgid "Total Globbed Strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:309
+#: cmdline/apt-cache.cc:311
 msgid "Total Dependency Version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:316
 msgid "Total Slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:322
+#: 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 ""
 
-#: cmdline/apt-cache.cc:1229
+#: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1383
+#: cmdline/apt-cache.cc:1385
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1460
+#: cmdline/apt-cache.cc:1462
 msgid "Package Files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553
+#: 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:1468
+#: cmdline/apt-cache.cc:1470
 #, c-format
 msgid "%4i %s\n"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1480
+#: cmdline/apt-cache.cc:1482
 msgid "Pinned Packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgid "(not found)"
 msgstr ""
 
 #. Installed version
-#: cmdline/apt-cache.cc:1513
+#: cmdline/apt-cache.cc:1515
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1522
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1530
+#: cmdline/apt-cache.cc:1532
 msgid "  Package Pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1539
+#: cmdline/apt-cache.cc:1541
 msgid "  Version Table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544
-#: cmdline/apt-get.cc:2178 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
+#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1585
+#: cmdline/apt-cache.cc:1653
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -240,36 +240,37 @@ msgstr ""
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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 ""
 
-#: ftparchive/apt-ftparchive.cc:396
+#: ftparchive/apt-ftparchive.cc:397
 #, c-format
 msgid "Error Processing Contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:550
+#: ftparchive/apt-ftparchive.cc:551
 msgid ""
 "Usage: apt-ftparchive [options] command\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"
@@ -305,115 +306,120 @@ msgid ""
 "  -o=?  Set an arbitary configuration option"
 msgstr ""
 
-#: 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 ""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:45
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
-#: ftparchive/cachedb.cc:59
+#: ftparchive/cachedb.cc:63
 #, c-format
-msgid "Unable to open DB2 file %s"
+msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc:114
 #, c-format
 msgid "File date has changed %s"
 msgstr ""
 
-#: 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 ""
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: 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 ""
 
-#: ftparchive/writer.cc:148 ftparchive/writer.cc:178
+#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: 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 ""
 
-#: ftparchive/writer.cc:242
+#: ftparchive/writer.cc:246
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:250
+#: ftparchive/writer.cc:254
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:258
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:261
+#: ftparchive/writer.cc:265
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:271
+#: ftparchive/writer.cc:275
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -508,184 +514,188 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#. This needs to be a capital
-#: cmdline/apt-get.cc:116
+#: cmdline/apt-get.cc:118
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:223
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:235
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:313
+#: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:315
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:334
 msgid "but it is not installable"
 msgstr ""
 
-#: cmdline/apt-get.cc:324
+#: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"
 msgstr ""
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:339
 msgid "but it is not installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:339
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:332
+#: cmdline/apt-get.cc:344
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:373
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:387
+#: cmdline/apt-get.cc:399
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:409
-msgid "The following packages have been kept back"
+#: cmdline/apt-get.cc:421
+msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:430
-msgid "The following packages will be upgraded"
+#: cmdline/apt-get.cc:442
+msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: cmdline/apt-get.cc:451
-msgid "The following packages will be DOWNGRADED"
+#: cmdline/apt-get.cc:463
+msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:471
+#: cmdline/apt-get.cc:483
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:524
+#: cmdline/apt-get.cc:536
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:532
+#: cmdline/apt-get.cc:544
 msgid ""
 "WARNING: The following essential packages will be removed\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:562
+#: cmdline/apt-get.cc:574
 #, c-format
-msgid "%lu packages upgraded, %lu newly installed, "
+msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:566
+#: cmdline/apt-get.cc:578
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:568
+#: cmdline/apt-get.cc:580
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:570
+#: cmdline/apt-get.cc:582
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:586
 #, c-format
-msgid "%lu packages not fully installed or removed.\n"
+msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:646
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: cmdline/apt-get.cc:637
+#: cmdline/apt-get.cc:649
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:640
+#: cmdline/apt-get.cc:652
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:643
+#: cmdline/apt-get.cc:655
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:645
+#: cmdline/apt-get.cc:657
 msgid " Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:661
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:664
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:718
 msgid "Packages need to be removed but Remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:1698 cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:742 cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1990
+#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:774
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:765
+#: cmdline/apt-get.cc:777
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:770
+#: cmdline/apt-get.cc:782
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:802
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:811
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:805 cmdline/apt-get.cc:825
+#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:807
+#: cmdline/apt-get.cc:819
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:809
+#: cmdline/apt-get.cc:821
 #, c-format
 msgid ""
 "You are about to do something potentially harmful\n"
@@ -693,160 +703,154 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:815 cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:842
 msgid "Do you want to continue? [Y/n] "
 msgstr ""
 
-#: cmdline/apt-get.cc:899 cmdline/apt-get.cc:1270 cmdline/apt-get.cc:1888
+#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:929
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:918 cmdline/apt-get.cc:1897
+#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:936
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:928
+#: cmdline/apt-get.cc:940
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:933
+#: cmdline/apt-get.cc:945
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:934
+#: cmdline/apt-get.cc:946
 msgid "Aborting Install."
 msgstr ""
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:979
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:989
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:1007
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:1018
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1030
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1035
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1040
 #, 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 ""
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1059
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1051
+#: cmdline/apt-get.cc:1062
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1071
+#: cmdline/apt-get.cc:1082
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1090
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1119
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1125
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1224
+#: cmdline/apt-get.cc:1235
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1237
+#: cmdline/apt-get.cc:1248
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1289
+#: cmdline/apt-get.cc:1300
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:1308
+#: cmdline/apt-get.cc:1319
 msgid "Internal Error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1398 cmdline/apt-get.cc:1434
+#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1411
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1421
+#: cmdline/apt-get.cc:1432
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1451
+#: cmdline/apt-get.cc:1462
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1465
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:1477
 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"
@@ -854,140 +858,149 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1485
 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"
 "that package should be filed."
 msgstr ""
 
-#: cmdline/apt-get.cc:1479
+#: cmdline/apt-get.cc:1490
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1482
+#: cmdline/apt-get.cc:1493
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:1519
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1590
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1591
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1611
 msgid "Calculating Upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1596 methods/ftp.cc:700 methods/connect.cc:99
+#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1601
+#: cmdline/apt-get.cc:1619
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1792
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1801 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1848
+#: cmdline/apt-get.cc:1866
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1853
+#: cmdline/apt-get.cc:1871
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1874
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1862
+#: cmdline/apt-get.cc:1880
 #, c-format
 msgid "Fetch Source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1911
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1939
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1951
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1968
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1987
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:2003
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2013
+#: cmdline/apt-get.cc:2031
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2051
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2103
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:2155
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2146
-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:2190
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2151
+#: cmdline/apt-get.cc:2215
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2229
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: cmdline/apt-get.cc:2233
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2183
+#: cmdline/apt-get.cc:2265
 msgid "Supported Modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2224
+#: cmdline/apt-get.cc:2306
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1051,6 +1064,7 @@ msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
 #: cmdline/acqprogress.cc:225
+#, c-format
 msgid " [Working]"
 msgstr ""
 
@@ -1110,23 +1124,23 @@ msgstr ""
 msgid "Merging Available information"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:115
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:140
+#: apt-inst/contrib/extracttar.cc:141
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:192
+#: apt-inst/contrib/extracttar.cc:193
 msgid "Tar Checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:295
+#: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
@@ -1239,8 +1253,8 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:705
-#: 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 ""
@@ -1425,7 +1439,7 @@ 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"
 msgstr ""
@@ -1435,125 +1449,125 @@ msgstr ""
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:235
+#: methods/ftp.cc:237
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:263
+#: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:289
+#: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: 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 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
 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
+#: methods/ftp.cc:446 methods/rsh.cc:232
 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 ""
 
-#: methods/ftp.cc:734
+#: methods/ftp.cc:736
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:738
+#: methods/ftp.cc:740
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: 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 ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:789
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:796
+#: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: 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 ""
 
-#: methods/ftp.cc:862 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:916 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 ""
 
-#: 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 ""
 
 #. Get the files information
-#: methods/ftp.cc:995
+#: methods/ftp.cc:997
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1102
+#: methods/ftp.cc:1104
 msgid "Unable to invoke "
 msgstr ""
 
@@ -1624,76 +1638,76 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: 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 ""
 
-#: methods/http.cc:494
+#: methods/http.cc:498
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:513 methods/http.cc:520
+#: methods/http.cc:517 methods/http.cc:524
 msgid "The http server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:549
+#: methods/http.cc:553
 msgid "The http server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:564
+#: methods/http.cc:568
 msgid "The http server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:566
+#: methods/http.cc:570
 msgid "This http server has broken range support"
 msgstr ""
 
-#: methods/http.cc:590
+#: methods/http.cc:594
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:733
+#: methods/http.cc:737
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:738
+#: methods/http.cc:742
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:761
+#: methods/http.cc:765
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:789
+#: methods/http.cc:793
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:814
+#: methods/http.cc:818
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:828
+#: methods/http.cc:832
 msgid "Error reading from server Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:830
+#: methods/http.cc:834
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1061
+#: methods/http.cc:1065
 msgid "Bad header Data"
 msgstr ""
 
-#: methods/http.cc:1078
+#: methods/http.cc:1082
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1169
+#: methods/http.cc:1173
 msgid "Internal error"
 msgstr ""
 
@@ -1721,42 +1735,47 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:563
+#: apt-pkg/contrib/configuration.cc:471
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:567
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:582
+#: apt-pkg/contrib/configuration.cc:586
 #, c-format
 msgid "Syntax error %s:%u: Malformed Tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:599
+#: apt-pkg/contrib/configuration.cc:603
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:639
+#: apt-pkg/contrib/configuration.cc:643
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:646
+#: apt-pkg/contrib/configuration.cc:650
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:650 apt-pkg/contrib/configuration.cc:655
+#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:693
+#: apt-pkg/contrib/configuration.cc:697
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -1822,7 +1841,7 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: 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 ""
@@ -2040,7 +2059,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:270
 #, 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 ""
 
 #: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
@@ -2108,7 +2127,7 @@ msgid "Packaging system '%s' is not supported"
 msgstr ""
 
 #: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable system type"
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
 #: apt-pkg/clean.cc:61
@@ -2137,6 +2156,10 @@ msgstr ""
 msgid "Did not understand pin type %s"
 msgstr ""
 
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
 #: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
 msgstr ""