zh_CN.po: update simplified chinese translation

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index d7b6e709a9efce307aad322bba297d7b289fe8c1..c03e5b5a5848297b7acd76c56675686e16e8760c 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,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-11 17:24+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -755,10 +755,6 @@ msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(heb ganfod)"
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -777,11 +773,6 @@ msgstr "  Ymgeisydd: "
 msgid "(none)"
 msgstr "(dim)"
 
-#: apt-private/private-show.cc
-#, fuzzy
-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 #, fuzzy
@@ -1710,6 +1701,21 @@ msgstr "Ymholiad"
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
+#. 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 ""
@@ -1723,14 +1729,6 @@ msgstr ""
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 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 ""
-
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr ""
@@ -1930,6 +1928,20 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
+#: 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
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
+
 # FIXME: "debian"
 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
@@ -2475,16 +2487,16 @@ msgid ""
 "details."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
 #: apt-pkg/acquire-item.cc
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
+
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
@@ -2533,10 +2545,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 ""
-
 #. 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)
@@ -3009,11 +3017,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
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3245,6 +3248,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)"
@@ -3310,7 +3318,7 @@ msgstr ""
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
@@ -3745,6 +3753,13 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Yn Cyfrifo'r Uwchraddiad"
 
+#~ msgid "(not found)"
+#~ msgstr "(heb ganfod)"
+
+#, fuzzy
+#~ msgid "  Package pin: "
+#~ msgstr "  Pin Pecyn: "
+
 #, fuzzy
 #~ msgid "The repository is insufficiently signed by key %s (%s)"
 #~ msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"