X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4ad57118a8a0225b413de96dedc085e0594726a6..3465138575e1fd0d5892d9b6be1ae232eb873460:/po/km.po?ds=sidebyside

diff --git a/po/km.po b/po/km.po
index 5e856f4eb..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: 2016-04-25 15:24+0200\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
@@ -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:"
@@ -1672,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 "âáá¶ááá½áâáááááââââá ááááááá¶âááá¶áá áááá¶áááá½á ááâááááá¹ááááá¼áâÂ á"
@@ -1686,14 +1695,6 @@ 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"
@@ -1883,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 ""
@@ -2419,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 "ááá áâáá·ááá¶áâáááá½ááááâ"
@@ -2477,10 +2527,6 @@ msgid ""
 "weak security information for it"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "áááá¶áâáá¼áááâáá¶áá¶áááâá¢á¶áâááâáá¶áâáááá»ááá¼ááá IDs áá¶ááááááâáááááÂ á\n"
-
 #. 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
 #. the download progress display (e.g. 7d 3h 42min 1s)
@@ -2496,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 ""
@@ -2939,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."
@@ -3157,14 +3171,9 @@ msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid "Invalid '%s' entry in Release file %s"
 msgstr "áá·áá¢á¶áâáááâá¯ááá¶ááááááá %s (1) áá¶áá¡á¾á"
 
-#: apt-pkg/deb/debmetaindex.cc
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "ááááá¶ááâááááá·ááááá¹ááááá¼áâáááááá»áâá¯ááá¶áâááááááÂ á %s"
-
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
@@ -3176,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)"
@@ -3241,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 áá¶áá¡á¾á"
@@ -3650,11 +3664,6 @@ msgstr "á¢ááááááá¼ááááá¶áá 'ááááá' URIs á
 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 ""
@@ -3667,6 +3676,19 @@ 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 áááá¼ááá¶áâáááááá"