summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-06-01 11:44:49 +0000
committerintrigeri <intrigeri@boum.org>2016-06-01 11:44:49 +0000
commit1f487fbf434d9234b915aac9d76a6a5e146e1ee9 (patch)
tree42924d65f3ca863f5f27f5dc3c2568d5a8ccdd67
parent6d1c6d9b87757a3d35ceae6ee3814fcd29f5015c (diff)
parent404165b7e9c1d030c1f8fc20d33fcf2733c42c34 (diff)
Merge branch 'testing' into devel
-rw-r--r--auto/scripts/utils.sh2
-rw-r--r--config/chroot_local-includes/etc/X11/xorg.conf.d/qxl.conf6
-rw-r--r--wiki/src/about.de.po32
-rw-r--r--wiki/src/contribute/design.mdwn4
-rw-r--r--wiki/src/doc/about/features.de.po9
-rw-r--r--wiki/src/doc/about/license.de.po91
-rw-r--r--wiki/src/doc/about/openpgp_keys.de.po181
-rw-r--r--wiki/src/index.de.po28
8 files changed, 162 insertions, 191 deletions
diff --git a/auto/scripts/utils.sh b/auto/scripts/utils.sh
index cf0e8fa..d9ac18d 100644
--- a/auto/scripts/utils.sh
+++ b/auto/scripts/utils.sh
@@ -5,7 +5,7 @@ current_branch() {
}
on_a_tag() {
- ! git symbolic-ref HEAD >/dev/null 2>&1
+ git describe --tags --exact-match $(git rev-parse --verify HEAD 2>/dev/null) >/dev/null 2>/dev/null
}
base_branch() {
diff --git a/config/chroot_local-includes/etc/X11/xorg.conf.d/qxl.conf b/config/chroot_local-includes/etc/X11/xorg.conf.d/qxl.conf
new file mode 100644
index 0000000..d5faece
--- /dev/null
+++ b/config/chroot_local-includes/etc/X11/xorg.conf.d/qxl.conf
@@ -0,0 +1,6 @@
+# Workaround for #11500
+Section "Device"
+ Identifier "qxl"
+ Driver "qxl"
+ Option "ENABLE_SURFACES" "False"
+EndSection
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index faee635..3103078 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails i10n Team\n"
"POT-Creation-Date: 2016-04-29 13:53+0000\n"
-"PO-Revision-Date: 2016-03-14 13:51-0000\n"
+"PO-Revision-Date: 2016-05-30 16:00-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
"Language: de\n"
@@ -130,7 +130,7 @@ msgstr ""
"Tor ist ein offenes und verteiltes Netzwerk, das Ihnen dabei hilft, sich "
"gegen eine Form der Netzwerküberwachung zu wehren, die persönliche Freiheit "
"und Privatsphäre, vertrauliche Geschäftsbeziehungen, und die Sicherheit von "
-"Ländern gefährdet: die sogenannte »Verkehrsdatenanalyse«."
+"Staaten gefährdet: die sogenannte »Verkehrsdatenanalyse«."
#. type: Plain text
msgid ""
@@ -236,8 +236,8 @@ msgid ""
"[[Learn how to use I2P in Tails in the documentation.|doc/anonymous_internet/"
"i2p]]"
msgstr ""
-"[[Erfahren Sie mehr über die Verwendung von I2P in Tails in der "
-"Dokumentation.|doc/anonymous_internet/i2p]]"
+"[[Erfahren Sie in der Dokumentation mehr über die Verwendung von I2P in "
+"Tails.|doc/anonymous_internet/i2p]]"
#. type: Plain text
msgid ""
@@ -266,7 +266,7 @@ msgid ""
msgstr ""
"Die Benutzung von Tails auf einem Computer verändert weder das installierte "
"Betriebssystem, noch ist es von diesem abhängig. Es kann also gleichermaßen "
-"auf dem eigenen Computer, dem eines Freundes, oder einem Computer Ihrer "
+"auf dem eigenen Computer, dem einer Freundin, oder auf einem Computer Ihrer "
"örtlichen Bibliothek verwenden werden. Nachdem Sie Tails heruntergefahren "
"haben, kann der Computer wie gehabt mit seinem üblichen Betriebssystem "
"starten."
@@ -294,11 +294,11 @@ msgid ""
"explicitly save specific documents to another USB stick or external hard-"
"disk and take them away for future use."
msgstr ""
-"Dies erlaubt Ihnen auf jedem Computer an sensiblen Dokumenten zu arbeiten, "
+"Dies erlaubt Ihnen auf jedem Computer an sensiblen Dokumenten zu arbeiten "
"und schützt Sie vor Datenwiederherstellung nach dem Herunterfahren. "
"Natürlich können Sie weiterhin ausgewählte Dokumente und Dateien auf einem "
-"anderen USB-Stick oder einer externen Festplatte speichern, und für die "
-"zukünftige Nutzung mit sich nehmen."
+"anderen USB-Stick oder einer externen Festplatte speichern und für eine "
+"zukünftige Benutzung mitnehmen."
#. type: Plain text
#, no-wrap
@@ -381,7 +381,7 @@ msgid ""
"[[Read more about those tools in the documentation.|doc/"
"encryption_and_privacy]]"
msgstr ""
-"[[Erfahren Sie mehr über diese Werkzeuge in der Dokumentation.|doc/"
+"[[Erfahren Sie in der Dokumentation mehr über diese Werkzeuge.|doc/"
"encryption_and_privacy]]"
#. type: Title =
@@ -398,8 +398,8 @@ msgid ""
"the [[warning page|doc/about/warning]] to better understand the security "
"limitations of Tails and Tor,"
msgstr ""
-"die [[Warnungen|doc/about/warning]], um die Sicherheitsbeschränkungen von "
-"Tails und Tor besser zu verstehen,"
+"die [[Warnungen|doc/about/warning]], um die Grenzen der Sicherheit von Tails "
+"und Tor besser zu verstehen,"
#. type: Bullet: ' - '
msgid ""
@@ -413,6 +413,8 @@ msgstr ""
msgid ""
"our [[installation instructions|install]] to download and install Tails,"
msgstr ""
+"unsere [[Installationsanweisungen|install]] zum Herunterladen und "
+"Installieren von Tails,"
#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
@@ -447,7 +449,7 @@ msgstr "Presse und Medien\n"
#. type: Plain text
msgid "See [[Press and media information|press]]."
-msgstr "Sehen Sie die [[Medien- und Presseinformationen|press]]."
+msgstr "Lesen Sie die [[Medien- und Presseinformationen|press]]."
#. type: Title =
#, no-wrap
@@ -459,14 +461,14 @@ msgid ""
"See [[Acknowledgments and similar projects|doc/about/"
"acknowledgments_and_similar_projects]]."
msgstr ""
-"Sehen Sie die [[Danksagungen und ähnlichen Projekte|doc/about/"
+"Lesen Sie die [[Danksagungen und ähnlichen Projekte|doc/about/"
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, no-wrap
msgid "Contact\n"
-msgstr ""
+msgstr "Kontakt\n"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
-msgstr ""
+msgstr "Lesen Sie die [[Kontaktseite|about/contact]]."
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index cbfb137..57c9afd 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1012,10 +1012,8 @@ the Internet:
The remaining configuration differences can be found in:
- [[!tails_gitweb_dir config/chroot_local-includes/etc/tor-browser/preferences/0000tails.js]]
-- [[!tails_gitweb config/chroot_local-hooks/12-install_browser_searchplugins]]
-- [[!tails_gitweb config/chroot_local-hooks/12-remove_unwanted_browser_searchplugins]]
+- [[!tails_gitweb config/chroot_local-hooks/11-localize_browser]]
- [[!tails_gitweb config/chroot_local-hooks/13-override-tbb-branding]]
-- [[!tails_gitweb config/chroot_local-hooks/14-add_localized_browser_searchplugins]]
- [[!tails_gitweb config/chroot_local-hooks/14-generate-tor-browser-profile]]
- [[!tails_gitweb config/chroot_local-hooks/15-symlink-places.sqlite]]
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 80688d5..a32eec4 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails translations\n"
"POT-Creation-Date: 2016-04-29 13:53+0000\n"
-"PO-Revision-Date: 2016-03-28 15:03+0200\n"
+"PO-Revision-Date: 2016-05-30 15:57-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translations <tails-l10n@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -280,8 +280,9 @@ msgid ""
"directory](https://tails.boum.org/torrents/files/) (look for files with the "
"`.packages` extension)."
msgstr ""
-"Die gesamte Paketliste kann im [BitTorrent-Downloadverzeichnis](https://tails.boum.org/torrents/files/)"
-"gefunden werden (siehe Dateien mit der Endung `.packages`)"
+"Die gesamte Paketliste kann im [BitTorrent-Downloadverzeichnis](https://"
+"tails.boum.org/torrents/files/) gefunden werden (siehe Dateien mit der "
+"Endung `.packages`)"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/license.de.po b/wiki/src/doc/about/license.de.po
index c18148c..f977150 100644
--- a/wiki/src/doc/about/license.de.po
+++ b/wiki/src/doc/about/license.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
"POT-Creation-Date: 2016-04-29 13:53+0000\n"
-"PO-Revision-Date: 2015-05-16 22:27+0100\n"
+"PO-Revision-Date: 2016-05-30 16:49+0200\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
#. type: Plain text
#, no-wrap
@@ -26,23 +26,14 @@ msgid ""
"Tails is [[Free Software|doc/about/license]]: you can download, use, and "
"share it with no restrictions."
msgstr ""
+"Tails ist [[Freie Software|doc/about/license]]: Sie können es ohne "
+"Einschränkungen herunterladen, benutzen und verbreiten."
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
-#| "released under the GNU/GPL (version 3 or above)."
msgid "Tails is released under the GNU/GPL (version 3 or above)."
-msgstr ""
-"Tails ist [[Freie Software|http://www.gnu.org/philosophy/free-sw.html]], die "
-"unter der GNU General Public License (Version 3 oder höher) veröffentlicht "
-"wird."
+msgstr "Tails wird unter der GNU/GPL (Version 3 oder höher) veröffentlicht."
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "However, Tails includes non-free firmware in order to work on as many "
-#| "hardware as possible."
msgid ""
"However, Tails includes non-free firmware in order to work on as much "
"hardware as possible."
@@ -56,10 +47,6 @@ msgid "Website\n"
msgstr "Website\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This website uses several images with various copyright, licenses, "
-#| "trademarks and terms of distributions:"
msgid ""
"This website uses several images with distinct copyright, licenses, "
"trademarks and distribution terms:"
@@ -68,31 +55,7 @@ msgstr ""
"lizenz- oder markenrechtlich geschützt sind:"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-#| " Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-#| " Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-#| " Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-#| " Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-#| " Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-#| " Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#, no-wrap
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
@@ -135,20 +98,28 @@ msgstr ""
" - Icons von [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, von Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, von Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, von factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, von\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, von Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, von Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, von Cris Dobbins.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+" Creative Commons — Attribution, von Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+" Creative Commons — Attribution, von factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+" Public Domain, von Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]]:\n"
+" Creative Commons — Attribution, von Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+" Creative Commons — Attribution, von Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+" Creative Commons — Attribution, von Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, von Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+" Public Domain, von Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+" Creative Commons — Attribution, von Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+" Creative Commons — Attribution, von Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+" Creative Commons — Attribution, von Zech Nelson.\n"
#. type: Title =
#, no-wrap
@@ -156,16 +127,6 @@ msgid "Distribution of the source code\n"
msgstr "Verbreitung des Quellcodes\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Most of the software distributed with Tails is taken directly from "
-#| "upstream Debian packages, and is not modified or recompiled by Tails. "
-#| "Software that is modified or recompiled by Tails are available on [[our "
-#| "git repositories|/contribute/git]]. If you require or desire the sources "
-#| "for unmodified Debian upstream packages, retrieving them from Debian is "
-#| "the simplest solution to all parties (packages that can not be found in "
-#| "the regular Debian archive anymore can be found at <http://snapshot."
-#| "debian.org/>)."
msgid ""
"Most of the software distributed with Tails is taken directly from upstream "
"Debian packages, and is not modified or recompiled by Tails. Software that "
diff --git a/wiki/src/doc/about/openpgp_keys.de.po b/wiki/src/doc/about/openpgp_keys.de.po
index 0a0171e..b9057e7 100644
--- a/wiki/src/doc/about/openpgp_keys.de.po
+++ b/wiki/src/doc/about/openpgp_keys.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails Translators\n"
"POT-Creation-Date: 2016-04-29 17:43+0300\n"
-"PO-Revision-Date: 2015-05-28 20:20+0100\n"
+"PO-Revision-Date: 2016-05-30 15:56-0000\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translator <tails-l10n@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -23,7 +23,7 @@ msgstr "[[!meta title=\"OpenPGP Schlüssel\"]]\n"
#. type: Plain text
msgid "Tails developers maintain several OpenPGP key pairs."
-msgstr "Tails Entwickler verwenden mehrere OpenPGP Schlüsselpaare."
+msgstr "Entwickler von Tails verwenden mehrere OpenPGP Schlüsselpaare."
#. type: Plain text
#, no-wrap
@@ -31,17 +31,13 @@ msgid "<div class=\"caution\">\n"
msgstr "<div class=\"caution\">\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]\n"
-#| "that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
-#| "on the keyservers.</p>\n"
+#, no-wrap
msgid ""
"<p>Make sure to verify the keys that you download, because there are\n"
"several fake and maybe malicious Tails keys on the key servers.</p>\n"
msgstr ""
-"<p>Stellen Sie sicher, dass Sie den [[Schlüssel verifizieren|doc/get/trusting_tails_signing_key]],\n"
-"den Sie heruntergeladen haben, da es gefälschte (bösartige) Tails OpenPGP Schlüssel\n"
+"<p>Stellen Sie sicher, dass Sie die Schlüssel verifizieren, die Sie heruntergeladen haben,\n"
+"da es gefälschte und möglicherweise bösartige OpenPGP-Schlüssel von Tails\n"
"auf den Keyservern gibt.</p>\n"
#. type: Plain text
@@ -52,6 +48,10 @@ msgid ""
"you can verify our others keys as they are all certified by the Tails\n"
"signing key.</p>\n"
msgstr ""
+"<p>Wenn Sie beispielsweise zunächst [[den Signaturschlüssel von Tails\n"
+"mithilfe des OpenPGP Web of Trust authentifizieren|install/download/openpgp#wot]], können\n"
+"Sie anschließend unsere weiteren Schlüssel verifizieren, da alle durch den Signaturschlüssel\n"
+"von Tails beglaubigt sind.</p>\n"
#. type: Plain text
#, no-wrap
@@ -84,10 +84,6 @@ msgid "Encryption"
msgstr "Verschlüsselung"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This key has an encryption subkey. Please use it to encrypt email sent to "
-#| "the core developers encrypted mailing list: <tails@boum.org>."
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
"the core developers encrypted mailing list: [[tails@boum.org|about/"
@@ -95,7 +91,8 @@ msgid ""
msgstr ""
"Dieser Schlüssel hat einen Unterschlüssel für Verschlüsselung. Bitte nutzen "
"Sie ihn, um E-Mails zu verschlüsseln, die an die verschlüsselte Mailingliste "
-"der Kern-Entwickler, <tails@boum.org>, geschickt werden."
+"der Kern-Entwickler, [[tails@boum.org|about/contact#tails]], geschickt "
+"werden."
#. type: Title ###
#, no-wrap
@@ -112,9 +109,9 @@ msgid ""
"signed by a Tails core developer."
msgstr ""
"Dieser Schlüssel kann auch Signieren und Zertifizieren. Bis Tails 0.5 und "
-"0.6~rc3 wurden veröffentlichte Images mit diesem Schlüssel signiert. Dieser "
-"Gebrauch ist nun überholt: weitere Veröffentlichungen werden mit einem "
-"dedizierten, sichereren Signier-Schlüssel signiert. Seit dem 7. Oktober 2010 "
+"0.6~rc3 wurden veröffentlichte Images mit diesem Schlüssel signiert. Diese "
+"Verwendung ist nun hinfällig: weitere Veröffentlichungen werden mit einem "
+"dedizierten, sichereren Signaturschlüssel signiert. Seit dem 7. Oktober 2010 "
"bedeutet eine Signatur der Mailingliste nur mehr, dass die "
"Mailinglistensoftware überprüft hat, dass der signierte Inhalt ursprünglich "
"von einem Tails Kern-Entwickler signiert wurde."
@@ -132,7 +129,7 @@ msgid ""
msgstr ""
"Der private Schlüssel und seine Passphrase sind auf dem Server hinterlegt, "
"auf dem unsere verschlüsselte Mailinglistensoftware läuft sowie auf "
-"Systemen, die von Tails Kern-Entwicklern verwaltet werden."
+"Systemen, die von Kern-Entwicklern von Tails verwaltet werden."
#. type: Plain text
msgid ""
@@ -141,9 +138,9 @@ msgid ""
"running our encrypted mailing list, but still: this key pair is managed in a "
"less safe way than our signing key."
msgstr ""
-"Das heißt, dass Personen, die keine Tails Entwickler sind, die Möglichkeit "
-"haben, diesen privaten Schlüssel zu verwenden. Die Tails Entwickler "
-"vertrauen diesen Leuten genug, um unsere verschlüsselte Mailingliste bei "
+"Das heißt, dass Personen, die keine Tails-Entwickler sind, die Möglichkeit "
+"haben, diesen privaten Schlüssel zu verwenden. Die Tails-Entwickler "
+"vertrauen diesen Leuten genügend, um unsere verschlüsselte Mailingliste bei "
"ihnen laufen zu lassen, dennoch: dieses Schlüsselpaar wird weniger sicher "
"verwaltet als unser Schlüssel für Signaturen."
@@ -162,6 +159,12 @@ msgid ""
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
msgstr ""
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
+" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
+" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
+" uid Tails list (schleuder list) <tails-request@boum.org>\n"
+" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
#. type: Title -
#, no-wrap
@@ -171,7 +174,7 @@ msgstr "Wie komme ich an den öffentlichen Schlüssel?\n"
#. type: Plain text
msgid "There are multiple ways to get this OpenPGP public key:"
msgstr ""
-"Es gibt mehrere Möglichkeiten, um an den öffentlichen OpenPGP Schlüssel zu "
+"Es gibt mehrere Möglichkeiten, um an den öffentlichen OpenPGP-Schlüssel zu "
"kommen:"
#. type: Bullet: '- '
@@ -181,7 +184,7 @@ msgstr ""
#. type: Bullet: '- '
msgid "fetch it from your favourite keyserver"
-msgstr "laden Sie ihn von Ihrem präferierten Schlüsselserver herunter"
+msgstr "laden Sie ihn von Ihrem bevorzugten Schlüsselserver herunter"
#. type: Bullet: '- '
msgid "send an email to <tails-sendkey@boum.org>."
@@ -211,26 +214,22 @@ msgstr "Der einzige Zweck des Schlüssels ist:"
#. type: Bullet: '- '
msgid "to sign Tails released images;"
-msgstr "veröffentlichte Tails Images zu signieren;"
+msgstr "veröffentlichte Tails-Images zu signieren;"
#. type: Bullet: '- '
msgid ""
"to certify other cryptographic public keys needed for Tails development."
msgstr ""
"andere kryptographische Schlüssel, die für die Entwicklung von Tails "
-"gebraucht werden, zu signieren"
+"gebraucht werden, zu signieren."
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The secret key material will never be stored on an online server or on "
-#| "systems managed by anyone else than Tails core developers."
msgid ""
"The secret key material will never be stored on an online server or on "
"systems managed by anyone other than Tails core developers."
msgstr ""
-"Der private Schlüssel wird nie auf einem vernetzten Server oder auf "
-"Systemen, die von jemand anderem als Tails Kern-Entwicklern verwaltet "
+"Das private Schlüsselmaterial wird nie auf einem vernetzten Server oder auf "
+"Systemen, die von jemand anderem als Kern-Entwicklern von Tails verwaltet "
"werden, gespeichert."
#. type: Title ###
@@ -259,30 +258,24 @@ msgstr ""
"* wird nicht in einer verwendbaren Form bei einer Einzelperson aufbewahrt. Wurde\n"
" kryptographisch mit dem Programm\n"
" [gfshare](http://www.digital-scurf.org/software/libgfshare) geteilt.\n"
-"* wird nur offline, auf einem air-gapped Tails System benutzt, das nur mit der Außenwelt\n"
+"* wird nur offline, auf einem air-gapped Tails-System benutzt, das nur mit der Außenwelt\n"
" kommuniziert über:\n"
-" - Anschließen des Tails Flash Mediums in ein anderes Betriebssystem um Tails überhaupt\n"
+" - Anschließen des Speichermediums von Tails an ein anderes Betriebssystem, um Tails überhaupt\n"
" erst zu installieren.\n"
-" - Anschließen von anderen Wechseldatenträgern an das air-gapped Tails um öffentliche\n"
-" Schlüssel, Abschnitte von privaten Schlüsseln, Teile des geheimen Hauptsschlüssels, etc.\n"
-" an die Aussenwelt zu schicken.\n"
-" - Anschließen von anderen Wechseldatenträgern an das air-gapped Tails um Debianpakete,\n"
-" öffentliche Schlüssel, etc. von der Aussenwelt zu erhalten.\n"
+" - Anschließen von anderen Wechseldatenträgern an das air-gapped Tails, um öffentliche\n"
+" Schlüssel, Abschnitte von privaten Schlüsseln, Teile des geheimen Hauptschlüssels, etc.\n"
+" an die Außenwelt zu schicken.\n"
+" - Anschließen von anderen Wechseldatenträgern an das air-gapped Tails, um Debianpakete,\n"
+" öffentliche Schlüssel, usw. von der Außenwelt zu erhalten.\n"
"* läuft innerhalb eines Jahres ab. Wir werden das Ablaufdatum verlängern, so oft wir das\n"
" als vernünftig erachten.\n"
#. type: Title ###
#, no-wrap
msgid "Signing subkeys"
-msgstr "Signieren von Unterschlüsseln"
+msgstr "Unterschlüssel zum Signieren"
#. type: Bullet: '* '
-#, fuzzy
-#| msgid ""
-#| "Stored on OpenPGP smartcards owned by those who need it. Smartcards "
-#| "ensure that the cryptographic operations are done on the smartcard itself "
-#| "and that the secret cryptographic material is not directly available to "
-#| "the operating system using it."
msgid ""
"Stored on OpenPGP smartcards owned by those who need them. Smartcards "
"ensure that the cryptographic operations are done on the smartcard itself "
@@ -308,6 +301,11 @@ msgid ""
" sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
" sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
msgstr ""
+" pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
+" sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-signing.key]]"
@@ -316,16 +314,16 @@ msgstr ""
#. type: Bullet: ' - '
msgid "fetch it from your favourite keyserver."
-msgstr "laden Sie ihn von Ihrem präferierten Schlüsselserver herunter"
+msgstr "laden Sie ihn von Ihrem bevorzugten Schlüsselserver herunter"
#. type: Plain text
msgid ""
"If you already have Tails signing key but download it again, it can update "
"the list of existing signatures of the key."
msgstr ""
-"Falls Sie den Tails Signaturschlüssel schon haben, ihn jedoch noch einmal "
-"herunterladen, kann dadurch die Liste der existierenden Signaturen des "
-"Schlüssels erneuert werden."
+"Falls Sie den Signaturschlüssel von Tails schon haben, ihn jedoch noch "
+"einmal herunterladen, kann dadurch die Liste der existierenden Signaturen "
+"des Schlüssels erneuert werden."
#. type: Plain text
#, no-wrap
@@ -335,26 +333,22 @@ msgstr "<a id=\"support\"></a>\n"
#. type: Title =
#, no-wrap
msgid "User support key\n"
-msgstr "Benutzer-Support Schlüssel\n"
+msgstr "Schlüssel für Benutzer-Support\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "Use this key to encrypt private support requests sent to <tails-support-"
-#| "private@boum.org>."
msgid ""
"Use this key to encrypt private support requests sent to [[tails-support-"
"private@boum.org|about/contact#tails-support-private]]."
msgstr ""
-"Verwenden Sie diesen Schlüssel, um private Supportanfragen an <tails-support-"
-"private@boum.org> zu senden."
+"Verwenden Sie diesen Schlüssel, um private Supportanfragen an [[tails-"
+"support-private@boum.org|about/contact#tails-support-private]] zu senden."
#. type: Bullet: ' - '
msgid ""
"This same key is used to handle [[*WhisperBack* reports|first_steps/"
"bug_reporting]]."
msgstr ""
-"Derselbe Schlüssel wird verwendet, um [[*WhisperBack* Berichte|first_steps/"
+"Derselbe Schlüssel wird verwendet, um [[*WhisperBack*-Berichte|first_steps/"
"bug_reporting]] zu bearbeiten."
#. type: Plain text
@@ -368,6 +362,13 @@ msgid ""
" uid Tails private user support <tails-support-private@boum.org>\n"
" sub 4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]\n"
msgstr ""
+" pub 4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]\n"
+" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 3132\n"
+" uid Tails bug squad <tails-bugs@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-owner@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-request@boum.org>\n"
+" uid Tails private user support <tails-support-private@boum.org>\n"
+" sub 4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-bugs.key]]"
@@ -385,15 +386,12 @@ msgid "Press team key\n"
msgstr "Schlüssel des Presseteams\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "Use this key to encrypt private emails sent to <tails-press@boum.org>."
msgid ""
"Use this key to encrypt private emails sent to [[tails-press@boum.org|about/"
"contact#tails-press]]."
msgstr ""
-"Verwenden Sie diesen Schlüssel, um private E-Mails an <tails-press@boum.org> "
-"zu verschlüsseln."
+"Verwenden Sie diesen Schlüssel, um private E-Mails an [[tails-press@boum.org|"
+"about/contact#tails-press]] zu verschlüsseln."
#. type: Plain text
#, no-wrap
@@ -405,6 +403,12 @@ msgid ""
"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
msgstr ""
+" pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
+" Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
+"\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
+"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-press.key]]"
@@ -422,16 +426,12 @@ msgid "Accounting team key\n"
msgstr "Schlüssel des Verrechnungsteams\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "Use this key to encrypt private emails sent to <tails-accounting@boum."
-#| "org>."
msgid ""
"Use this key to encrypt private emails sent to [[tails-accounting@boum.org|"
"about/contact#tails-acccounting]]."
msgstr ""
-"Verwenden Sie diesen Schlüssel, um private E-Mails an <tails-accounting@boum."
-"org> zu verschlüsseln."
+"Verwenden Sie diesen Schlüssel, um private E-Mails an [[tails-"
+"accounting@boum.org|about/contact#tails-acccounting]] zu verschlüsseln."
#. type: Plain text
#, no-wrap
@@ -443,6 +443,12 @@ msgid ""
"\tuid Tails accounting team (schleuder list) <tails-accounting-owner@boum.org>\n"
"\tsub 4096R/0x289A5B45A9E89475 2014-07-11\n"
msgstr ""
+"\tpub 4096R/0xC436090F4BB47C6F 2014-07-11\n"
+"\tKey fingerprint = 256D EB90 7788 0CD6 8167 8528 C436 090F 4BB4 7C6F\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-request@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-owner@boum.org>\n"
+"\tsub 4096R/0x289A5B45A9E89475 2014-07-11\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-accounting.key]]"
@@ -451,10 +457,9 @@ msgstr ""
"key]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "<a id=\"press\"></a>\n"
+#, no-wrap
msgid "<a id=\"mirrors\"></a>\n"
-msgstr "<a id=\"press\"></a>\n"
+msgstr "<a id=\"mirrors\"></a>\n"
#. type: Plain text
#, no-wrap
@@ -462,17 +467,16 @@ msgid ""
"Mirrors team key\n"
"===================\n"
msgstr ""
+"Schlüssel des Mirror-Teams\n"
+"===================\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "Use this key to encrypt private emails sent to <tails-press@boum.org>."
msgid ""
"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
"about/contact#tails-mirrors]]."
msgstr ""
-"Verwenden Sie diesen Schlüssel, um private E-Mails an <tails-press@boum.org> "
-"zu verschlüsseln."
+"Verwenden Sie diesen Schlüssel, um private E-Mails an [[tails-mirrors@boum."
+"org|about/contact#tails-mirrors]] zu verschlüsseln."
#. type: Plain text
#, no-wrap
@@ -484,13 +488,17 @@ msgid ""
"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
msgstr ""
+"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
+"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
+"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid "download it from this website: [[!tails_website tails-press.key]]"
msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
msgstr ""
-"laden Sie ihn von der Website herunter: [[!tails_website tails-press.key]]"
+"laden Sie ihn von der Website herunter: [[!tails_website tails-mirrors.key]]"
#. type: Plain text
#, no-wrap
@@ -503,15 +511,12 @@ msgid "Sysadmins team key\n"
msgstr "Schlüssel des Sysadmin-Teams\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "Use this key to encrypt private emails sent to <tails-sysadmins@boum.org>."
msgid ""
"Use this key to encrypt private emails sent to [[tails-sysadmins@boum.org|"
"about/contact#tails-sysadmins]]."
msgstr ""
-"Verwenden Sie diesen Schlüssel, um private E-Mails an <tails-sysadmins@boum."
-"org> zu verschlüsseln."
+"Verwenden Sie diesen Schlüssel, um private E-Mails an [[tails-sysadmins@boum."
+"org|about/contact#tails-sysadmins]] zu verschlüsseln."
#. type: Plain text
#, no-wrap
@@ -523,6 +528,12 @@ msgid ""
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
msgstr ""
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
+" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
+" uid Tails system administrators <tails-sysadmins@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-sysadmins.key]]"
diff --git a/wiki/src/index.de.po b/wiki/src/index.de.po
index 86818e0..2c5778e 100644
--- a/wiki/src/index.de.po
+++ b/wiki/src/index.de.po
@@ -5,16 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2016-04-25 18:07+0000\n"
-"PO-Revision-Date: 2015-01-18 12:27+0100\n"
+"PO-Revision-Date: 2016-05-28 12:37-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translators <tails@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Content of: outside any tag (error?)
msgid "[[!meta title=\"Privacy for anyone anywhere\"]]"
@@ -73,21 +73,18 @@ msgstr "[[Erfahren Sie mehr über Tails.|about]]"
msgid "News"
msgstr "Aktuelles"
-#. On each release `n` of Tails 3.0, 4.0, etc. this list should be
+#. On each release `n` of Tails 3.0, 4.0, etc. this list should be
#. updated to include news/version_* and news/test_* for release `n-2`.
-#. Also update ikiwiki.setup, ikiwiki-cgi.setup, news.mdwn, and security.mdwn.
+#. Also update ikiwiki.setup, ikiwiki-cgi.setup, news.mdwn, and security.mdwn.
#. type: Content of: <div><div>
-#, fuzzy
-#| msgid ""
-#| "[[!inline pages=\"news/* and !news/*/* and !news/discussion and "
-#| "currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgid ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
"(currentlang() or news/report_2* or news/version_0* or news/test_0*)\" show="
"\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr ""
-"[[!inline pages=\"news/* and !news/*/* and !news/discussion and "
-"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
+"(currentlang() or news/report_2* or news/version_0* or news/test_0*)\" show="
+"\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[News]] for more."
@@ -98,18 +95,13 @@ msgid "Security"
msgstr "Sicherheit"
#. type: Content of: <div><div>
-#, fuzzy
-#| msgid ""
-#| "[[!inline pages=\"security/* and !security/audits and !security/audits.* "
-#| "and !security/audits/* and !security/*/* and !security/discussion and "
-#| "currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgid ""
"[[!inline pages=\"page(security/*) and !security/audits and !security/audits."
"* and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr ""
-"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
-"and !security/audits/* and !security/*/* and !security/discussion and "
+"[[!inline pages=\"page(security/*) and !security/audits and !security/audits."
+"* and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>