X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/20597fb843c52cddd108ebfb50108ccb662b687a..3465138575e1fd0d5892d9b6be1ae232eb873460:/po/km.po

diff --git a/po/km.po b/po/km.po
index a2c754345..4948ecb08 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-11-28 22:48+0100\n"
+"POT-Creation-Date: 2016-06-23 09:02+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"
@@ -235,10 +235,10 @@ msgid ""
 "unauthenticated"
 msgstr "áá¶áâáááá á¶â á á¾á -y áááá¼áâáá¶áâáááá¾âááááááá¶áââ --forceâ-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "ááá¶áááâáááá»áâáá¶áâááâááááá¼áâááâ %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "ááá¶áááâáááá»áâáá¶áâááâááááá¼áâááâ %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -254,6 +254,36 @@ msgstr "á¢áááâáááá¶áâááá áââáááááâá
 msgid "Unable to lock the download directory"
 msgstr "áá·áâá¢á¶áâáá¶ááâááâááâáá¶áâááâáá¶áâá¡á¾á"
 
+#: apt-private/private-install.cc
+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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"áá·áá¢á¶áâááá¡á¾áááááááâáá½ááááá½áâáá¶áá¡á¾áÂ á áááâáá¶áâáááâáá¶âá¢áááâ\n"
+"âáá¶ááááá¾áâáááá¶ááá¶áâáááâáá·áâá¢á¶áâáááá¾áá¶ááá½á á¬ âááááá·áâáá¾ââá¢áááâáááá»áâáááá¾áá¶áááááá¶áâáá»áâáá¶áâáááá¹áâááá ááááááâ"
+"ááááá¶áâáá¶ááá¶ááá¹ááá·ááá¶áááá¶áááááá¾áâá¡á¾áâ\n"
+" á¬ âáá¶áááâáááâáá¸áá¶ááááááÂ á"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::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.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "áááááá¶áâáá¼ááááááá á¢á¶ááá½áâááááááá¶áâáááá¶ááá¶áâáá¶áÂ á"
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "ááááááâáááâáá¶áâáá¼áâ"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "ááá á»áâáá¶ááááá»á ááááááâááá¡á¾áâáááá¼áâáá¶áâá áââáá¶áá½áâááááááâáááâáá¼áÂ !"
@@ -398,20 +428,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::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.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "áááááá¶áâáá¼ááááááá á¢á¶ááá½áâááááááá¶áâáááá¶ááá¶áâáá¶áÂ á"
-
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
@@ -453,22 +469,6 @@ msgid ""
 msgstr ""
 "áá¶áá¢áááááâáááâáá»áâáááá¶Â á áááá¶áá¶áâ 'apt-get -f install' áááâáááá¶áâáááááá (á¬ ááááá¶ááâááááááááá¶á)Â á"
 
-#: apt-private/private-install.cc
-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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"áá·áá¢á¶áâááá¡á¾áááááááâáá½ááááá½áâáá¶áá¡á¾áÂ á áááâáá¶áâáááâáá¶âá¢áááâ\n"
-"âáá¶ááááá¾áâáááá¶ááá¶áâáááâáá·áâá¢á¶áâáááá¾áá¶ááá½á á¬ âááááá·áâáá¾ââá¢áááâáááá»áâáááá¾áá¶áááááá¶áâáá»áâáá¶áâáááá¹áâááá ááááááâ"
-"ááááá¶áâáá¶ááá¶ááá¹ááá·ááá¶áááá¶áááááá¾áâá¡á¾áâ\n"
-" á¬ âáá¶áááâáááâáá¸áá¶ááááááÂ á"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "ááááááâáááâáá¶áâáá¼áâ"
-
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "The following additional packages will be installed:"
@@ -530,12 +530,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
 #: apt-private/private-main.cc
+#, c-format
 msgid ""
 "NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
+"      %s needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"      so don't depend on the relevance to the real current situation!\n"
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc
@@ -746,10 +748,6 @@ msgstr "áááá¶ááâááááá¶ááâáá·áááâááá
 msgid "Pinned packages:"
 msgstr "ááááááâáááâáá¶áâáááá¶ááÂ á"
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(ááâáá·áâáá¾á)"
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -768,10 +766,6 @@ msgstr "  áá¶áááááÂ á "
 msgid "(none)"
 msgstr "(áááá¶á)"
 
-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "  áááá¶ááâááááááÂ á "
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
@@ -874,27 +868,6 @@ msgstr "áá·áá·áááâááááá·áâáá¾áááááá 'd
 msgid "Build command '%s' failed.\n"
 msgstr "áá¶áááâáá¶áááâááááá¶â '%s' áá¶áááá¶áááâÂ á\n"
 
-#: apt-private/private-source.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "áááá¼áááâááááá¶ááâááá¶áá áááá¶ááâáá½ááááááááá¾áááá¸áá·áá·ááá builddeps ááááá¶áá"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "áá¶áâááá¶áááâáááá»áâáá¶áâáááá¾áââáá¶áâááááá¾áâáá¶áâá¢á¶ááááá"
-
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
@@ -906,49 +879,25 @@ msgid "%s has no build depends.\n"
 msgstr "%s áá·ááá¶ááá¶áá¢á¶áááááâáááá¶ááá¶á¡á¾áâÂ á\n"
 
 #: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
+msgid "Must specify at least one package to check builddeps for"
+msgstr "áááá¼áááâááááá¶ááâááá¶áá áááá¶ááâáá½ááááááááá¾áááá¸áá·áá·ááá builddeps ááááá¶áá"
 
 #: apt-private/private-source.cc
 #, c-format
 msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
 
 #: apt-private/private-source.cc
 #, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %sÂ á áááááá %s ááááá¶áááá¡á¾á ááºáááá¸ááá"
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
-"áá¶áá¢á¶ááááá %s ááááá¶áá %s áá·áá¢á¶áâááááá¼ááá·ááááá¶ááá ááááá áá·ááá¶áâááááâáááááááá %s áááá¢á¶áâááááá¼ááá·áááâ"
-"ááááá¼ááá¶áâáááááá¶áá¡á¾á"
 
 #: apt-private/private-source.cc
 #, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %s: %s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "áá¶áá¢á¶áááááâáááâááááá¾áâ %s áá·áâá¢á¶áâáááááâááááááá¸âáááá¼ááá¶áâáá¶áâááÂ á"
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "áá¶áâááá¶áááâáááá»áâáá¶áâáááá¾áââáá¶áâááááá¾áâáá¶áâá¢á¶ááááá"
 
 #: apt-private/private-source.cc
 msgid "Failed to process build dependencies"
@@ -964,6 +913,11 @@ msgstr "ááá¶áááâáááá»áâáá¶áâáááá¼áâá
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
+#: apt-private/private-unmet.cc
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "áááááá %s áááá %s áá¶áâáá¶áâá¢á¶áááááâáá·áâáááá¼áâáááá¶Â á\n"
+
 #: apt-private/private-update.cc
 msgid "The update command takes no arguments"
 msgstr "áá¶áááâááááá¶âááááááá¾âá²ááâáá¶ááâááááâáááá¶áâá¢á¶áá»áááááâáá"
@@ -980,11 +934,6 @@ msgstr[1] ""
 msgid "All packages are up to date."
 msgstr ""
 
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "áááááá %s áááá %s áá¶áâáá¶áâá¢á¶áááááâáá·áâáááá¼áâáááá¶Â á\n"
-
 #: cmdline/apt-cache.cc
 #, fuzzy
 msgid "apt-cache stats does not take any arguments"
@@ -1102,67 +1051,6 @@ msgstr "áá¶áâáááááâááááááâáá¶ááá¢áá
 msgid "Show policy settings"
 msgstr "áááá á¶á áá¶ááááááâááááá¶áááâ"
 
-#: cmdline/apt.cc
-msgid ""
-"Usage: apt [options] command\n"
-"\n"
-"apt is a commandline package manager and provides commands for\n"
-"searching and managing as well as querying information about packages.\n"
-"It provides the same functionality as the specialized APT tools,\n"
-"like apt-get and apt-cache, but enables options more suitable for\n"
-"interactive use by default.\n"
-msgstr ""
-
-#. query
-#: cmdline/apt.cc
-msgid "list packages based on package names"
-msgstr ""
-
-#: cmdline/apt.cc
-#, fuzzy
-msgid "search in package descriptions"
-msgstr "áááá»áâá¢á¶áâááááá¸âáááááá"
-
-#: cmdline/apt.cc
-msgid "show package details"
-msgstr ""
-
-#. package stuff
-#: cmdline/apt.cc
-#, fuzzy
-msgid "install packages"
-msgstr "ááááááâáááâáá¶áâáááá¶ááÂ á"
-
-#: cmdline/apt.cc
-#, fuzzy
-msgid "remove packages"
-msgstr "ááááááâáááâáá¶áâáá¼áâ"
-
-#: cmdline/apt.cc cmdline/apt-get.cc
-#, fuzzy
-msgid "Remove automatically all unused packages"
-msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâááá¡á¾âá"
-
-#. system wide stuff
-#: cmdline/apt.cc
-#, fuzzy
-msgid "update list of available packages"
-msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâááá¡á¾âá"
-
-#: cmdline/apt.cc
-msgid "upgrade the system by installing/upgrading packages"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "upgrade the system by removing/installing/upgrading packages"
-msgstr ""
-
-#. misc
-#: cmdline/apt.cc
-#, fuzzy
-msgid "edit the source information file"
-msgstr "ááááá¼áââáááááá¶áâááááá¶áâáá¼áâáááá¶"
-
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1287,6 +1175,11 @@ msgstr "ááâááááááâááá"
 msgid "Remove packages and config files"
 msgstr ""
 
+#: cmdline/apt-get.cc cmdline/apt.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâááá¡á¾âá"
+
 #: cmdline/apt-get.cc
 msgid "Distribution upgrade, see apt-get(8)"
 msgstr "áá¶áááááá¶áâáá¶áááá¢ááááá¾á áá¼ááá¾á apt-get(8)"
@@ -1344,6 +1237,7 @@ msgstr ""
 #: cmdline/apt-helper.cc
 msgid ""
 "Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"
@@ -1358,6 +1252,10 @@ msgstr ""
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
 msgstr ""
@@ -1458,6 +1356,62 @@ msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâ
 msgid "Print the list of package on hold"
 msgstr ""
 
+#: cmdline/apt.cc
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"
+msgstr ""
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "áááá»áâá¢á¶áâááááá¸âáááááá"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "ááááááâáááâáá¶áâáááá¶ááÂ á"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "ááááááâáááâáá¶áâáá¼áâ"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ááá»ááááâ %s áá¹áâáááá¼áâáá¶áâááá¡á¾âá"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "ááááá¼áââáááááá¶áâááááá¶áâáá¼áâáááá¶"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -1554,11 +1508,11 @@ msgstr "áá¶áâááááááá¶áâá¢ááá¸âá¢á¶áááá
 msgid "Unable to connect to %s:%s:"
 msgstr "áá·áâá¢á¶áâááááá¶ááâáááá¶ááââ %s %sÂ á"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/store.cc
 msgid "Failed to stat"
 msgstr "ááá¶áááâáááá»ááá¶áááááá"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/rred.cc methods/store.cc
 msgid "Failed to set modification time"
 msgstr "ááá¶ááááááá»ááá¶ááááááâááááááá¶âáá¶áááááááâ"
 
@@ -1712,6 +1666,21 @@ msgstr "áááá½áâ"
 msgid "Unable to invoke "
 msgstr "áá·áâá¢á¶áâá áâ "
 
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "âáá¶ááá½áâáááááââââá ááááááá¶âááá¶áá áááá¶áááá½á ááâááááá¹ááááá¼áâÂ á"
@@ -1726,18 +1695,16 @@ msgstr "ááá á»áâáá¶ááááá»áâÂ á á áááááá
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "áá·áâá¢á¶áâááááá·ááááá· '%s' áá¾áááá¸âááááááááá¶ááâá ááááááá¶ (áá¾ gnupg áááá¼áâáá¶áâááá¡á¾áâá¬ááÂ ?)"
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr ""
-
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "áá·ááááá¶ááááá á»á áááá»ááá¶áááááá·ááááá· apt-key"
 
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "á ááááááá¶âáá¶áâáááááâáá·áâáááá¹ááááá¼áÂ á\n"
@@ -1748,10 +1715,6 @@ msgid ""
 "available:\n"
 msgstr "á ááááááá¶âáá¶ááááááâáá·áâá¢á¶áááááááááá¶áááá¶áâááâ ááááááá¼áááâáá¶áá¶ááááá·áâá¢á¶áâáááá¾âáá¶áâÂ á\n"
 
-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr ""
-
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "ááá á»ááááá»ááá¶áâáááááâáááá¶ááâá¯ááá¶á"
@@ -1819,6 +1782,12 @@ msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ %s áá¶áá¡
 msgid "[Mirror: %s]"
 msgstr ""
 
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "áá¶áâááá¶áááâáááá»áâáá¶áááááá  %s"
+
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "ááá¶áááâáááá»áâáá¶áâááááá¾áâáááááâ IPC ááááá¶ááâáááá¾áâáá¶áâááâ"
@@ -1874,6 +1843,10 @@ msgstr ""
 msgid "Internal error"
 msgstr "ááá á»áâáá¶áâáááá»áâ"
 
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr ""
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "áá¶áâáááááâáááá¶áâáá¾áâáá·áâááá¢Â !"
@@ -1911,6 +1884,20 @@ msgstr "áááá¶ááá¾âáá¶áâáááâááºâáááá¶á
 msgid "Merging available information"
 msgstr "ááááá¼áââáááááá¶áâááááá¶áâáá¼áâáááá¶"
 
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "ááááá¶áááâ %s ááá»áááá âáá¶âáá·áâáááá¸ááá"
+
 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
 msgid ""
@@ -2114,11 +2101,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ DB áá¶ááá %s: %s"
 
-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr "áá¶áâááá¶áááâáááá»áâáá¶áááááá  %s"
-
 #: ftparchive/cachedb.cc
 #, fuzzy
 msgid "Failed to read .dsc"
@@ -2245,7 +2227,7 @@ msgstr "ááá¶áááâáááá»áâáá¶áâáá¾á %s"
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "áá¶áâááá¶áááâáááá»áâáá¶áâá¢á¶áâáááâ %s"
@@ -2434,50 +2416,6 @@ msgstr "áá¶áááááááâáááá½á áááá¶áááá
 msgid "Duplicate conf file %s/%s"
 msgstr "á¯ááá¶áâáááááâáááá¶ááááááááâáááá½áâ %s/%s"
 
-#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "áá¶áááááá¸âááâ %spartial ááºâáá¶áááááâÂ á"
-
-#: apt-pkg/acquire.cc
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ááâááááááá¶áâ %spartial ááºâáá¶áááááâÂ á"
-
-#: apt-pkg/acquire.cc
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "áá·áâá¢á¶áâáá¶ááâááâááâááááá¸áá¶áá¡á¾á"
-
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "No sandbox user '%s' on the system, can not drop privileges"
-msgstr ""
-
-#: apt-pkg/acquire.cc
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-pkg/acquire.cc apt-pkg/clean.cc
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "ááááááâá¯ááá¶áâáá·áá·ááááâ '%s' áá·ááááá¼áâáá¶áâáá¶ááááâ"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "áááá»áâááâááâá¯ááá¶á %li áá %li (ááááá %s)"
-
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "áááá»áâááááâá¯ááá¶á %li áá %li"
-
 #: apt-pkg/acquire-item.cc
 msgid ""
 "Updating from such a repository can't be done securely, and is therefore "
@@ -2496,16 +2434,51 @@ msgid ""
 "details."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "áááá¼áâáááááâáá¶áááá¶áááâ, %s (%s -> %s)Â á"
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "ááâ %s áááá¼ááá¶áâáááááá"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "ááâ %s áááá¼ááá¶áâáááááá"
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "ááâ %s áááá¼ááá¶áâáááááá"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "ááâ %s áááá¼ááá¶áâáááááá"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "ááâ %s áááá¼ááá¶áâáááááá"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum áá·áâáááá½ááááâ"
 
+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "áááá¼áâáááááâáá¶áááá¶áááâ, %s (%s -> %s)Â á"
+
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "ááá áâáá·ááá¶áâáááá½ááááâ"
@@ -2548,8 +2521,11 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "áááá¶áâáá¼áááâáá¶áá¶áááâá¢á¶áâááâáá¶áâáááá»ááá¼ááá IDs áá¶ááááááâáááááÂ á\n"
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
@@ -2566,33 +2542,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is not signed."
-msgstr "ááâ %s áááá¼ááá¶áâáááááá"
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr "ááâ %s áááá¼ááá¶áâáááááá"
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "ááâ %s áááá¼ááá¶áâáááááá"
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2640,6 +2589,50 @@ msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr "áá¼áâááááá¼áâáááá¶áâáá¸áâÂ á '%s' áááá»áâáááá¶áâ '%s' á á¾áâááááááâáá¼áÂ á"
 
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "áá¶áááááá¸âááâ %spartial ááºâáá¶áááááâÂ á"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "ááâááááááá¶áâ %spartial ááºâáá¶áááááâÂ á"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "áá·áâá¢á¶áâáá¶ááâááâááâááááá¸áá¶áá¡á¾á"
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "No sandbox user '%s' on the system, can not drop privileges"
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "ááááááâá¯ááá¶áâáá·áá·ááááâ '%s' áá·ááááá¼áâáá¶áâáá¶ááááâ"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "áááá»áâááâááâá¯ááá¶á %li áá %li (ááááá %s)"
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "áááá»áâááááâá¯ááá¶á %li áá %li"
+
 #: apt-pkg/algorithms.cc
 #, c-format
 msgid ""
@@ -2965,11 +2958,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "ááááá¶áááâ %s ááá»áááá âáá¶âáá·áâáááá¸ááá"
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -2996,14 +2984,8 @@ msgid "Problem closing the gzip file %s"
 msgstr "áá¶áâáááá á¶âáááá»ááá¶áâáá·áâá¯ááá¶á"
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file %s"
-msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ %s áá¶áá¡á¾á"
-
-#: apt-pkg/contrib/fileutl.cc
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "áá·áâá¢á¶áâáá¾áâáááá»áâááááá¶ááâ %s áá¶áá¡á¾á"
+msgid "Unexpected end of file"
+msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
@@ -3013,6 +2995,16 @@ msgstr "ááá¶áááâáááá»áâáá¶áâááááá¾áâ
 msgid "Failed to exec compressor "
 msgstr "ááá¶áááâáááá»áâáá¶áâááááá·ááááá·âáááááá·áá¸âáááá á¶áá "
 
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ %s áá¶áá¡á¾á"
+
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "áá·áâá¢á¶áâáá¾áâáááá»áâááááá¶ááâ %s áá¶áá¡á¾á"
+
 #: apt-pkg/contrib/fileutl.cc
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
@@ -3171,14 +3163,16 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "áá·áá¢á¶áâáááâá¯ááá¶ááááááá %s (1) áá¶áá¡á¾á"
+#, c-format
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
+msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "ááááá¶ááâááááá·ááááá¹ááááá¼áâáááááá»áâá¯ááá¶áâááááááÂ á %s"
+msgid "Invalid '%s' entry in Release file %s"
+msgstr "áá·áá¢á¶áâáááâá¯ááá¶ááááááá %s (1) áá¶áá¡á¾á"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc
@@ -3191,6 +3185,11 @@ msgstr ""
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 msgid "Unable to parse package file %s (%d)"
@@ -3256,7 +3255,7 @@ msgstr ""
 msgid "Directory '%s' missing"
 msgstr "áá¶áááááá¸âááâ %spartial ááºâáá¶áááááâÂ á"
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "áá·áâá¢á¶áâáá¾áâá¯ááá¶áâ %s áá¶áá¡á¾á"
@@ -3482,11 +3481,6 @@ msgstr "ââá¯ááá¶áâáááá¶ááâááááááâáá·
 msgid "The package cache file is an incompatible version"
 msgstr "á¯ááá¶áâáááá¶ááááááá¶ááââááááááâáá¶ááááâáá·áâáááá¼ááááá¶â"
 
-#: apt-pkg/pkgcache.cc
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "ââá¯ááá¶áâáááá¶ááâááááááâáá·áâáááá¹ááááá¼áâ"
-
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
@@ -3497,6 +3491,11 @@ msgstr "APT ááá áá·ááá¶ááááâááááááááâ
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "áááá¶ááâááááá¶ááâáááááááááá¼áâáá¶ááááá¶ááá¶áâááááá¶áááááá¶ááááááâáá»áâááááá¶ââ"
 
+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "ââá¯ááá¶áâáááá¶ááâááááááâáá·áâáááá¹ááááá¼áâ"
+
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "á¢á¶áááááâ"
@@ -3533,14 +3532,14 @@ msgstr ""
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc
-msgid "important"
-msgstr "áááá¶ááâ"
-
 #: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "áá¶áâáá¶ááá¶á"
 
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "áááá¶ááâ"
+
 #: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "áááá¼"
@@ -3662,14 +3661,9 @@ msgstr "á¢ááááááá¼ááááá¶áá 'ááááá' URIs á
 
 #: apt-pkg/tagfile.cc
 #, c-format
-msgid "Cannot convert %s to integer"
+msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "ááá¶áááâáááá»áâáá¶áâááâááááá¼áâááâ %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3682,6 +3676,58 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "áááá»áâáááá¶âáá¶áâáááá¾âá²ááâááááá¾á"
 
+#~ msgid "(not found)"
+#~ msgstr "(ááâáá·áâáá¾á)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "  áááá¶ááâááááááÂ á "
+
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr "áááá¶áâáá¼áááâáá¶áá¶áááâá¢á¶áâááâáá¶áâáááá»ááá¼ááá IDs áá¶ááááááâáááááÂ á\n"
+
+#, fuzzy
+#~ msgid "Invalid 'Valid-Until' entry in Release file %s"
+#~ msgstr "ááááá¶ááâááááá·ááááá¹ááááá¼áâáááááá»áâá¯ááá¶áâááááááÂ á %s"
+
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "ááâ %s áááá¼ááá¶áâáááááá"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %sÂ á áááááá %s ááááá¶áááá¡á¾á ááºáááá¸ááá"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "áá¶áá¢á¶ááááá %s ááááá¶áá %s áá·áá¢á¶áâááááá¼ááá·ááááá¶ááá ááááá áá·ááá¶áâááááâáááááááá %s áááá¢á¶áâ"
+#~ "ááááá¼ááá·áááâááááá¼ááá¶áâáááááá¶áá¡á¾á"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "%s áá¶áá¢áááááâááááá¶ááâ %s áá·áâá¢á¶áâáááá¾âá²ááâááááá·áááâ áááááâááââ %s ááááááâáá·áâáá¾áâÂ "
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "ááá¶áááâáááá»ááá¶áâááááá¼ááá·ááááá¶áá¢á¶ááááá %s ááááá¶áá %s: %s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "áá¶áá¢á¶áááááâáááâááááá¾áâ %s áá·áâá¢á¶áâáááááâááááááá¸âáááá¼ááá¶áâáá¶áâááÂ á"
+
 #~ msgid "Problem unlinking %s"
 #~ msgstr "áá¶ááááá á¶âáááá»ááá¶áâáááá¶ááááá %s"