* merged apt--main and make sure that the po files come from apt--main (because they are more recent)

1 files changed, 21 insertions, 25 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index b1caa6f23..3936f3f16 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: 2005-05-23 23:04+0200\n"
+"POT-Creation-Date: 2005-05-23 11:34+0200\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"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: 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:1522
+#: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
@@ -92,77 +92,68 @@ msgstr ""
 msgid "You must give exactly one pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1366 cmdline/apt-get.cc:1065
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1372
-msgid "You should explicitly select one to show."
-msgstr ""
-
-#: cmdline/apt-cache.cc:1399
+#: cmdline/apt-cache.cc:1385
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1476
+#: cmdline/apt-cache.cc:1462
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1483 cmdline/apt-cache.cc:1569
+#: 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:1484
+#: cmdline/apt-cache.cc:1470
 #, c-format
 msgid "%4i %s\n"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1496
+#: cmdline/apt-cache.cc:1482
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1508 cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgid "(not found)"
 msgstr ""
 
 #. Installed version
-#: cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1515
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1539
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1522
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1532
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1541
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1665 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: 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 ""
 
-#: cmdline/apt-cache.cc:1672
+#: cmdline/apt-cache.cc:1658
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -783,6 +774,11 @@ msgstr ""
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:1065
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
 #: cmdline/apt-get.cc:1077
 msgid " [Installed]"
 msgstr ""