From 68225779d1337336707c33c0265fc537ae256813 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 18 Jan 2013 01:09:43 -0700 Subject: =?UTF-8?q?*=20Merge=20from=20Debian=20unstable,=20pulling=20in=20?= =?UTF-8?q?new=20translations=20and=20fixes.=20*=20Add=20linux-headers=20t?= =?UTF-8?q?o=20/etc/kernel/postinst.d/apt-auto-removal=20guard.=20*=20Cata?= =?UTF-8?q?lan=20(Jordi=20Mallach)=20*=20Drop=20a=20confusing=20non-breaki?= =?UTF-8?q?ng=20space.=20Closes:=20#691024=20*=20Thai=20(Theppitak=20Karoo?= =?UTF-8?q?nboonyanan).=20Closes:=20#691613=20*=20Vietnamese=20(Tr?= =?UTF-8?q?=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n).=20Closes:=20#693773=20*?= =?UTF-8?q?=20Fix=20Plural=20forms=20in=20German,=20French,=20Japanese=20a?= =?UTF-8?q?nd=20Portuguese=20=20=20translations.=20Thanks=20to=20Jakub=20W?= =?UTF-8?q?ilk=20for=20reporting=20these=20errors.=20*=20apt-pkg/packagema?= =?UTF-8?q?nager.cc:=20=20=20-=20do=20not=20do=20lock-step=20configuration?= =?UTF-8?q?=20for=20a=20M-A:same=20package=20if=20it=20isn't=20=20=20=20?= =?UTF-8?q?=20unpacked=20yet=20in=20SmartConfigure=20and=20do=20not=20unpa?= =?UTF-8?q?ck=20a=20M-A:same=20package=20=20=20=20=20again=20in=20SmartUnP?= =?UTF-8?q?ack=20if=20we=20have=20already=20configured=20it=20(LP:=20#1062?= =?UTF-8?q?503)=20*=20apt-pkg/depcache.cc:=20=20=20-=20don't=20call=20Mark?= =?UTF-8?q?Install=20with=20the=20FromUser=20flag=20set=20for=20packages?= =?UTF-8?q?=20=20=20=20=20which=20are=20dependencies=20of=20APT::Never-Mar?= =?UTF-8?q?kAuto-Sections=20matchers=20=20=20-=20no=20mode=20changes=20sho?= =?UTF-8?q?uld=20obviously=20be=20ok=20for=20pkgDepCache::IsModeChangeOk?= =?UTF-8?q?=20*=20cmdline/apt-get.cc:=20=20=20-=20do=20not=20call=20Mark{I?= =?UTF-8?q?nstall,Delete}=20from=20the=20autoremove=20code=20with=20=20=20?= =?UTF-8?q?=20=20the=20FromUser=20bit=20set=20to=20avoid=20modifying=20the?= =?UTF-8?q?=20auto-installed=20bit=20*=20apt-pkg/algorithms.cc:=20=20=20-?= =?UTF-8?q?=20ensure=20pkgProblemResolver=20calls=20MarkDelete=20without?= =?UTF-8?q?=20FromUser=20set=20=20=20=20=20so=20that=20it=20can't=20overru?= =?UTF-8?q?le=20holds=20and=20the=20protection=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) * apt-pkg/algorithms.cc: - fix package-pointer array memory leak in ResolveByKeepInternal() * Portuguese (Américo Monteiro) (Closes: #686975) * handle packages without a mandatory architecture (debian-policy §5.3) by introducing a pseudo-architecture 'none' so that the small group of users with these packages can get right of them without introducing too much hassle for other users (Closes: #686346) * merged the latest debian-sid fixes Correct fi translation for hash sum mismatches (lp:420403) --- doc/po/es.po | 64 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 16 deletions(-) (limited to 'doc/po/es.po') diff --git a/doc/po/es.po b/doc/po/es.po index 559f5659f..dc592186a 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-08-30 12:50+0300\n" +"POT-Creation-Date: 2012-10-15 09:49+0300\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -2334,8 +2334,8 @@ msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the archive-keyring package of your " -"distribution, e.g. the ubuntu-archive-keyring package in " -"Ubuntu." +"distribution, e.g. the debian-archive-keyring package in " +"Debian." msgstr "" "Actualiza el registro de claves local con el registro de claves del archivo " "y elimina del registro local las claves de archivo que ya no son válidas. El " @@ -2404,33 +2404,24 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: #: apt-key.8.xml:183 -#, fuzzy -#| msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" +msgid "/usr/share/keyrings/debian-archive-keyring.gpg" msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" #. type: Content of: #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." +msgid "Keyring of Debian archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "/usr/share/keyrings/debian-archive-removed-keys.gpg" msgid "" -"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" +"/usr/share/keyrings/debian-archive-removed-keys.gpg" msgstr "" "/usr/share/keyrings/debian-archive-removed-keys.gpg" #. type: Content of: #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." +msgid "Keyring of Debian archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: @@ -9790,3 +9781,44 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Esto utiliza los archivos del disco previamente obtenidos." + +#. type: Content of: +#: apt-key.8.xml:130 +msgid "" +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the archive-keyring package of your " +"distribution, e.g. the ubuntu-archive-keyring package in " +"Ubuntu." +msgstr "" +"Actualiza el registro de claves local con el registro de claves del archivo " +"y elimina del registro local las claves de archivo que ya no son válidas. El " +"registro de claves del archivo se encuentra en el paquete archive-" +"keyring de su distribución; esto es, el paquete debian-" +"archive-keyring en Debian." + +#. type: Content of: +#: apt-key.8.xml:183 +#, fuzzy +msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" +msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" + +#. type: Content of: +#: apt-key.8.xml:184 +#, fuzzy +msgid "Keyring of Ubuntu archive trusted keys." +msgstr "Registro de las claves de confianza del archivo de Debian." + +#. type: Content of: +#: apt-key.8.xml:187 +#, fuzzy +msgid "" +"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" +msgstr "" +"/usr/share/keyrings/debian-archive-removed-keys.gpg" + +#. type: Content of: +#: apt-key.8.xml:188 +#, fuzzy +msgid "Keyring of Ubuntu archive removed trusted keys." +msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." -- cgit v1.2.3