Commit 96e88158 authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/master' into devel

Conflicts:
	wiki/src/doc/about/warning.pt.po
parents 789ac14c 3a650c46
......@@ -110,3 +110,6 @@ Miscellaneous test results
* Boots fine from DVD on VirtualBox 4.3.10-dfsg-1~bpo70+1 (as of commit e0a3c64
in `feature/uefi`).
* Boots fine on Lenovo G700.
* Boots fine from DVD on Lenovo B570.
* Boots fine from DVD on Lenovo Z61t.
* Boots fine from DVD on HP Pavilion dm4-1150ca.
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-15 11:42+0200\n"
"POT-Creation-Date: 2014-05-27 15:17+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -180,6 +180,11 @@ msgstr ""
msgid "[[!img man-in-the-middle.png link=no alt=\"Illustration of a man-in-the-middle attack\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
msgstr ""
#. type: Plain text
msgid ""
"While using Tor, man-in-the-middle attacks can still happen between the exit "
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-15 11:42+0200\n"
"POT-Creation-Date: 2014-05-27 15:17+0300\n"
"PO-Revision-Date: 2014-04-15 12:13+0200\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -213,6 +213,11 @@ msgstr ""
msgid "[[!img man-in-the-middle.png link=no alt=\"Illustration of a man-in-the-middle attack\"]]\n"
msgstr "[[!img man-in-the-middle.png link=no alt=\"Illustration d'une attaque de l'homme du milieu\"]]\n"
#. type: Plain text
#, no-wrap
msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
msgstr ""
#. type: Plain text
msgid ""
"While using Tor, man-in-the-middle attacks can still happen between the exit "
......@@ -661,7 +666,11 @@ msgid ""
"Tails, as well as all the software it includes, are on continuous "
"development and might contain programming errors or security holes. [[Stay "
"tuned|download#stay_tuned]] to Tails development."
msgstr "Tails, de même que tous les logiciels qu'il contient, sont continuellement en développement et peuvent contenir des erreurs de programmation ou des trous de sécurité. [[Gardez un œil|download#stay_tuned]] sur le développement de Tails."
msgstr ""
"Tails, de même que tous les logiciels qu'il contient, sont continuellement "
"en développement et peuvent contenir des erreurs de programmation ou des "
"trous de sécurité. [[Gardez un œil|download#stay_tuned]] sur le "
"développement de Tails."
#~ msgid ""
#~ "**Your ISP or your local network administrator** can easily check that "
......
......@@ -76,6 +76,7 @@ over a private connection, when in fact the entire conversation is controlled by
the attacker.
[[!img man-in-the-middle.png link=no alt="Illustration of a man-in-the-middle attack"]]
<!-- Source: wiki/lib/man-in-the-middle.svg -->
While using Tor, man-in-the-middle attacks can still happen between the exit
node and the destination server. The exit node itself can also act as a
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-05-26 12:14+0200\n"
"POT-Creation-Date: 2014-05-27 15:17+0300\n"
"PO-Revision-Date: 2014-05-23 11:53-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -205,6 +205,11 @@ msgstr ""
msgid "[[!img man-in-the-middle.png link=no alt=\"Illustration of a man-in-the-middle attack\"]]\n"
msgstr "[[!img man-in-the-middle.png link=no alt=\"Ilustração de um ataque man-in-the-middle\"]]\n"
#. type: Plain text
#, no-wrap
msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
msgstr ""
#. type: Plain text
msgid ""
"While using Tor, man-in-the-middle attacks can still happen between the exit "
......
......@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-15 12:14+0300\n"
"PO-Revision-Date: 2014-01-09 21:28+0100\n"
"PO-Revision-Date: 2014-05-24 20:31+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
......@@ -31,17 +31,17 @@ msgid ""
"and maybe start answering your questions. It contains:"
msgstr ""
"Lesen Sie bitte die [[offizielle Dokumentation|doc]], um mehr über Tails zu "
"lernen und vielleicht einige Ihrer Fragen zu beantworten. Diese enthält:"
"erfahren und vielleicht einige Ihrer Fragen zu beantworten. Diese enthält:"
#. type: Bullet: ' - '
msgid "General information about what Tails is"
msgstr "Allgemeine Informationen dazu, was Tails ist"
msgstr "Allgemeine Informationen, was Tails ist"
#. type: Bullet: ' - '
msgid ""
"Information to understand how it can help you and what its limitations are"
msgstr ""
"Informationen wie Tails Ihnen helfen kann und worin seine Beschränkungen "
"Informationen, wie Tails Ihnen helfen kann und worin seine Beschränkungen "
"liegen"
#. type: Bullet: ' - '
......@@ -55,91 +55,97 @@ msgstr "[[Besuchen Sie die Tails Dokumentation|doc]]"
#. type: Title =
#, no-wrap
msgid "Frequently asked questions\n"
msgstr ""
msgstr "Häufig gestellte Fragen\n"
#. type: Plain text
msgid "Search our list of [[frequently asked questions|faq]]."
msgstr ""
msgstr "Durchsuchen Sie unsere Liste [[häufig gestellter Fragen|faq]]."
#. type: Title =
#, no-wrap
msgid "Upgrade\n"
msgstr ""
msgstr "Aktualisieren\n"
#. type: Plain text
msgid ""
"Make sure you are using the latest version, as [[upgrading|doc/first_steps/"
"upgrade]] might solve your problem."
msgstr ""
"Solltest du sicher gehen, die neueste Version zu verwenden. Ein [[Upgrade|"
"doc/upgrade]] könnte dein Problem lösen."
"Sie sollten überprüfen, ob Sie die neueste Version verwenden. Eine "
"[[Aktualisierung|doc/upgrade]] könnte Ihr Problem lösen."
#. type: Title =
#, no-wrap
msgid "Check if the problem is already known\n"
msgstr ""
msgstr "Prüfen Sie, ob das Problem schon bekannt ist\n"
#. type: Plain text
msgid "You can have a look at:"
msgstr ""
msgstr "Lesen Sie bitte:"
#. type: Bullet: ' - '
msgid "The [[list of known issues|support/known_issues]]"
msgstr ""
msgstr "Die [[Liste bekannter Probleme|support/known_issues]]"
#. type: Bullet: ' - '
msgid "The [[list of things to do|todo]]"
msgstr ""
msgstr "Die [[Todo-Liste|todo]]"
#. type: Bullet: ' - '
msgid ""
"The [list of things that will be in the next release](https://labs.riseup."
"net/code/projects/tails/issues?query_id=111)"
msgstr ""
"Die [Liste der Dinge, die im nächsten Release enthalten sein werden](https://"
"labs.riseup.net/code/projects/tails/issues?query_id=111)"
#. type: Plain text
#, no-wrap
msgid "<div id=\"page-found_a_problem\">\n"
msgstr ""
msgstr "<div id=\"page-found_a_problem\">\n"
#. type: Plain text
#, no-wrap
msgid "<div id=\"bugs\">\n"
msgstr ""
msgstr "<div id=\"bugs\">\n"
#. type: Plain text
#, no-wrap
msgid " <h1>Report an error</h1>\n"
msgstr ""
msgstr " <h1>Einen Fehler melden</h1>\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
msgid ""
" <p>If you are facing an error in Tails, please follow the [[bug reporting\n"
" guidelines|doc/first_steps/bug_reporting]].</p>\n"
msgstr "Wenn du einen Bug in <em>Tails</em> gefunden hast, dann lies bitte die [[Bugreport-Richtlinien|doc/first_steps/bug_reporting]] und beschreibe den von dir entdeckten Fehler auf der [[Bugreport-Seite|bugs]]."
msgstr ""
" <p>Sollten Sie einen Bug in <em>Tails</em> gefunden haben,\n"
" befolgen Sie bitte unsere [[Bugreport-Richtlinien|doc/first_steps/bug_reporting]].</p>\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
msgid ""
" <p>If Tails does not start, please see our specific\n"
" [[reporting guidelines|doc/first_steps/bug_reporting/tails_does_not_start]].</p>\n"
msgstr "Wenn du einen Bug in <em>Tails</em> gefunden hast, dann lies bitte die [[Bugreport-Richtlinien|doc/first_steps/bug_reporting]] und beschreibe den von dir entdeckten Fehler auf der [[Bugreport-Seite|bugs]]."
msgstr ""
" <p>Sollte Tails nicht starten, beachten Sie bitte unsere spezifischen\n"
" [[Richtlinien für Fehlermeldungen|doc/first_steps/bug_reporting/tails_does_not_start]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #bugs -->\n"
msgstr ""
msgstr "</div> <!-- #bugs -->\n"
#. type: Plain text
#, no-wrap
msgid "<div id=\"wishlist\">\n"
msgstr ""
msgstr "<div id=\"wishlist\">\n"
#. type: Plain text
#, no-wrap
msgid " <h1>Request a feature</h1>\n"
msgstr ""
msgstr " <h1>Ein Feature anfragen</h1>\n"
#. type: Plain text
#, no-wrap
......@@ -148,21 +154,24 @@ msgid ""
" search the [[!tails_redmine desc=\"open tickets in Redmine\"]] first,\n"
" and file a new ticket in there if no existing one matches your needs.\n"
msgstr ""
" Falls Sie ein neues Feature in Tails sehen möchten,\n"
" durchsuchen Sie bitte die [[!tails_redmine desc=\"offenen Tickets in Redmine\"]],\n"
" und legen Sie erst ein neues Ticket an, wenn kein anderes Ihren Anforderungen entspricht.\n"
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #wishlist -->\n"
msgstr ""
msgstr "</div> <!-- #wishlist -->\n"
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #page-found_a_problem -->\n"
msgstr ""
msgstr "</div> <!-- #page-found_a_problem -->\n"
#. type: Plain text
#, no-wrap
msgid "<div id=\"talk\">\n"
msgstr ""
msgstr "<div id=\"talk\">\n"
#. type: Plain text
#, no-wrap
......@@ -177,7 +186,7 @@ msgstr " [[!inline pages=\"support/talk.de\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #talk -->\n"
msgstr ""
msgstr "</div> <!-- #talk -->\n"
#~ msgid "How-tos on getting Tails to work"
#~ msgstr "Anleitungen, um Tails zum Laufen zu bekommen"
......
......@@ -3,34 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-05 04:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2014-05-25 11:05+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: outside any tag (error?)
msgid "[[!meta title=\"Get in touch with us\"]]"
msgstr ""
msgstr "[[!meta title=\"Kontakt mit uns aufnehmen\"]]"
#. type: Content of: <div><h3>
msgid "Support list"
msgstr ""
msgstr "Benutzer-Support"
#. type: Content of: <div>
msgid "[[!img lib/forum.png link=no]]"
msgstr ""
msgstr "[[!img lib/forum.png link=no]]"
#. type: Content of: <div><p>
msgid "Subscribe to our [[user support mailing list|tails-support]]."
msgstr ""
msgstr "Unsere [[Benutzer-Support Mailingliste|tails-support]] abonnieren."
#. type: Content of: <div><p>
msgid ""
......@@ -39,37 +38,40 @@ msgid ""
"if possible use Tails or the [[Tor Browser Bundle|https://torproject.org/"
"torbrowser/]] to hide your IP address."
msgstr ""
"Dies ist eine öffentliche Mailingliste, <strong>seien Sie also vorsichtig "
"mit dem was Sie senden</strong>. Teilen Sie nur die nötigsten Informationen "
"über sich selbst mit, und nutzen Sie möglichst Tails oder das [[Tor Browser "
"Bundle|https://torproject.org/torbrowser/]] um Ihre IP-Addresse zu "
"verstecken."
#. type: Content of: <div><h3>
msgid "Chat"
msgstr ""
msgstr "Chat"
#. type: Content of: <div>
msgid "[[!img lib/chat.png link=no]]"
msgstr ""
msgstr "[[!img lib/chat.png link=no]]"
#. type: Content of: <div><p>
#, fuzzy
#| msgid "If you want to talk to Tails developers or users:"
msgid "Join our IRC channel to chat with contributors and users."
msgstr ""
"Wenn du mit den Tails-Entwicklern und -Benutzern sprechen möchtest, dann..."
"Besuchen Sie unseren IRC-Kanal, um mit Nutzern und Mitwirkenden zu chatten."
#. type: Content of: <div><ul><li>
msgid "server: <code>irc.oftc.net</code>"
msgstr ""
msgstr "Server: <code>irc.oftc.net</code>"
#. type: Content of: <div><ul><li>
msgid "port: <code>6697</code>"
msgstr ""
msgstr "Port: <code>6697</code>"
#. type: Content of: <div><ul><li>
msgid "chatroom: <code>#tails</code>"
msgstr ""
msgstr "Chatraum: <code>#tails</code>"
#. type: Content of: <div><ul><li>
msgid "use TLS/SSL to connect!"
msgstr ""
msgstr "Verwenden Sie eine TLS/SSL-Verbindung!"
#. type: Content of: <div><p>
msgid ""
......@@ -77,52 +79,32 @@ msgid ""
"pidgin]]. Else, you can use [[Pidgin|http://www.pidgin.im/]], an Instant "
"Messaging client for Windows, GNU/Linux and Mac OS X."
msgstr ""
"Sollten Sie Tails nutzen, lesen Sie bitte [[die Chat-Dokumentation|doc/"
"anonymous_internet/pidgin]]. Anderenfalls können Sie [[Pidgin|http://www."
"pidgin.im/]] nutzen, ein Programm zum Nachrichtensofortversand für Windows, "
"GNU/Linux und Mac OS X."
#. type: Content of: <div><h3>
msgid "Email"
msgstr ""
msgstr "E-Mail"
#. type: Content of: <div>
msgid "[[!img lib/email.png link=no]]"
msgstr ""
msgstr "[[!img lib/email.png link=no]]"
#. type: Content of: <div><p>
msgid "Mail us on our private mailing list:"
msgstr ""
msgstr "Senden Sie eine E-Mail an unsere interne Mailingliste:"
#. type: Content of: <div><p>
msgid "[[tails@boum.org|mailto:tails@boum.org]]"
msgstr ""
msgstr "[[tails@boum.org|mailto:tails@boum.org]]"
#. type: Content of: <div><p>
msgid ""
"Encrypting your emails with our [[OpenPGP key|doc/about/openpgp_keys]] is "
"the only way to achieve end-to-end encryption."
msgstr ""
#, fuzzy
#~| msgid ""
#~| "the [[forum]] is open for discussions that <strong>do not</strong> "
#~| "belong to bugs, feature requests and the like;"
#~ msgid ""
#~ "The [[forum]] is open for discussions that <strong>do not</strong> belong "
#~ "to bugs, feature requests and the like."
#~ msgstr ""
#~ "...am [[Forum|forum]] teilnehmen, das offen für Diskussionen ist. Bitte "
#~ "<strong>keine</strong> Beiträge über Bugs, Wünsche oder dergleichen - "
#~ "dafür gibt es das Bugreport-System und die Wunschliste;"
#~ msgid "you may want to join our [[chatroom|chat]];"
#~ msgstr "...kannst du dich in den [[Chatraum|chat]] einloggen;"
#~ msgid ""
#~ "you can send email to the private development mailing list: <a "
#~ "href='mailto:amnesia@boum.org'>amnesia@boum.org</a>; encrypting such "
#~ "email with our [[OpenPGP key|doc/about/openpgp_keys]] is the only way to "
#~ "achieve end-to-end encryption."
#~ msgstr ""
#~ "...eine Mail an die nichtöffentliche Mailingliste der Entwickler senden: "
#~ "<a href='mailto:amnesia@boum.org'>amnesia@boum.org</a>; die "
#~ "Verschlüsselung seiner solchen Mail mit unserem [[OpenPGP key|doc/about/"
#~ "openpgp_keys]] is die einzige Möglichkeit für eine durchgängige "
#~ "Verschlüsselung."
"Um verschlüsselte E-Mails zu senden, nutzen Sie bitte unseren [[OpenPGP-"
"Schlüssel|doc/about/openpgp_keys]]. Dies ist die einzige Möglichkeit, Ende-"
"zu-Ende-Verschlüsselung zu erreichen."
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment