commit 9a1d8fbc262863a3677b7a7be2016d2748726076
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Sep 1 17:46:30 2013 +0000
Update translations for tails-persistence-setup_completed
---
de/de.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/de/de.po b/de/de.po
index bc97dc0..03645df 100644
--- a/de/de.po
+++ b/de/de.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2013-08-01 16:49+0200\n"
-"PO-Revision-Date: 2013-09-01 17:15+0000\n"
+"PO-Revision-Date: 2013-09-01 17:30+0000\n"
"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr "Dotfiles"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
msgid ""
"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Alle Dateien und Verzeichnisse, die sich im 'dotfiles' Verzeichnis befinden, nach $HOME symlinken"
+msgstr "Alle Dateien und Verzeichnisse, die sich im 'dotfiles' Verzeichnis befinden, nach $HOME verlinken"
#: ../lib/Tails/Persistence/Setup.pm:257
msgid ""
@@ -143,7 +143,7 @@ msgstr "Der Persistenzbereich kann nicht während der Benutzung gelöscht werden
#: ../lib/Tails/Persistence/Setup.pm:461
msgid "Persistence volume is not unlocked."
-msgstr "Persistenzbereich ist nicht unverschlossen"
+msgstr "Persistenzbereich ist nicht freigegeben"
#: ../lib/Tails/Persistence/Setup.pm:466
msgid "Persistence volume is not mounted."
@@ -155,7 +155,7 @@ msgstr "Persistenzbereich ist nicht lesbar. Berechtigungs- oder Besitzer-Problem
#: ../lib/Tails/Persistence/Setup.pm:476
msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
-msgstr "Persistenzbereich ist nicht beschreibbar. Vielleicht wurde es als read-only gemounted?"
+msgstr "Persistenzbereich ist nicht beschreibbar. Vielleicht wurde es als nur-lesbar gemounted?"
#: ../lib/Tails/Persistence/Setup.pm:485
#, perl-format
commit b7ebe0e8332b9f16818b2338b1fde83b93dbbd3d
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Sep 1 17:46:26 2013 +0000
Update translations for tails-persistence-setup
---
de/de.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/de/de.po b/de/de.po
index bc97dc0..03645df 100644
--- a/de/de.po
+++ b/de/de.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2013-08-01 16:49+0200\n"
-"PO-Revision-Date: 2013-09-01 17:15+0000\n"
+"PO-Revision-Date: 2013-09-01 17:30+0000\n"
"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr "Dotfiles"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
msgid ""
"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Alle Dateien und Verzeichnisse, die sich im 'dotfiles' Verzeichnis befinden, nach $HOME symlinken"
+msgstr "Alle Dateien und Verzeichnisse, die sich im 'dotfiles' Verzeichnis befinden, nach $HOME verlinken"
#: ../lib/Tails/Persistence/Setup.pm:257
msgid ""
@@ -143,7 +143,7 @@ msgstr "Der Persistenzbereich kann nicht während der Benutzung gelöscht werden
#: ../lib/Tails/Persistence/Setup.pm:461
msgid "Persistence volume is not unlocked."
-msgstr "Persistenzbereich ist nicht unverschlossen"
+msgstr "Persistenzbereich ist nicht freigegeben"
#: ../lib/Tails/Persistence/Setup.pm:466
msgid "Persistence volume is not mounted."
@@ -155,7 +155,7 @@ msgstr "Persistenzbereich ist nicht lesbar. Berechtigungs- oder Besitzer-Problem
#: ../lib/Tails/Persistence/Setup.pm:476
msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
-msgstr "Persistenzbereich ist nicht beschreibbar. Vielleicht wurde es als read-only gemounted?"
+msgstr "Persistenzbereich ist nicht beschreibbar. Vielleicht wurde es als nur-lesbar gemounted?"
#: ../lib/Tails/Persistence/Setup.pm:485
#, perl-format
commit 7dbcdd0a43eea0155915f9dc2d894d7642f780ea
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Sep 1 17:46:23 2013 +0000
Update translations for liveusb-creator_completed
---
de/de.po | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/de/de.po b/de/de.po
index eb0f775..78f193c 100644
--- a/de/de.po
+++ b/de/de.po
@@ -9,6 +9,7 @@
# Rutz <rutz90(a)gmx.de>, 2013
# tbull <tbull(a)fedoraproject.org>, 2009
# Marcus Nitzschke <marcusni(a)gmx.de>, 2008
+# MarioBaier26 <mario.baier26(a)gmx.de>, 2013
# matsa <matsa(a)riseup.net>, 2012
# mo <moritz(a)torservers.net>, 2013
# Cooligan <ppt23(a)lkj.hopto.org>, 2012
@@ -19,8 +20,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2013-08-07 16:08+0200\n"
-"PO-Revision-Date: 2013-08-25 20:30+0000\n"
-"Last-Translator: mo <moritz(a)torservers.net>\n"
+"PO-Revision-Date: 2013-09-01 17:46+0000\n"
+"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Brauchen Sie hilfe? Lies die </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">Dokumentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:151
msgid ""
@@ -59,7 +60,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das laufende Tails auf einen USB-Stick. Alle Daten auf dem Ziellaufwerk werden gelöscht.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:153
msgid ""
@@ -68,7 +69,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das laufende Tails auf einen USB-Stick, das Tails bereits enthält. Andere Partitionen bleiben unverändert.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:155
msgid ""
@@ -157,7 +158,7 @@ msgstr "Lade %s herunter..."
#: ../liveusb/creator.py:1102
msgid "Drive is a loopback, skipping MBR reset"
-msgstr "Das Drive ist ein Loopback, überspringe MBR-Reset"
+msgstr "Das Laufwerk ist ein Loopback, überspringe MBR-Reset"
#: ../liveusb/creator.py:808
#, python-format
@@ -172,7 +173,7 @@ msgstr "Fehler beim Prüfen des Gerätes"
msgid ""
"Error: Cannot set the label or obtain the UUID of your device. Unable to "
"continue."
-msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes erhalten. Kann nicht fortfahren."
+msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes ermitteln. Kann nicht fortfahren."
#: ../liveusb/creator.py:376
msgid ""
@@ -228,7 +229,7 @@ msgstr "LiveUSB-Erzeugung fehlgeschlagen!"
msgid ""
"Make sure to extract the entire liveusb-creator zip file before running this"
" program."
-msgstr "Versichere dich das die LiveUSB-Creator Zip-Datei entpackt wurde bevor du dieses Programm startest"
+msgstr "Stelle Sicher das die gesamte LiveUSB-Creator Zip-Datei entpackt wurde bevor du dieses Programm startest"
#: ../liveusb/creator.py:1194
msgid ""
@@ -242,7 +243,7 @@ msgstr "Mount %s existiert noch nach dem unmounten"
#: ../liveusb/gui.py:681 ../liveusb/gui.py:698
msgid "Next"
-msgstr "Nächste"
+msgstr "Weiter"
#: ../liveusb/gui.py:562
#, python-format
@@ -259,7 +260,7 @@ msgstr "Nicht genügend freier Platz auf dem Gerät."
#: ../liveusb/gui.py:543
msgid "Partition is FAT16; Restricting overlay size to 2G"
-msgstr "Partition ist FAT16. Beschränkung der Overlay-Grösse auf 2 GB"
+msgstr "Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB"
#: ../liveusb/gui.py:539
msgid "Partition is FAT32; Restricting overlay size to 4G"
@@ -349,7 +350,7 @@ msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte editieren Sie
msgid ""
"There was a problem executing the following command: `%(command)s`.\n"
"A more detailed error log has been written to '%(filename)s'."
-msgstr "Es gab ein Problem beim Ausführen des folgenden Befehls `%(command)s`. Eine detailreichere Fehlerbeschreibung ist hier zu finden: '%(filename)s'"
+msgstr "Es gab ein Problem beim Ausführen des folgenden Befehls `%(command)s`. \nEine detailreichere Fehlerbeschreibung ist hier zu finden: '%(filename)s'"
#: ../liveusb/dialog.py:151
msgid ""
commit 5a574caf7bc24724ebdf68f7f7d5c48983903fd4
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Sep 1 17:46:19 2013 +0000
Update translations for liveusb-creator
---
de/de.po | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/de/de.po b/de/de.po
index eb0f775..78f193c 100644
--- a/de/de.po
+++ b/de/de.po
@@ -9,6 +9,7 @@
# Rutz <rutz90(a)gmx.de>, 2013
# tbull <tbull(a)fedoraproject.org>, 2009
# Marcus Nitzschke <marcusni(a)gmx.de>, 2008
+# MarioBaier26 <mario.baier26(a)gmx.de>, 2013
# matsa <matsa(a)riseup.net>, 2012
# mo <moritz(a)torservers.net>, 2013
# Cooligan <ppt23(a)lkj.hopto.org>, 2012
@@ -19,8 +20,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2013-08-07 16:08+0200\n"
-"PO-Revision-Date: 2013-08-25 20:30+0000\n"
-"Last-Translator: mo <moritz(a)torservers.net>\n"
+"PO-Revision-Date: 2013-09-01 17:46+0000\n"
+"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Brauchen Sie hilfe? Lies die </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">Dokumentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:151
msgid ""
@@ -59,7 +60,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das laufende Tails auf einen USB-Stick. Alle Daten auf dem Ziellaufwerk werden gelöscht.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:153
msgid ""
@@ -68,7 +69,7 @@ msgid ""
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiere das laufende Tails auf einen USB-Stick, das Tails bereits enthält. Andere Partitionen bleiben unverändert.</span></p></body></html>"
#: ../liveusb/launcher_ui.py:155
msgid ""
@@ -157,7 +158,7 @@ msgstr "Lade %s herunter..."
#: ../liveusb/creator.py:1102
msgid "Drive is a loopback, skipping MBR reset"
-msgstr "Das Drive ist ein Loopback, überspringe MBR-Reset"
+msgstr "Das Laufwerk ist ein Loopback, überspringe MBR-Reset"
#: ../liveusb/creator.py:808
#, python-format
@@ -172,7 +173,7 @@ msgstr "Fehler beim Prüfen des Gerätes"
msgid ""
"Error: Cannot set the label or obtain the UUID of your device. Unable to "
"continue."
-msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes erhalten. Kann nicht fortfahren."
+msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes ermitteln. Kann nicht fortfahren."
#: ../liveusb/creator.py:376
msgid ""
@@ -228,7 +229,7 @@ msgstr "LiveUSB-Erzeugung fehlgeschlagen!"
msgid ""
"Make sure to extract the entire liveusb-creator zip file before running this"
" program."
-msgstr "Versichere dich das die LiveUSB-Creator Zip-Datei entpackt wurde bevor du dieses Programm startest"
+msgstr "Stelle Sicher das die gesamte LiveUSB-Creator Zip-Datei entpackt wurde bevor du dieses Programm startest"
#: ../liveusb/creator.py:1194
msgid ""
@@ -242,7 +243,7 @@ msgstr "Mount %s existiert noch nach dem unmounten"
#: ../liveusb/gui.py:681 ../liveusb/gui.py:698
msgid "Next"
-msgstr "Nächste"
+msgstr "Weiter"
#: ../liveusb/gui.py:562
#, python-format
@@ -259,7 +260,7 @@ msgstr "Nicht genügend freier Platz auf dem Gerät."
#: ../liveusb/gui.py:543
msgid "Partition is FAT16; Restricting overlay size to 2G"
-msgstr "Partition ist FAT16. Beschränkung der Overlay-Grösse auf 2 GB"
+msgstr "Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB"
#: ../liveusb/gui.py:539
msgid "Partition is FAT32; Restricting overlay size to 4G"
@@ -349,7 +350,7 @@ msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte editieren Sie
msgid ""
"There was a problem executing the following command: `%(command)s`.\n"
"A more detailed error log has been written to '%(filename)s'."
-msgstr "Es gab ein Problem beim Ausführen des folgenden Befehls `%(command)s`. Eine detailreichere Fehlerbeschreibung ist hier zu finden: '%(filename)s'"
+msgstr "Es gab ein Problem beim Ausführen des folgenden Befehls `%(command)s`. \nEine detailreichere Fehlerbeschreibung ist hier zu finden: '%(filename)s'"
#: ../liveusb/dialog.py:151
msgid ""
commit 53068b2f3066df1a01be5f13a3578263e21fac54
Author: Damian Johnson <atagar(a)torproject.org>
Date: Sun Sep 1 10:23:49 2013 -0700
FAQ entry for 'How do I connect to Tor?'
While code reviewing ra's RTT Prober work I realized that our site didn't
explain the various ways a user can get a Controller. Adding a FAQ entry with
examples that explains it.
---
docs/faq.rst | 122 +++++++++++++++++++++++-
docs/tutorials/the_little_relay_that_could.rst | 2 +-
2 files changed, 122 insertions(+), 2 deletions(-)
diff --git a/docs/faq.rst b/docs/faq.rst
index 006ed59..d942c0e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -12,6 +12,7 @@ Frequently Asked Questions
* **Usage**
+ * :ref:`how_do_i_connect_to_tor`
* :ref:`how_do_i_request_a_new_identity_from_tor`
* :ref:`how_do_i_get_information_about_my_exits`
* :ref:`how_do_i_reload_my_torrc`
@@ -68,7 +69,7 @@ Yup. The most mature controller libraries are written in python, but there's a f
`Txtorcon <https://txtorcon.readthedocs.org/>`_ is an actively maintained controller library written by Meejah for `Twisted <https://twistedmatrix.com/trac/>`_. In the future we plan to `integrate Stem and Txtorcon <https://www.torproject.org/getinvolved/volunteer.html.en#txtorcon-stemInteg…>`_ to some degree, but that is still a ways off.
-`TorCtl <https://gitweb.torproject.org/pytorctl.git>`_ is Stem's predecessor and `deprecated in December 2012 <https://blog.torproject.org/blog/torctl-deprecation-and-stem-plans>`_ in favor of Stem. Though no longer actively developed, it's still quite functional and still used for several `TorFlow <https://gitweb.torproject.org/torflow.git>`_ based projects.
+`TorCtl <https://gitweb.torproject.org/pytorctl.git>`_ was Stem's predecessor and `deprecated in December 2012 <https://blog.torproject.org/blog/torctl-deprecation-and-stem-plans>`_ in favor of Stem. Though no longer actively developed, it's still quite functional and still used for several `TorFlow <https://gitweb.torproject.org/torflow.git>`_ based projects.
The following are the functional controller libraries I'm aware of. Dates are for highly active development. If I missed one then please `let me know <http://www.atagar.com/contact/>`_!
@@ -92,6 +93,125 @@ Do you have a tor related question or project that you would like to discuss? If
Usage
=====
+.. _how_do_i_connect_to_tor:
+
+How do I connect to Tor?
+------------------------
+
+Once you have Tor running and `properly configured <tutorials/the_little_relay_that_could.html>`_ you have a few ways of connecting to it. The following are the most common methods for getting a :class:`~stem.control.Controller` instance, from the highest to lowest level...
+
+#. :func:`stem.connection.connect_port` and :func:`stem.connection.connect_socket_file`
+
+ Writing a commandline script? Then the `connection module <api/connection.html>`_ provide you the quickest and most hassle free method for getting a :class:`~stem.control.Controller`.
+
+ These functions connect and authenticate to the given port or socket, providing you with a :class:`~stem.control.Controller` that's ready to use. If Tor requires a password then the user will be prompted for it. When the connection cannot be established this prints a description of the problem to stdout then returns **None**.
+
+ For instance...
+
+ ::
+
+ import sys
+
+ from stem.connection import connect_port
+
+ if __name__ == '__main__':
+ controller = connect_port()
+
+ if not controller:
+ sys.exit(1) # unable to get a connection
+
+ print "Tor is running version %s" % controller.get_version()
+
+ ::
+
+ % python example.py
+ Tor is running version 0.2.4.10-alpha-dev (git-8be6058d8f31e578)
+
+ ... or if Tor isn't running...
+
+ ::
+
+ % python example.py
+ [Errno 111] Connection refused
+
+#. :func:`stem.control.Controller.from_port` and :func:`stem.control.Controller.from_socket_file`
+
+ The connection module helpers above are all well and good when you need a quick-and-dirty connection for your commandline script, but they're inflexible. In particular their lack of exceptions and direct use of stdin/stdout make them undesirable for more complicated situations. That's where the Controller's :func:`~stem.control.Controller.from_port` and :func:`~stem.control.Controller.from_socket_file` methods come in.
+
+ These static :class:`~stem.control.Controller` methods return an **unauthenticated** controller you can then authenticate yourself using its :func:`~stem.control.Controller.authenticate` method.
+
+ For instance...
+
+ ::
+
+ import getpass
+ import sys
+
+ import stem
+ import stem.connection
+
+ from stem.control import Controller
+
+ if __name__ == '__main__':
+ try:
+ controller = Controller.from_port()
+ except stem.SocketError as exc:
+ print "Unable to connect to tor on port 9051: %s" % exc
+ sys.exit(1)
+
+ try:
+ controller.authenticate()
+ except stem.connection.MissingPassword:
+ pw = getpass.getpass("Controller password: ")
+
+ try:
+ controller.authenticate(password = pw)
+ except stem.connection.PasswordAuthFailed:
+ print "Unable to authenticate, password is incorrect"
+ sys.exit(1)
+ except stem.connection.AuthenticationFailure as exc:
+ print "Unable to authenticate: %s" % exc
+ sys.exit(1)
+
+ print "Tor is running version %s" % controller.get_version()
+
+#. `Socket Module <api/socket.html>`_
+
+ For the diehards among us you can skip the conveniences of a high level :class:`~stem.control.Controller` and work directly with the raw components. At Stem's lowest level your connection with Tor is a :class:`~stem.socket.ControlSocket` subclass. This provides methods to send, receive, disconnect, and reconnect to Tor.
+
+ One level up is the :class:`~stem.control.BaseController`. This wraps the :class:`~stem.socket.ControlSocket` and provides a :func:`~stem.control.BaseController.msg` method so you can send messages and receive their reply in a thread safe manner. Finally comes the :class:`~stem.control.Controller`, which extends :class:`~stem.control.BaseController` to provide more user friendly methods.
+
+ Directly using the :class:`~stem.socket.ControlSocket` is unsafe when it's being managed through a :class:`~stem.control.BaseController`, but if you're interested in dealing with lower level components directly then that is certainly an option...
+
+ ::
+
+ import stem
+ import stem.connection
+ import stem.socket
+
+ if __name__ == '__main__':
+ try:
+ control_socket = stem.socket.ControlPort(port = 9051)
+ stem.connection.authenticate(control_socket)
+ except stem.SocketError as exc:
+ print "Unable to connect to tor on port 9051: %s" % exc
+ sys.exit(1)
+ except stem.connection.AuthenticationFailure as exc:
+ print "Unable to authenticate: %s" % exc
+ sys.exit(1)
+
+ print "Issuing 'GETINFO version' query...\n"
+ control_socket.send('GETINFO version')
+ print control_socket.recv()
+
+ ::
+
+ % python example.py
+ Issuing 'GETINFO version' query...
+
+ version=0.2.4.10-alpha-dev (git-8be6058d8f31e578)
+ OK
+
.. _how_do_i_request_a_new_identity_from_tor:
How do I request a new identity from Tor?
diff --git a/docs/tutorials/the_little_relay_that_could.rst b/docs/tutorials/the_little_relay_that_could.rst
index c30ae55..751c216 100644
--- a/docs/tutorials/the_little_relay_that_could.rst
+++ b/docs/tutorials/the_little_relay_that_could.rst
@@ -42,7 +42,7 @@ the following configuration options...
When you change your torrc you'll need to either restart Tor is issue a SIGHUP
for the new settings to take effect. Now let's write a script that tells us how
-many bytes Tor has sent and received since it started. If you're unfamiliar
+many bytes Tor has sent and received since it started. Note that there are a `few ways to connect to Tor <../faq.html#how-do-i-connect-to-tor>`_. If you're unfamiliar
with the '**with**' keyword then see `here
<../faq.html#what-is-that-with-keyword-i-keep-seeing-in-the-tutorials>`_...