summaryrefslogtreecommitdiff
path: root/po/apt-all.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po/apt-all.pot')
-rw-r--r--po/apt-all.pot422
1 files changed, 212 insertions, 210 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b8305c25c..c2cd5e9d7 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: 2009-07-21 15:49+0200\n"
+"POT-Creation-Date: 2009-07-21 18:36+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"
@@ -21,8 +21,8 @@ msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1017
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1571
#, c-format
msgid "Unable to locate package %s"
msgstr ""
@@ -91,72 +91,72 @@ msgstr ""
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1217
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1297
+#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1447
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1524
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1618
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1545
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1557 cmdline/apt-cache.cc:1598
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1578
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
+#: cmdline/apt-cache.cc:1580 cmdline/apt-cache.cc:1588
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1585
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1595
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1604
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1619
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1726
+#: cmdline/apt-cache.cc:1721
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -195,15 +195,15 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:78
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -246,7 +246,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -549,7 +549,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1659
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -648,118 +648,118 @@ msgstr ""
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:669
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:672
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:675
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:678
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:680
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:714
+#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:721
+#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:883
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:775
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:784
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:795
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2001 cmdline/apt-get.cc:2034
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2328
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:841
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:845
+#: cmdline/apt-get.cc:844
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:849
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:853
+#: cmdline/apt-get.cc:852
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2177
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:873
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:909
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:891
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:893
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -767,74 +767,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:899 cmdline/apt-get.cc:918
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:914
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
+#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1005
+#: cmdline/apt-get.cc:1004
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
+#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2234
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1011
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1015
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1020
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1021
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1055
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1083
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1094
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1107
+#: cmdline/apt-get.cc:1106
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1112
+#: cmdline/apt-get.cc:1111
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1116
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -842,68 +842,68 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1135
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1138
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1159
+#: cmdline/apt-get.cc:1158
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:1195
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1197
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1204
+#: cmdline/apt-get.cc:1203
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1310
+#: cmdline/apt-get.cc:1309
#, c-format
msgid "No source package '%s' picking '%s' instead\n"
msgstr ""
-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1346
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1359
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1411
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1443
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1445
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1450
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -919,49 +919,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
+#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1743
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1459
+#: cmdline/apt-get.cc:1457
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1478
+#: cmdline/apt-get.cc:1476
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1533
+#: cmdline/apt-get.cc:1531
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:1669
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1700
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1715
+#: cmdline/apt-get.cc:1713
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:1716
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
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"
@@ -969,152 +969,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1746
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1864
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1867
+#: cmdline/apt-get.cc:1865
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1896
+#: cmdline/apt-get.cc:1894
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1902
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1969 cmdline/apt-get.cc:1977
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2077
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2346
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2156
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:2184
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2192
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2193
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2201
+#: cmdline/apt-get.cc:2199
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2232
+#: cmdline/apt-get.cc:2230
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2258
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2270
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2290
+#: cmdline/apt-get.cc:2288
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2309
+#: cmdline/apt-get.cc:2307
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2323
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2371
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2423
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2476
#, 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:2514
+#: cmdline/apt-get.cc:2512
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2541
+#: cmdline/apt-get.cc:2539
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2555
+#: cmdline/apt-get.cc:2553
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2559
+#: cmdline/apt-get.cc:2557
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:2589
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2632
+#: cmdline/apt-get.cc:2630
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1158,7 +1158,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2799
+#: cmdline/apt-get.cc:2797
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1382,8 +1382,10 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163
+#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1413,9 +1415,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
-#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
-#: apt-pkg/pkgcachegen.cc:957
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
msgid "Reading package lists"
msgstr ""
@@ -1515,31 +1517,31 @@ msgstr ""
msgid "Unparsable control file"
msgstr ""
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr ""
@@ -1866,7 +1868,7 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr ""
@@ -1882,16 +1884,16 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2038,13 +2040,13 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
msgstr ""
@@ -2209,16 +2211,16 @@ msgstr ""
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:221
+#: apt-pkg/depcache.cc:220
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:227
+#: apt-pkg/depcache.cc:226
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
@@ -2258,32 +2260,32 @@ msgstr ""
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:426
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2302,17 +2304,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1154
+#: apt-pkg/algorithms.cc:1138
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1156
+#: apt-pkg/algorithms.cc:1140
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -2330,12 +2332,12 @@ msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:826
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:831
+#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2355,16 +2357,16 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:125
+#: apt-pkg/init.cc:132
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:148
msgid "Unable to determine a suitable packaging system type"
msgstr ""
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
#, c-format
msgid "Unable to stat %s."
msgstr ""
@@ -2381,110 +2383,110 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:329
+#: apt-pkg/policy.cc:347
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:351
+#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:359
+#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:166
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:191
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:195
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:226
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:230
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:258
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:314
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:693
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:778
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
msgstr ""
@@ -2493,39 +2495,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:394
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1118
+#: apt-pkg/acquire-item.cc:1101
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1231
+#: apt-pkg/acquire-item.cc:1211
#, 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 ""
-#: apt-pkg/acquire-item.cc:1290
+#: apt-pkg/acquire-item.cc:1270
#, 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 ""
-#: apt-pkg/acquire-item.cc:1331
+#: apt-pkg/acquire-item.cc:1311
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1418
+#: apt-pkg/acquire-item.cc:1398
msgid "Size mismatch"
msgstr ""
@@ -2549,105 +2551,105 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:689
+#: apt-pkg/cdrom.cc:684
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:710
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""