summaryrefslogtreecommitdiff
path: root/po/gl.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
committerMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
commiteccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch)
treed539d21c6716af3122edabae91feadccfb3c12ad /po/gl.po
parent2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff)
parentb7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'po/gl.po')
-rw-r--r--po/gl.po36
1 files changed, 17 insertions, 19 deletions
diff --git a/po/gl.po b/po/gl.po
index 66226393f..25e24dbcf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:43+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -163,7 +163,7 @@ msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -1737,12 +1737,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Mesturando a información sobre paquetes dispoñíbeis"
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s non é un paquete DEB válido."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1767,12 +1762,12 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Non é posíbel escribir en %s"
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
@@ -2150,23 +2145,23 @@ msgstr ""
" -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
"tmp\n"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
msgid "Failed to create pipes"
msgstr "Non foi posíbel crear as canles"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
msgid "Failed to exec gzip "
msgstr "Non foi posíbel executar gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
msgid "Corrupted archive"
msgstr "Arquivo danado"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
msgid "Tar checksum failed, archive corrupted"
msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
@@ -2289,18 +2284,18 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
msgid "Unable to stat %s"
msgstr "Non é posíbel determinar o estado %s"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
msgid "Unparsable control file"
msgstr "Ficheiro de control non analizábel"
@@ -3573,6 +3568,9 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s non é un paquete DEB válido."
+
#~ msgid ""
#~ "Using CD-ROM mount point %s\n"
#~ "Mounting CD-ROM\n"