summaryrefslogtreecommitdiff
path: root/doc/po/de.po
diff options
context:
space:
mode:
authorAdam Conrad <adconrad@0c3.net>2013-01-18 01:09:43 -0700
committerAdam Conrad <adconrad@0c3.net>2013-01-18 01:09:43 -0700
commit68225779d1337336707c33c0265fc537ae256813 (patch)
tree6c4174f63b3014622f5b6132890846f5d47f1c29 /doc/po/de.po
parent0dbd03a21542c03b0d9769787c8f794a697f3097 (diff)
* Merge from Debian unstable, pulling in new translations and fixes.
* Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard. * Catalan (Jordi Mallach) * Drop a confusing non-breaking space. Closes: #691024 * Thai (Theppitak Karoonboonyanan). Closes: #691613 * Vietnamese (Trần Ngọc Quân). Closes: #693773 * Fix Plural forms in German, French, Japanese and Portuguese translations. Thanks to Jakub Wilk for reporting these errors. * apt-pkg/packagemanager.cc: - do not do lock-step configuration for a M-A:same package if it isn't unpacked yet in SmartConfigure and do not unpack a M-A:same package again in SmartUnPack if we have already configured it (LP: #1062503) * apt-pkg/depcache.cc: - don't call MarkInstall with the FromUser flag set for packages which are dependencies of APT::Never-MarkAuto-Sections matchers - no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk * cmdline/apt-get.cc: - do not call Mark{Install,Delete} from the autoremove code with the FromUser bit set to avoid modifying the auto-installed bit * apt-pkg/algorithms.cc: - ensure pkgProblemResolver calls MarkDelete without FromUser set so that it can't overrule holds and the protection flag * 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)
Diffstat (limited to 'doc/po/de.po')
-rw-r--r--doc/po/de.po73
1 files changed, 50 insertions, 23 deletions
diff --git a/doc/po/de.po b/doc/po/de.po
index 994b46a30..34baba9e4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\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-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2261,19 +2261,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
-#, fuzzy
-#| 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 <literal>archive-keyring</literal> package of "
-#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
-#| "package in Debian."
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 <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
msgstr ""
"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
@@ -2342,33 +2335,24 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-#, fuzzy
-#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-#, fuzzy
-#| msgid ""
-#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
@@ -9814,3 +9798,46 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:130
+#, fuzzy
+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 <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
+"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
+"Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-"
+"keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
+"<literal>debian-archive-keyring</literal> in Debian."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:183
+#, fuzzy
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:184
+#, fuzzy
+msgid "Keyring of Ubuntu archive trusted keys."
+msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:187
+#, fuzzy
+msgid ""
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+msgstr ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:188
+#, fuzzy
+msgid "Keyring of Ubuntu archive removed trusted keys."
+msgstr ""
+"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"