From 46e39c8e14dc98045107cfb38af8cecb8a4773b0 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Jan 2010 22:28:49 +0100
Subject: * French manpage translation update

* spot & fix various typos in all manpages
* German manpage translation update
* cmdline/apt-cache.cc:
  - remove translatable marker from the "%4i %s\n" string
* buildlib/po4a_manpage.mak:
  - instruct debiandoc to build files with utf-8 encoding
* buildlib/tools.m4:
  - fix some warning from the buildtools
* apt-pkg/acquire-item.cc:
  - add configuration PDiffs::Limit-options to not download
    too many or too big patches (Closes: #554349)
* debian/control:
  - let all packages depend on ${misc:Depends}
* share/*-archive.gpg:
  - remove the horrible outdated files. We already depend on
    the keyring so we don't need to ship our own version
* cmdline/apt-key:
  - errors out if wget is not installed (Closes: #545754)
  - add --keyring option as we have now possibly many
* methods/gpgv.cc:
  - pass all keyrings (TrustedParts) to gpgv instead of
    using only one trusted.gpg keyring (Closes: #304846)
* methods/https.cc:
  - finally merge the rest of the patchset from Arnaud Ebalard
    with the CRL and Issuers options, thanks! (Closes: #485963)
---
 doc/apt.ent | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc/apt.ent')

diff --git a/doc/apt.ent b/doc/apt.ent
index 0b341ec14..da43d8f3d 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -353,3 +353,16 @@
      Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
      </varlistentry>
 ">
+
+<!ENTITY file-trustedgpg "
+     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+     <listitem><para>Keyring of local trusted keys, new keys will be added here.
+     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>
+     <listitem><para>File fragments for the trusted keys, additional keyrings can
+     be stored here (by other packages or the administrator).
+     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
+     </varlistentry>
+">
-- 
cgit v1.2.3


From b39c18596d05cea1b3c0f0445b17080e9a2e4c19 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Sat, 23 Jan 2010 00:37:21 +0100
Subject: * apt-pkg/contrib/fileutl.cc:   - Fix the newly introduced method
 GetListOfFilesInDir to not     accept every file if no extension is enforced 
    (= restore old behaviour). (Closes: #565213) * apt-pkg/policy.cc:   -
 accept also partfiles with "pref" file extension as valid *
 apt-pkg/contrib/configuration.cc:   - accept also partfiles with "conf" file
 extension as valid * doc/apt.conf.5.xml:   - reorder description and split
 out syntax   - add partfile name convention (Closes: #558348) *
 doc/apt_preferences.conf.5.xml:   - describe partfile name convention also
 here * apt-pkg/deb/dpkgpm.cc:   - don't segfault if term.log file can't be
 opened.     Thanks Sam Brightman for the patch! (Closes: #475770) * doc/*:  
 - replace the per language addendum with a global addendum   - add a
 explanation why translations include (maybe) english     parts to the new
 global addendum (Closes: #561636) * apt-pkg/contrib/strutl.cc:   - fix malloc
 asseration fail with ja_JP.eucJP locale in     apt-cache search. Thanks
 Kusanagi Kouichi! (Closes: #548884)

---
 doc/apt.ent | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'doc/apt.ent')

diff --git a/doc/apt.ent b/doc/apt.ent
index da43d8f3d..c23d906e2 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -366,3 +366,22 @@
      Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
      </varlistentry>
 ">
+
+<!ENTITY translation-title "TRANSLATION">
+
+<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed
+     to the translation in the past, who is responsible now and maybe further information
+     specially related to your translation. -->
+<!ENTITY translation-holder "
+     The english translation was done by John Doe <email>john@doe.org</email> in 2009,
+     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the
+     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.
+">
+
+<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings
+     in a shipped manpage will maybe appear english parts. -->
+<!ENTITY translation-english "
+     Note that this translated document may contain untranslated parts.
+     This is done on purpose, to avoid losing content when the
+     translation is lagging behind the original content.
+">
-- 
cgit v1.2.3