X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8669a82ef889bdb947d62ab3ff11f27d70a9d2d6..ef1dff93202fa61e0b8cda761906bbca31e217bc:/po/km.po

diff --git a/po/km.po b/po/km.po
index 92b7abc91..3d3e2dfbe 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 18:12+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -162,12 +162,13 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ááááá¶áá %s %s áá¶áâáááááááááá¾â%s %s\n"
 
 #: cmdline/apt-cache.cc:1721
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -190,8 +191,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
@@ -227,7 +228,7 @@ msgstr ""
 "   depends - áááá á¶ááááááá¶áââáá¶áá¢á¶áááááâááááááâáá·áâáá¶ááâáááá\n"
 "   rdepends - áááá á¶áâáááááá¶áâáá¶áá¢á¶áááááâááááááâááááááá¶ááâ\n"
 "   pkgnames - áá¶áâáááááâááááááâáá¶ááá¢ááâ\n"
-"   dotty - ááááá¾áâááááááâáááá¶á ááâááááá¶ááâ GraphVis\n"
+"   dotty - ááááá¾áâááááááâáááá¶á ááâááááá¶ááâ GraphViz\n"
 "   xvcg - ááááá¾áâááááááâáááá¶á ááâááááá¶ááâ xvcg\n"
 "   policy - áááá á¶á áá¶ááááááâááááá¶áááâ\n"
 "\n"
@@ -658,7 +659,7 @@ msgstr "ááá¶áááâáááá»áâáá¶áâáááá¼áâá
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex ááá á»áâáá¶áááááááâ - %s"
@@ -819,11 +820,11 @@ msgstr "áááááá âáááá¼ááá¶áá²ááâááâá
 msgid "Internal error, Ordering didn't finish"
 msgstr "ááá á»áâáá¶ááááá»áâ áá¶áâáááâáá¶áâáááá¶ááâáá·áâáá¶áâááááááá¡á¾á"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
 msgid "Unable to lock the download directory"
 msgstr "áá·áâá¢á¶áâáá¶ááâááâááâáá¶áâááâáá¶áâá¡á¾á"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "áá·áâá¢á¶áâá¢á¶áâááááá¸âáááááâáá¶áâá¡á¾áâÂ á"
@@ -852,7 +853,7 @@ msgstr "ááááá¶ááâáá¸âááááá¶â %sB ááâáá¶
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ááááá¶ááâáá¸âááááá¶â %sB ááá áâáá¶ááá¹áââáááááÂ áÂ \n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "áá·áâá¢á¶áâáááááâááá áâáááááâáááá»áâ %s áá¶áá¡á¾á"
@@ -889,7 +890,7 @@ msgstr "ááááááÂ á"
 msgid "Do you want to continue [Y/n]? "
 msgstr "áá¾âá¢áááâáááâááááá¬â [áá¶á áá¶á/ááâ]Â ? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ááá¶áááâáááá»áâáá¶áâááâááááá¼áâááâ %s  %s\n"
@@ -898,7 +899,7 @@ msgstr "ááá¶áááâáááá»áâáá¶áâááâáááá
 msgid "Some files failed to download"
 msgstr "á¯ááá¶áâáá½áâáááá½áâáá¶áâááá¶áááâáááá»áâáá¶áâáá¶áâááâ"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
 msgid "Download complete and in download only mode"
 msgstr "áá¶ááááááááá¶ááá¶áâááâ á á¾áâááâáááá»áâááááââáá¶áâááâááá»ááááá"
 
@@ -995,80 +996,95 @@ msgstr "ááâáá·áâáá¾áâááááâ '%s' ááááá¶á
 msgid "Selected version %s (%s) for %s\n"
 msgstr "áá¶ááááá¾áâááááâ %s (%s) ááááá¶áá %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
 msgid "The update command takes no arguments"
 msgstr "áá¶áááâááááá¶âááááááá¾âá²ááâáá¶ááâááááâáááá¶áâá¢á¶áá»áááááâáá"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
 msgid "Unable to lock the list directory"
 msgstr "áá·áâá¢á¶áâáá¶ááâááâááâááááá¸áá¶áá¡á¾á"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "ááááááâáááá¸âáá¶ááááááâáá¹áâáááá¼áâáá¶áâááá¡á¾áâÂ á"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("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.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
 msgid "The following information may help to resolve the situation:"
 msgstr "áááááá¶áâáá¼ááááááá á¢á¶ááá½áâááááááá¶áâáááá¶ááá¶áâáá¶áÂ á"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ááá á»áâáá¶ááááá»á á¢áááâááááááá¶áâáááá á¶âáá¶ááááá¾á²áááá¼áâá§ááááá"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ááá á»áâáá¶ááááá»á áá¶ááááá¾á²ááááááá¾áâáá¶ááá¢áááá¶ááááá¾á²ááâá§áááááâáá¼á"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "áá·áâá¢á¶áâááâáááááá %s áá¶ááá"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "áá·áâá¢á¶áâááâáááááá %s áá¶ááá"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "áááá¶á áááá»áâáááá¾áâ %s ááááá¶áá regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâááá¡á¾âá"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "á¢áááâáááá ááâáá¶âáááâááá `apt-get -f install' áá¾áááá¸âááâáá½áâáá¶âáá¶ááâáááÂ á"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "áá¶áá¢áááááâáááâáá»áâáááá¶Â á áááá¶áá¶áâ 'apt-get -f install' áááâáááá¶áâáááááá (á¬ ááááá¶ááâááááááááá¶á)Â á"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
 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"
@@ -1080,132 +1096,122 @@ msgstr ""
 "ááááá¶áâáá¶ááá¶ááá¹ááá·ááá¶áááá¶áááááá¾áâá¡á¾áâ\n"
 " á¬ âáá¶áááâáááâáá¸áá¶ááááááÂ á"
 
-#: cmdline/apt-get.cc:1728
-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 ""
-"áá¶ááâáá¶ááâáá¸âá¢áááâáá¶áâáááá¾áâááááá·ááááá·áá¶áâáááá½áááâ áá¶ááááâá á¶ááâáá¼ááá¶â\n"
-"ááááááááááá·áá¢á¶áááá¡á¾ááá¶áááááá¶á á á¾ááá·áâáá¶áááááá¶áááá¹áâááá¶ááá¶áááâááá á»á\n"
-"ááááááâáááâ áá½ááááááá¼ááá¶áááá¶áááÂ á"
-
-#: cmdline/apt-get.cc:1736
+#: cmdline/apt-get.cc:1745
 msgid "Broken packages"
 msgstr "ááááááâáááâáá¶áâáá¼áâ"
 
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1774
 msgid "The following extra packages will be installed:"
 msgstr "ááááááâááááááâáá¼ááááááá áá¹ááááá¼ááá¶áâááá¡á¾áÂ á"
 
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1863
 msgid "Suggested packages:"
 msgstr "ááááááâáááâáá¶áâáááááâáááááÂ á"
 
-#: cmdline/apt-get.cc:1855
+#: cmdline/apt-get.cc:1864
 msgid "Recommended packages:"
 msgstr "ááááááâáááâáá¶áâáááááâá¢áá»áá¶áááÂ á"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1892
 msgid "Calculating upgrade... "
 msgstr "áááá»áâáááá¶âáá¶áâáááá¾âá²ááâááááá¾á... "
 
-#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "áá¶áâááá¶ááá"
 
-#: cmdline/apt-get.cc:1891
+#: cmdline/apt-get.cc:1900
 msgid "Done"
 msgstr "áááá¾áá½áâ"
 
-#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ááá á»áâáá¶ááááá»á á¢áááâááááááá¶áâáááá á¶âáá¶ááááá¾á²áááá¼áâá§ááááá"
 
-#: cmdline/apt-get.cc:2066
+#: cmdline/apt-get.cc:2075
 msgid "Must specify at least one package to fetch source for"
 msgstr "ááá¶áá áááá¶ááâáááá¼áââááááá¶ááââááááááâáá½á âáá¾áááá¸âááââááááá¼áâááâáááááâááááá¶áá"
 
-#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "áá·áâá¢á¶áâááâáááááááááááââááááá¶áá %s áá¶áá¡á¾á"
 
-#: cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:2154
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "áááá»áâááááâá¯ááá¶áâáááâáá¶áâáá¶áááâáá½áâ '%s'\n"
 
-#: cmdline/apt-get.cc:2173
+#: cmdline/apt-get.cc:2182
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "á¢áááâáá»áâáá¶áâááá áâáááááâááááááááá¶ááâááâáááááá»áâ %s á¡á¾á"
 
-#: cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:2188
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "áááá¼ááá¶áâááâ %sB/%sB ááâááááááá¶áâáááááÂ á\n"
 
-#: cmdline/apt-get.cc:2182
+#: cmdline/apt-get.cc:2191
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "áááá¼ááá¶áâááâ %sB ááâááááááá¶áâáááááâÂ á\n"
 
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2197
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ááááááá¼áâáááááâ %s\n"
 
-#: cmdline/apt-get.cc:2219
+#: cmdline/apt-get.cc:2228
 msgid "Failed to fetch some archives."
 msgstr "ááá¶áááâáááá»ááá¶áááááááá¼áááâááááááá¶áâáá½ááááá½áÂ á"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "áááá»áâááááâáá¶ááááá¶áâáááááááâááááá¶ááááá¶ááá½áâáááááá»á %s\n"
 
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2268
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "áá¶áááâááááá¶âáááá¶á '%s' áá¶áâááá¶áááâÂ á\n"
 
-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2269
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "áá·áá·áááâááááá·áâáá¾áááááá 'dpkg-dev' áá·áâáá¶ááâáá¶áâááá¡á¾áâÂ á\n"
 
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2286
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "áá¶áááâáá¶áááâááááá¶â '%s' áá¶áááá¶áááâÂ á\n"
 
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2305
 msgid "Child process failed"
 msgstr "áááá¾áâáá¶áâáá¼áâáá¶áâááá¶áááâ"
 
-#: cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:2321
 msgid "Must specify at least one package to check builddeps for"
 msgstr "áááá¼áááâááááá¶ááâááá¶áá áááá¶ááâáá½ááááááááá¾áááá¸áá·áá·ááá builddeps ááááá¶áá"
 
-#: cmdline/apt-get.cc:2340
+#: cmdline/apt-get.cc:2349
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "áá·áâá¢á¶áâáá¶ááááââáááááá¶áâáá¶áá¢áááááâááááá¶áá %s"
 
-#: cmdline/apt-get.cc:2360
+#: cmdline/apt-get.cc:2369
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s áá·ááá¶ááá¶áá¢á¶áááááâáááá¶ááá¶á¡á¾áâÂ á\n"
 
-#: cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2421
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
 
-#: cmdline/apt-get.cc:2465
+#: cmdline/apt-get.cc:2474
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1214,30 +1220,30 @@ msgstr ""
 "áá¶áá¢á¶ááááá %s ááááá¶áá %s áá·áá¢á¶áâááááá¼ááá·ááááá¶ááá ááááá áá·ááá¶áâááááâáááááááá %s áááá¢á¶áâááááá¼ááá·áááâ"
 "ááááá¼ááá¶áâáááááá¶áá¡á¾á"
 
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2510
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %sÂ á áááááá %s ááááá¶áááá¡á¾á ááºáááá¸ááá"
 
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %s: %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2551
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "áá¶áá¢á¶áááááâáááâááááá¾áâ %s áá·áâá¢á¶áâáááááâááááááá¸âáááá¼ááá¶áâáá¶áâááÂ á"
 
-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2555
 msgid "Failed to process build dependencies"
 msgstr "áá¶áâááá¶áááâáááá»áâáá¶áâáááá¾áââáá¶áâááááá¾áâáá¶áâá¢á¶ááááá"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2587
 msgid "Supported modules:"
 msgstr "ááá¼áá»áâáááâáá¶ááááÂ á "
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2628
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1254,7 +1260,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1846,7 +1852,7 @@ msgstr "áá¶áááááá¶ááâááááââáá·ááááá
 msgid "Unable to accept connection"
 msgstr "áá·áá¢á¶áâááá½áááâáá¶áááááá¶ááâáá¶áá¡á¾á"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "áááá á¶âáááá¾á²áááá¼áâá¯ááá¶á"
 
@@ -1930,38 +1936,38 @@ msgstr "áá¶áâááááááá¶áâá¢ááá¸âá¢á¶áááá
 msgid "Unable to connect to %s %s:"
 msgstr "áá·áâá¢á¶áâááááá¶ááâáááá¶ááââ %s %sÂ á"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "áá·áâá¢á¶áâáá¼áâáááá¾ááá¶á keyringÂ á '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "EÂ á ááááá¸âá¢á¶áá»áâááááâáá¸â Acquire::gpgv::Options too longÂ á áááâÂ á"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ááá á»áâáá¶ááááá»áâÂ á á ááááááá¶ââááá¢ ááá»áááá âáá·áâá¢á¶áâáááááâáá¼áááâáááá¶áâáááá¶áááÂ ?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "âáá¶ááá½áâáááááââââá ááááááá¶âááá¶áá áááá¶áááá½á ááâááááá¹ááááá¼áâÂ á"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "áá·áâá¢á¶áâááááá·ááááá· '%s' áá¾áááá¸âááááááááá¶ááâá ááááááá¶ (áá¾ gpgv áááá¼áâáá¶áâááá¡á¾áâá¬ááÂ ?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "áá·ááááá¶ááááá á»á áááá»ááá¶áááááá·ááááá· gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "á ááááááá¶âáá¶áâáááááâáá·áâáááá¹ááááá¼áÂ á\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1977,81 +1983,81 @@ msgstr "áá·áâá¢á¶áâáá¾áâáááá»áâááááá¶á
 msgid "Read error from %s process"
 msgstr "á¢á¶ááâááá á»áâáá¸âáááá¾ááá¶á %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "áááá»áâááááá¶áâáááááá¶"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "ááááááá¶ááâáááááá¶âáááá½áââ ááááá¾á %u áá½á¢áááá"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "áá½áâáááááá¶âáá¼áâ"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ááá¶ááá¸áâááááá¾â HTTP áá¶ááááá¾áááááá¶ááááá¾ááááá·ááááá¹ááááá¼á"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ááá¶ááá¸áâááááá¾â HTTP áá¶ááááá¾ââáááááá¶ááááááâââáá¶áá·áá¶âáá·ááááá¹ááááá¼áâ"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ááá¶ááá¸áâááááá¾â HTTP áá¶ááááá¾âáááááá¶âáá½áâáá¶áá·áá¶âáá·áâáááá¹ááááá¼áâ"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "ááá¶ááá¸áâááááá¾ HTTP ááááá¶áâáá¼áâââáá½áâáá¶ááááâ"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "áá·ááááá¶ááâááááááááá¶áâáá¶áááá·ááááá"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "áááá¾áâáá¶áâááá¶áááâ"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "áá¶áááááá¶ááâáá¶áâá¢áááááâ"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "ááá á»áâáááá»ááá¶áâááááááááá¶ááâá¯ááá¶ááááááá"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "ááá á»áâáááá»ááá¶áâááááááááá¶ááâá¯ááá¶á"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "ááá á»ááááá»ááá¶áâáááááâáááá¶ááâá¯ááá¶á"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ááá á»áâáááá»ááá¶áâá¢á¶áâáá¸âááá¶ááá¸áááááá¾Â á áá¶áááááááâáá¸ááááá¶áâáá¶ááá·ááá¶áááááá¶áá"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "ááá á»áâáááá»ááá¶áá¢á¶áâáá¸âááá¶ááá¸áâááááá¾"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "ááá¶áááâáááá»ááá¶áâáááááâá¯ááá¶á %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "áá·ááááááâáááááá¶âáá¼á"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "áá¶áááááá¶ááâáá¶áâááá¶áááâ"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "ááá á»áâáá¶áâáááá»áâ"
 
@@ -2064,11 +2070,38 @@ msgstr "áá·áá¢á¶á mmap á¯ááá¶ááááâáá¶áá¡á¾á"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "áá·áâá¢á¶áâááááá¾áâ mmap ááâ %lu áááá¶áá¡á¾á"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
 #, c-format
 msgid "Selection %s not found"
 msgstr "ááááá¾áâ %s ááâáá·áâáá¾áâá¡á¾á"
@@ -2494,7 +2527,7 @@ msgstr "áá·áá¢á¶áâáááá¾áâáááááá·áá¸âáá
 msgid "Method %s did not start correctly"
 msgstr "áá·áá¸áá¶áááááâ %s áá·áâá¢á¶áâáá¶ááâáááá¾áâáááá¹ááááá¼áâááâ"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "áá¼áâááááá¼áâáááá¶áâáá¸áâÂ á '%s' áááá»áâáááá¶áâ '%s' á á¾áâááááááâáá¼áÂ á"
@@ -2641,16 +2674,16 @@ msgstr "áááá¼áâáááááâáá¶áááá¶áááâ, %s (
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum áá·áâáááá½ááááâ"
 
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1421
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum áá·áâáááá½ááááâ"
 
-#: apt-pkg/acquire-item.cc:1113
+#: apt-pkg/acquire-item.cc:1118
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "áááá¶áâáá¼áááâáá¶áá¶áááâá¢á¶áâááâáá¶áâáááá»ááá¼ááá IDs áá¶ááááááâáááááÂ á\n"
 
-#: apt-pkg/acquire-item.cc:1226
+#: apt-pkg/acquire-item.cc:1231
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2659,7 +2692,7 @@ msgstr ""
 "áááá»áâáá·áâá¢á¶áâáááá¸áá¶ááâá¯ááá¶áâááááá¶ááâáááááá %s áá¶áâááÂ á âáá¶áâáááâáá¶âá¢áááâáááá¼ááá¶áâáá½ááá»áâááááááâáááâáááâááÂ á "
 "(ááááá¶áââáá¶ááâáááá¶áááááááá)"
 
-#: apt-pkg/acquire-item.cc:1285
+#: apt-pkg/acquire-item.cc:1290
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2667,13 +2700,13 @@ msgid ""
 msgstr ""
 "áááá»áâáá·áâá¢á¶áâáááá¸áá¶ááâá¯ááá¶áâááááá¶ááâáááááá %s áá¶áááÂ á âáá¶áâáááâáá¶âá¢áááâáááá¼ááá¶áâáá½ááá»áâááááááâáááâáááâáá á"
 
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1331
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "ááááááâá¯ááá¶áâáá·áá·ááááâáááá¼áâáá¶áâáá¼áÂ á áááá¶áâáááááâá¯ááá¶áÂ á áá¶áâááááá¶ááâáááááááááâááâ %sÂ á"
 
-#: apt-pkg/acquire-item.cc:1413
+#: apt-pkg/acquire-item.cc:1418
 msgid "Size mismatch"
 msgstr "ááá áâáá·ááá¶áâáááá½ááááâ"
 
@@ -2855,10 +2888,14 @@ msgstr "áááá»áâáááááâáá %s áááâáá¶áá
 msgid "Completely removed %s"
 msgstr "áá¶áâáá %s áááâáá¶ááâáááá»á"
 
-#: apt-pkg/deb/dpkgpm.cc:788
+#: apt-pkg/deb/dpkgpm.cc:789
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2868,6 +2905,15 @@ msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ %s áá¶áá¡
 msgid "Connection closed prematurely"
 msgstr "áá¶áâáá·áâáá¶áâááááá¶ááâáá»áâááá"
 
+#~ 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 ""
+#~ "áá¶ááâáá¶ááâáá¸âá¢áááâáá¶áâáááá¾áâááááá·ááááá·áá¶áâáááá½áááâ áá¶ááááâá á¶ááâáá¼ááá¶â\n"
+#~ "ááááááááááá·áá¢á¶áááá¡á¾ááá¶áááááá¶á á á¾ááá·áâáá¶áááááá¶áááá¹áâááá¶ááá¶áááâááá á»á\n"
+#~ "ááááááâáááâ áá½ááááááá¼ááá¶áááá¶áááÂ á"
+
 #, fuzzy
 #~ msgid "Line %d too long (max %lu)"
 #~ msgstr "ááááá¶ááâ %d ááááááâ (á¢áá·áááá¶ %d)"