tor-commits
Threads by month
- ----- 2026 -----
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 215210 discussions
commit b7c943773330b263ec5286d83f8dd30f6daec775
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Oct 17 13:15:43 2011 +0000
Update translations for tsum
---
es/tsum.po | 33 ++++++++++++++++++++++++++++++++-
fa/tsum.po | 31 ++++++++++++++++++++++++++++++-
fr/tsum.po | 37 ++++++++++++++++++++++++++++++++++++-
hu/tsum.po | 35 ++++++++++++++++++++++++++++++++++-
nl/tsum.po | 14 +++++++++++++-
5 files changed, 145 insertions(+), 5 deletions(-)
diff --git a/es/tsum.po b/es/tsum.po
index 1fa7c47..fe088f2 100644
--- a/es/tsum.po
+++ b/es/tsum.po
@@ -6,12 +6,13 @@
# <antixsuperstar(a)gmail.com>, 2011.
# <guido(a)bruo.org>, 2011.
# <kpplfy(a)geekmx.org>, 2011.
+# <runa.sandvik(a)gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2011-10-17 13:23+0200\n"
-"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"PO-Revision-Date: 2011-10-17 12:57+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -33,6 +34,10 @@ msgid ""
"find the answer to your question in this document, email community-"
"support(a)lists.torproject.org."
msgstr ""
+"Este manual de uso contiene información sobre cómo descargar Tor, cómo "
+"usarlo y qué hacer si Tor no puede conectarse a la red. Si usted no "
+"encontrara la respuesta a su pregunta en este documento, envíe un correo a "
+"community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:9
@@ -141,6 +146,9 @@ msgid ""
"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
" of the message. You can leave the subject blank."
msgstr ""
+"### Cómo obtener Tor vía correo electrónico Para recibir el Paquete del "
+"navegador Tor en inglés para Windows, envíe un correo electrónico a "
+"gettor(a)torproject.org con **windows** en el cuerpo del mensaje. Puede "
#. type: Plain text
#: tsum.text:53
@@ -173,6 +181,11 @@ msgid ""
"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
+"**Nota**: Los Paquetes del navegador Tor para Linux y Mac OS X son bastante "
+"pesados y no podrá recibir ninguno de ellos con una cuenta de GMail, Hotmail"
+" o Yahoo. Si usted no puede recibir el paquete que desea, envíe un correo a "
+"community-support(a)lists.torproject.org y le daremos una lista de sitios web "
+"allternativos donde realizar la descarga.\n"
#. type: Plain text
#: tsum.text:69
@@ -194,6 +207,7 @@ msgid ""
"Send an email to gettor(a)torproject.org with the following words in the body "
"of the email:"
msgstr ""
+"Envíe un correo a gettor(a)torproject.org con las siguientes palabras en el "
#. type: Plain text
#: tsum.text:75
@@ -347,6 +361,10 @@ msgid ""
" and the output from GnuPG in an email to community-"
"support(a)lists.torproject.org."
msgstr ""
+"La salida debe decir *\\\"Good signature\\\"* (Firma correcta). Una firma "
+"incorrecta significa que el archivo pudo haber sido intervenido. Si usted ve"
+" una firma errónea, envíe los detalles acerca del origen de la descarga, "
+"cómo verificó la firma y la salida de GnuPG en un correo electrónico a "
#. type: Plain text
#: tsum.text:133
@@ -487,6 +505,9 @@ msgid ""
"community-support(a)lists.torproject.org and include the relevant parts from "
"the log file."
msgstr ""
+"Si usted necesita ayuda para saber por qué Tor no puede conectar, envíe un "
+"correo a community-support(a)lists.torproject.org e incluya las partes "
+"relevantes del registro de mensajes."
#. type: Plain text
#: tsum.text:189
@@ -499,6 +520,13 @@ msgid ""
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
+"### Cómo encontrar un Puente Para usar un puente, usted necesita primero "
+"encontrar uno; para ello puede ingresar a "
+"[bridges.torproject.org](https://bridges.torproject.org/), o enviar un "
+"correo a bridges(a)torproject.org. Si decide enviar un correo, asegúrese de "
+"escribir **get bridges** en el cuerpo del mensaje. Sin eso no obtendrá "
+"respuesta. Nota: usted necesita hacer esto desde una cuenta de correo en "
+"gmail.com o yahoo.com."
#. type: Plain text
#: tsum.text:194
@@ -588,6 +616,9 @@ msgid ""
"common questions. If your question is not mentioned here, please send an "
"email to community-support(a)lists.torproject.org."
msgstr ""
+"## Preguntas Frecuentes Esta sección respondera algunas de las preguntas más"
+" comunes. Si su duda no está respondida aquí, por favor envíe un correo a "
+"community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:230
diff --git a/fa/tsum.po b/fa/tsum.po
index b85b775..7c6ae79 100644
--- a/fa/tsum.po
+++ b/fa/tsum.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2011-10-17 13:23+0200\n"
-"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"PO-Revision-Date: 2011-10-17 13:05+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgid ""
"find the answer to your question in this document, email community-"
"support(a)lists.torproject.org."
msgstr ""
+"این راهنمای کاربری حاوی اطلاعاتی است درباره دانلود تور، استفاده از آن و "
+"اینکه در صورت وصل نشدن تور به شبکه باید چه کار کنید. اگر نمیتوانید پاسخ "
+"سوال خود در این راهنما پیدا کنید، به community-support(a)lists.torproject.org "
+"ایمیل بزنید. "
#. type: Plain text
#: tsum.text:9
@@ -140,6 +144,9 @@ msgid ""
"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
" of the message. You can leave the subject blank."
msgstr ""
+"### چگونه تور را از راه ایمیل دریافت کنیم برای دریافت بسته انگلیسی تور برای "
+"ویندوز، ایمیلی به gettor(a)torproject.org با ذکر کلمه **windows** در درون "
+"ایمیل بفرستید. میتوانید subject را خالی بگذارید."
#. type: Plain text
#: tsum.text:53
@@ -172,6 +179,10 @@ msgid ""
"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
+"**نکته**: بسته مرورگر تور برای گنو/لینوکس و مکاواساکس نسبتا بزرگ است،\n"
+"و شما نخواهید توانست آن را به وسیلهی جیمیل، هاتمیل یا یاهو دریافت کنید.\n"
+"اگر شما نتوانستید بستهای را که خواستهاید دریافت کنید، یه ایمیل به community-support(a)lists.torproject.org بفرستید\n"
+"و ما لیستی از وبسایتهایی که میتوانید از آنها دانلود کنید را برای استفادهتان میفرستیم.\n"
#. type: Plain text
#: tsum.text:69
@@ -194,6 +205,7 @@ msgid ""
"Send an email to gettor(a)torproject.org with the following words in the body "
"of the email:"
msgstr ""
+"یک ایمیل به gettor(a)torproject.org بزنید و در بدنهی آن کلمات زیر را بنویسید:"
#. type: Plain text
#: tsum.text:75
@@ -346,6 +358,10 @@ msgid ""
" and the output from GnuPG in an email to community-"
"support(a)lists.torproject.org."
msgstr ""
+"خروجی باید بگوید *\"Good signature\"*. یک امضای بد یعنی فایل ممکن است "
+"دستکاری شده باشد. اگر شما یه امضای بد دیدید، جزییات این که فایل را از کجا "
+"دانلود کردید، چگونه امضا را بررسی کردید، و خروجی GnuPG را به نشانی "
+"community-support(a)lists.torproject.org ایمیل بزنید."
#. type: Plain text
#: tsum.text:133
@@ -484,6 +500,9 @@ msgid ""
"community-support(a)lists.torproject.org and include the relevant parts from "
"the log file."
msgstr ""
+"اگر شما برای این که بفهمید چرا تور متصل نمیشود، مشکل داشتید، یک ایمیل به "
+"community-support(a)lists.torproject.org بفرستید و در آن قسمت مربوطه از فایل "
+"لاگ را قرار دهید."
#. type: Plain text
#: tsum.text:189
@@ -496,6 +515,13 @@ msgid ""
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
+"### چگونه یک پل پیدا کنیم برای استفاده از یک پل، شما ابتدا باید یک پل را "
+"مکانیابی کنید؛ برای این کار میتوانید به "
+"[bridges.torproject.org](https://bridges.torproject.org/) بروید یا این که یک"
+" ایمیل به bridges(a)torproject.org بفرستید. اگر میخواهید ایمیل ارسال کنید* "
+"اطمینان حاصل کنید که در قسمت بدنهی ایمیل، کلمهی **get bridges** را "
+"نوشتهاید. بدون این، شما پاسخی دریافت نخواهید کرد. به این نکته توجه کنید که "
+"لازم است شما این ایمیل را از آدرسهای جیمیل یا یاهو بفرستید."
#. type: Plain text
#: tsum.text:194
@@ -587,6 +613,9 @@ msgid ""
"common questions. If your question is not mentioned here, please send an "
"email to community-support(a)lists.torproject.org."
msgstr ""
+"سوالات متداول. این قسمت به برخی از سوالات بسیار متداول و مشترک پاسخ خواهد "
+"داد. اگر سوال شما در این جا ذکر نشده بود، لطفا به community-"
+"support(a)lists.torproject.org ایمیل بزنید."
#. type: Plain text
#: tsum.text:230
diff --git a/fr/tsum.po b/fr/tsum.po
index 7906e6a..a8944f0 100644
--- a/fr/tsum.po
+++ b/fr/tsum.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2011-10-17 13:23+0200\n"
-"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"PO-Revision-Date: 2011-10-17 13:08+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,11 @@ msgid ""
"find the answer to your question in this document, email community-"
"support(a)lists.torproject.org."
msgstr ""
+"Ce manuel utilisateur contient des indications pour le téléchargement de "
+"Tor, son utilisation et sur ce qu'il faut faire si Tor n'est plus en mesure "
+"de se connecter au réseau. Si vous ne trouvez de réponse à vos questions "
+"dans ce document, alors envoyez un mail à community-"
+"support(a)lists.torproject.org. "
#. type: Plain text
#: tsum.text:9
@@ -148,6 +153,10 @@ msgid ""
"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
" of the message. You can leave the subject blank."
msgstr ""
+"### Comment obtenir Tor par email? Pour recevoir le package en langue "
+"anglaise du Navigateur Tor compatible windows, il faut envoyer un email à "
+"gettor(a)torproject.org avec **windows** dans le corps du message. Vous pouvez"
+" laisser le sujet vide. "
#. type: Plain text
#: tsum.text:53
@@ -180,6 +189,11 @@ msgid ""
"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
+"**Note**; Les packages navigateur Tor pour Linux et Mac OS X sont assez "
+"volumineux, et vous n'aurez pas la possibilité de recevoir l'archive sur un "
+"compte Gmail, Hotmail ou Yahoo. SI vous ne pouvez pas recevoir le package "
+"désiré, envoyez un email à community-support(a)lists.torproject.org et nous "
+"vous communiquerons une liste de sites web miroirs à utiliser. \n"
#. type: Plain text
#: tsum.text:69
@@ -202,6 +216,8 @@ msgid ""
"Send an email to gettor(a)torproject.org with the following words in the body "
"of the email:"
msgstr ""
+"Envoyez un e-mail à gettor(a)torproject.org avec les mots suivants dans le "
+"corps de l'e-mail:"
#. type: Plain text
#: tsum.text:75
@@ -359,6 +375,11 @@ msgid ""
" and the output from GnuPG in an email to community-"
"support(a)lists.torproject.org."
msgstr ""
+"Si tout est bon \"signature correcte\" devrait s'afficher. Une signature "
+"incorrecte signifie que le fichier a peut être été falsifié ou corrompu. Si "
+"vous avez une signature incorrecte, envoyez les informations concernant le "
+"site de téléchargement, le méthode de vérification de la signature et le "
+"résultat de GnuPG par email à community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:133
@@ -502,6 +523,9 @@ msgid ""
"community-support(a)lists.torproject.org and include the relevant parts from "
"the log file."
msgstr ""
+"Si vous avez besoin d'aide pour comprendre pourquoi Tor ne peut pas se "
+"connecter, envoyez un mail à community-support(a)lists.torproject.org et "
+"joignez les informations pertinentes du fichier de log"
#. type: Plain text
#: tsum.text:189
@@ -514,6 +538,13 @@ msgid ""
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
+"### Comment trouver une passerelle, comment utiliser un passerelle. Vous "
+"devrez tout d'abord en localiser une. Vous pouvez soit vous rendre à "
+"l'adresse [bridges.torproject.org](https://bridges.torproject.org/), soit "
+"envoyez un mail à bridges(a)torproject.org. Si vous envoyez un mail, assurez "
+"s'il vous plait d'indiquer **get bridges** dans le corps du mail. Sans cela,"
+" vous n'obtiendrez pas de réponse. Notez que vous devez envoyer cet email "
+"depuis une adresse gmail.com soit depuis une adresse yahoo.com."
#. type: Plain text
#: tsum.text:194
@@ -608,6 +639,10 @@ msgid ""
"common questions. If your question is not mentioned here, please send an "
"email to community-support(a)lists.torproject.org."
msgstr ""
+"## Questions Fréquemment Posées. Cette section vous apportera des réponses à"
+" la plupart des questions habituelles. Si vous question n'est pas mentionnée"
+" ici, envoyez s'il vous plait un email à community-"
+"support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:230
diff --git a/hu/tsum.po b/hu/tsum.po
index 50811b7..5c9ddb2 100644
--- a/hu/tsum.po
+++ b/hu/tsum.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2011-10-17 13:23+0200\n"
-"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"PO-Revision-Date: 2011-10-17 13:12+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgid ""
"find the answer to your question in this document, email community-"
"support(a)lists.torproject.org."
msgstr ""
+"Ez a kézikönyv információkat nyújt a Tor letöltéséről, használatáról és "
+"azokról a teendőkről, amit akkor kell végrehajtania, ha a Tor nem tud "
+"csatlakozni a hálózathoz. Ha nem találja kérdésre a választ ebben a "
+"dokumentumban, akkor írjon levelet a community-support(a)lists.torproject.org "
+"címre."
#. type: Plain text
#: tsum.text:9
@@ -139,6 +144,9 @@ msgid ""
"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
" of the message. You can leave the subject blank."
msgstr ""
+"### Hogyan szerezheti be a Tor-t emailben Ahhoz, hogy emailben kapja meg az "
+"angol Tor Böngésző csomagot, küldjön egy emailt a gettor(a)torproject.org "
+"címre **windows** szöveggel a levél törzsében. A tárgy üres maradhat."
#. type: Plain text
#: tsum.text:53
@@ -170,6 +178,11 @@ msgid ""
"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
+"**Megjegyzés**: A Tor böngésző csomag Linux és Mac OS X verziója igen nagy, "
+"és nem fogja megkapni ezt Gmail, Hotmail vagy Yahoo címre. Ha nem tudja "
+"beszerezni a csomagot,írjon egy emailt a community-"
+"support(a)lists.torproject.org címre, és küldünk egy listát arról, hogy milyen"
+" weboldal tükröket használhat.\n"
#. type: Plain text
#: tsum.text:69
@@ -191,6 +204,8 @@ msgid ""
"Send an email to gettor(a)torproject.org with the following words in the body "
"of the email:"
msgstr ""
+"Küldjön egy emailt a gettor(a)torproject.org címre a következő tartalommal az "
+"email törzsében:"
#. type: Plain text
#: tsum.text:75
@@ -349,6 +364,11 @@ msgid ""
" and the output from GnuPG in an email to community-"
"support(a)lists.torproject.org."
msgstr ""
+"A kimenet azt kell mondja, hogy *\"Good signature\"* (jó aláírás). Egy hibás"
+" aláírás azt jelentheti, hogy a csomag megváltoztatásra került, vagy "
+"megsérült. Ha hibás aláírást lát, akkor küldje el a részleteket arról, hogy "
+"honnan töltötte le a csomagot, hogyan ellenőrizte, és a kimenetét a GnuPG "
+"programnak, a a community-support(a)lists.torproject.org email címre."
#. type: Plain text
#: tsum.text:133
@@ -488,6 +508,9 @@ msgid ""
"community-support(a)lists.torproject.org and include the relevant parts from "
"the log file."
msgstr ""
+"Ha segítségre van szüksége, hogy a Tor miért nem tud kapcsolódni, írjon egy "
+"emailt a community-support(a)lists.torproject.org címre, és rakja bele a "
+"lényeges részeit a levélbe a log állománynak."
#. type: Plain text
#: tsum.text:189
@@ -500,6 +523,13 @@ msgid ""
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
+"### Hogyan találjon Hídkapcsolati Eloszót A Tor Hidak használatához először"
+" találnia kell egyet; vagy nézze meg a "
+"[bridges.torproject.org](https://bridges.torproject.org/) weboldalt, vagy "
+"küldjön egy emailt a bridges(a)torproject.org. Ha email küld, legyen biztos "
+"benne, hogy a levél szövege tartalmazza a **get bridges** (magyarul: hidak "
+"lekérése) szöveget a levél törzsében. E nélkül nem fog választ kapni. "
+"Fontos, hogy ezt az emailt gmail.com vagy yahoo.com címről kell küldenie."
#. type: Plain text
#: tsum.text:194
@@ -593,6 +623,9 @@ msgid ""
"common questions. If your question is not mentioned here, please send an "
"email to community-support(a)lists.torproject.org."
msgstr ""
+"## Gyakran feltett kérdések Ez a szakasz a leggyakoribb kérdések "
+"tartalmazza. Ha kérdése nincs itt említve, kérjük küldjön egy emailt a "
+"community-support(a)lists.torproject.org címre."
#. type: Plain text
#: tsum.text:230
diff --git a/nl/tsum.po b/nl/tsum.po
index 6b8fc2b..2ef5290 100644
--- a/nl/tsum.po
+++ b/nl/tsum.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2011-10-17 13:23+0200\n"
-"PO-Revision-Date: 2011-10-17 12:41+0000\n"
+"PO-Revision-Date: 2011-10-17 12:51+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -496,6 +496,8 @@ msgid ""
"community-support(a)lists.torproject.org and include the relevant parts from "
"the log file."
msgstr ""
+"Als je hulp nodig hebt met uitzoeken waarom Tor geen verbinding kan krijgen,"
+" stuur dan een e-mail naar community-support(a)lists.torproject.org en voeg "
#. type: Plain text
#: tsum.text:189
@@ -508,6 +510,13 @@ msgid ""
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
+"### Hoe een bridge te vinden Om een bridge te gebruiken moet je er eerst één"
+" vinden; je kunt naar "
+"[bridges.torproject.org](https://bridges.torproject.org/) gaan, of je kunt "
+"een email sturen naar bridges(a)torproject.org. Als je een e-mail stuurt, zorg"
+" er dan voor dat je **get bridges** in de body van de e-mail zet. Zonder dit"
+" krijg je geen bericht terug. Let op dat je deze e-mail van, of een "
+"gmail.com adres, of een yahoo.com adres moet sturen."
#. type: Plain text
#: tsum.text:194
@@ -592,6 +601,9 @@ msgid ""
"common questions. If your question is not mentioned here, please send an "
"email to community-support(a)lists.torproject.org."
msgstr ""
+"## Veelgestelde vragen Dit onderdeel zal een paar van de meest gestelde "
+"vragen beantwoorden. Als je vraag hier niet genoemd wordt, stuur dan een "
+"e-mail naar community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:230
1
0
commit 240aea608045b75d98f0274e358f247204127c80
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Oct 17 12:45:39 2011 +0000
Update translations for tsum
---
ar/tsum.po | 38 +++++++++++++--------------------
cs/tsum.po | 51 ++++++++++++++------------------------------
de/tsum.po | 42 ++++++++++++++----------------------
el/tsum.po | 32 ++++++++++++++--------------
en/tsum.pot | 56 ++++++++++++++++++++++++------------------------
es/tsum.po | 62 ++++++++++++++----------------------------------------
fa/tsum.po | 62 ++++++++++++++----------------------------------------
fr/tsum.po | 67 ++++++++++++++--------------------------------------------
hu/tsum.po | 65 ++++++++++++++-------------------------------------------
it/tsum.po | 30 +++++++++++++-------------
nl/tsum.po | 61 +++++++++++++++++++++++------------------------------
pt/tsum.po | 42 +++++++++++++-----------------------
ru/tsum.po | 30 +++++++++++++-------------
zh/tsum.po | 30 +++++++++++++-------------
14 files changed, 242 insertions(+), 426 deletions(-)
diff --git a/ar/tsum.po b/ar/tsum.po
index b030f37..acb3616 100644
--- a/ar/tsum.po
+++ b/ar/tsum.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -29,11 +29,9 @@ msgstr "دليل المستخدم المختصر"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"يتضمّن دليل المستخدم هذا على معلومات تخصّ كيفيّة تنزيل طور, كيفيّة استخدامه, وكيفيّة حلّ المشاكل المتعلّقة بالاتّصال بالشّبكة. ان لم تستطع الحصول على إجابة عاى سؤالك, إبعث بريد الكتروني على\n"
-"<community-support(a)lists.torproject.org>. "
#. type: Plain text
#: tsum.text:9
@@ -115,12 +113,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### كيف تحصل على طور عبر البريد الالكتروني من أجل استلام النسخة الانجليزية "
-"من حزمة متصفح طور لنظام ويندوز, ارسل بريد الى <gettor(a)torproject.org> مع "
-"**windows** في نص الرسالة. يمكنك ترك الموضوع فارغاً."
#. type: Plain text
#: tsum.text:53
@@ -146,7 +141,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -163,8 +158,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -306,8 +301,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -415,12 +410,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"اذا احتجت الى مساعدة لمعرفة لماذا طور لا يستطيع الاتصال, ارسل بريد الى "
-"<community-support(a)lists.torproject.org> وارفق معه الأجزاء المتعلقة من ملف "
-"السجل"
#. type: Plain text
#: tsum.text:189
@@ -428,7 +420,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -499,7 +491,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/cs/tsum.po b/cs/tsum.po
index 6f640b1..44c1250 100644
--- a/cs/tsum.po
+++ b/cs/tsum.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-16 17:10+0000\n"
-"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,13 +28,9 @@ msgstr "# Krátký uživatelský manuál"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Tento uživatelský manuál obsahuje informace o stažení Toru, jeho použití, a "
-"co dělat v případě, že se Toru nepodaří připojit se k síti. Pokud v tomto "
-"dokumentu nenaleznete odpověď na svou otázku, napište email na <community-"
-"support(a)lists.torproject.org> (anglicky)."
#. type: Plain text
#: tsum.text:9
@@ -138,11 +134,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Jak obdržet Tor skrz email\n"
-"Pro obdržení anglického Tor Browser Bundle pro Windows pošlete email na <gettor(a)torproject.org> s **windows** v tělu zprávy. Předmět může zůstat prázdný."
#. type: Plain text
#: tsum.text:53
@@ -171,13 +165,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**Poznámka**: Tor Browser Bundle pro Linux a Mac OS X jsou poměrně velké a "
-"není možné je přijmout s účtem u Gmailu, Hotmailu či Yahoo. Pokud nemůžete "
-"obdržet balíček co chcete, napište email na <community-"
-"support(a)lists.torproject.org> a dáme vám seznam mirrorů.\n"
#. type: Plain text
#: tsum.text:69
@@ -192,8 +182,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -341,13 +331,9 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Výstup by měl ohlásit *\"Good signature\"* (podpis v pořádku). Špatný podpis"
-" by mohl znamenat, že do souboru mohl někdo zasahovat. Pokud zahlédnete "
-"špatný podpis, pošlete detaily o tom kde jste balík stáhli, jak jste ho "
-"věřovali, a výstup GnuPG na <community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:133
@@ -476,12 +462,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"Pokud potřebujete pomoc při zjišťování proč se Tor nemůže připojit, napište "
-"email na <community-support(a)lists.torproject.org> a přiložte relevantní "
-"části z logů."
#. type: Plain text
#: tsum.text:189
@@ -489,13 +472,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### Jak najít most\n"
-"K použití mostu je nejprve potřeba nějaký najít; můžete buď se podívat na [bridges.torproject.org](https://bridges.torproject.org/), nebo pošlete email na <bridges(a)torproject.org>. Pokud budete posílat email, ujistěte se prosím že napíšete **get bridges** do těla emailu, jinak nedostanete odpověď. Tento email je nutno poslat buď z gmail.com nebo yahoo.com adresy."
#. type: Plain text
#: tsum.text:194
@@ -568,7 +549,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/de/tsum.po b/de/tsum.po
index 2459516..ac713a9 100644
--- a/de/tsum.po
+++ b/de/tsum.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 14:05+0000\n"
-"Last-Translator: identity <eeemsi(a)googlemail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,14 +30,9 @@ msgstr "# Das Kurze Anwenderhandbuch"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Dieses Anwenderhandbuch enthält Informationen darüber, wie man Tor "
-"herunterlädt, verwendet und was man tun kann, wenn Tor sich nicht mit den "
-"Netzwerk verbinden kann. Wenn du in diesem Dokument keine Antwort auf deine "
-"Frage finden kannst schicke eine E-Mail an <community-"
-"support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:9
@@ -143,12 +138,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Wie man Tor via E-Mail das englische Tor Browser Bundle für Windows "
-"erhalten kann kann. Sende eine E-Mail mit **windows** in der Mail an "
-"<gettor(a)torproject.org>. Du kannst den Betreff leer lassen."
#. type: Plain text
#: tsum.text:53
@@ -178,7 +170,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -195,11 +187,9 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Sende eine email an <gettor(a)torproject.org>, die die folgenden Wörter "
-"enthält:"
#. type: Plain text
#: tsum.text:75
@@ -342,8 +332,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -450,8 +440,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -460,7 +450,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -531,7 +521,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/el/tsum.po b/el/tsum.po
index d455f5f..4626172 100644
--- a/el/tsum.po
+++ b/el/tsum.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:36+0000\n"
-"Last-Translator: cirrus <cirrus.spam(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,8 @@ msgstr "# Σύντομες οδηγίες χρήσης"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -113,8 +113,8 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
#. type: Plain text
@@ -139,7 +139,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -156,8 +156,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -280,8 +280,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -380,8 +380,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -390,7 +390,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -461,7 +461,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/en/tsum.pot b/en/tsum.pot
index 3aff65e..4bab226 100644
--- a/en/tsum.pot
+++ b/en/tsum.pot
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -27,13 +27,13 @@ msgstr "# The Short User Manual"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:9
@@ -138,12 +138,12 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
#. type: Plain text
#: tsum.text:53
@@ -172,13 +172,13 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
#. type: Plain text
@@ -199,11 +199,11 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
#. type: Plain text
#: tsum.text:75
@@ -353,14 +353,14 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:133
@@ -496,12 +496,12 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
#. type: Plain text
#: tsum.text:189
@@ -509,7 +509,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -517,7 +517,7 @@ msgstr ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -611,11 +611,11 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:230
diff --git a/es/tsum.po b/es/tsum.po
index 18cd259..1fa7c47 100644
--- a/es/tsum.po
+++ b/es/tsum.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 15:37+0000\n"
-"Last-Translator: guido <guido(a)bruo.org>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,13 +30,9 @@ msgstr "# Breve Manual de Usuario"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Este manual de uso contiene información sobre cómo descargar Tor, cómo "
-"usarlo y qué hacer si Tor no puede conectarse a la red. Si usted no "
-"encontrara la respuesta a su pregunta en este documento, envíe un correo a "
-"<community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:9
@@ -142,13 +138,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Cómo obtener Tor vía correo electrónico Para recibir el Paquete del "
-"navegador Tor en inglés para Windows, envíe un correo electrónico a "
-"<gettor(a)torproject.org> con **windows** en el cuerpo del mensaje. Puede "
-"dejar el campo de Asunto vacío."
#. type: Plain text
#: tsum.text:53
@@ -178,11 +170,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**Nota**: Los Paquetes del navegador Tor para Linux y Mac OS X son bastante pesados y no podrá recibir ninguno de ellos con una\n"
-"cuenta de GMail, Hotmail o Yahoo. Si usted no puede recibir el paquete que desea, envíe un correo a <community-support(a)lists.torproject.org> y le daremos una lista de sitios web allternativos donde realizar la descarga.\n"
#. type: Plain text
#: tsum.text:69
@@ -201,11 +191,9 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Envíe un correo a <gettor(a)torproject.org> con las siguientes palabras en el "
-"cuerpo del mensaje:"
#. type: Plain text
#: tsum.text:75
@@ -356,14 +344,9 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"La salida debe decir *\"Good signature\"* (Firma correcta). Una firma "
-"incorrecta significa que el archivo pudo haber sido intervenido. Si usted ve"
-" una firma errónea, envíe los detalles acerca del origen de la descarga, "
-"cómo verificó la firma y la salida de GnuPG en un correo electrónico a "
-"<community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:133
@@ -501,12 +484,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"Si usted necesita ayuda para saber por qué Tor no puede conectar, envíe un "
-"correo a <community-support(a)lists.torproject.org> e incluya las partes "
-"relevantes del registro de mensajes."
#. type: Plain text
#: tsum.text:189
@@ -514,18 +494,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### Cómo encontrar un Puente Para usar un puente, usted necesita primero "
-"encontrar uno; para ello puede ingresar a "
-"[bridges.torproject.org](https://bridges.torproject.org/), o enviar un "
-"correo a <bridges(a)torproject.org>. Si decide enviar un correo, asegúrese de "
-"escribir **get bridges** en el cuerpo del mensaje. Sin eso no obtendrá "
-"respuesta. Nota: usted necesita hacer esto desde una cuenta de correo en "
-"gmail.com o yahoo.com."
#. type: Plain text
#: tsum.text:194
@@ -613,11 +586,8 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
-"## Preguntas Frecuentes Esta sección respondera algunas de las preguntas más"
-" comunes. Si su duda no está respondida aquí, por favor envíe un correo a "
-"<community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:230
diff --git a/fa/tsum.po b/fa/tsum.po
index 79f6869..b85b775 100644
--- a/fa/tsum.po
+++ b/fa/tsum.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 14:08+0000\n"
-"Last-Translator: hamidthegreat <hamid.azimy(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,13 +30,9 @@ msgstr "# راهنمای کاربری کوتاه"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"این راهنمای کاربری حاوی اطلاعاتی است درباره دانلود تور، استفاده از آن و "
-"اینکه در صورت وصل نشدن تور به شبکه باید چه کار کنید. اگر نمیتوانید پاسخ "
-"سوال خود در این راهنما پیدا کنید، به <community-"
-"support(a)lists.torproject.org> ایمیل بزنید. "
#. type: Plain text
#: tsum.text:9
@@ -141,12 +137,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### چگونه تور را از راه ایمیل دریافت کنیم برای دریافت بسته انگلیسی تور برای "
-"ویندوز، ایمیلی به <gettor(a)torproject.org> با ذکر کلمه **windows** در درون "
-"ایمیل بفرستید. میتوانید subject را خالی بگذارید."
#. type: Plain text
#: tsum.text:53
@@ -176,13 +169,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**نکته**: بسته مرورگر تور برای گنو/لینوکس و مکاواساکس نسبتا بزرگ است،\n"
-"و شما نخواهید توانست آن را به وسیلهی جیمیل، هاتمیل یا یاهو دریافت کنید.\n"
-"اگر شما نتوانستید بستهای را که خواستهاید دریافت کنید، یه ایمیل به <community-support(a)lists.torproject.org> بفرستید\n"
-"و ما لیستی از وبسایتهایی که میتوانید از آنها دانلود کنید را برای استفادهتان میفرستیم.\n"
#. type: Plain text
#: tsum.text:69
@@ -202,11 +191,9 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"یک ایمیل به <gettor(a)torproject.org> بزنید و در بدنهی آن کلمات زیر را "
-"بنویسید:"
#. type: Plain text
#: tsum.text:75
@@ -356,13 +343,9 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"خروجی باید بگوید *\"Good signature\"*. یک امضای بد یعنی فایل ممکن است "
-"دستکاری شده باشد. اگر شما یه امضای بد دیدید، جزییات این که فایل را از کجا "
-"دانلود کردید، چگونه امضا را بررسی کردید، و خروجی GnuPG را به نشانی "
-"<community-support(a)lists.torproject.org> ایمیل بزنید."
#. type: Plain text
#: tsum.text:133
@@ -498,12 +481,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"اگر شما برای این که بفهمید چرا تور متصل نمیشود، مشکل داشتید، یک ایمیل به "
-"<community-support(a)lists.torproject.org> بفرستید و در آن قسمت مربوطه از فایل"
-" لاگ را قرار دهید."
#. type: Plain text
#: tsum.text:189
@@ -511,18 +491,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### چگونه یک پل پیدا کنیم برای استفاده از یک پل، شما ابتدا باید یک پل را "
-"مکانیابی کنید؛ برای این کار میتوانید به "
-"[bridges.torproject.org](https://bridges.torproject.org/) بروید یا این که یک"
-" ایمیل به <bridges(a)torproject.org> بفرستید. اگر میخواهید ایمیل ارسال کنید* "
-"اطمینان حاصل کنید که در قسمت بدنهی ایمیل، کلمهی **get bridges** را "
-"نوشتهاید. بدون این، شما پاسخی دریافت نخواهید کرد. به این نکته توجه کنید که "
-"لازم است شما این ایمیل را از آدرسهای جیمیل یا یاهو بفرستید."
#. type: Plain text
#: tsum.text:194
@@ -612,11 +585,8 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
-"سوالات متداول. این قسمت به برخی از سوالات بسیار متداول و مشترک پاسخ خواهد "
-"داد. اگر سوال شما در این جا ذکر نشده بود، لطفا به <community-"
-"support(a)lists.torproject.org> ایمیل بزنید."
#. type: Plain text
#: tsum.text:230
diff --git a/fr/tsum.po b/fr/tsum.po
index d25cae2..7906e6a 100644
--- a/fr/tsum.po
+++ b/fr/tsum.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:50+0000\n"
-"Last-Translator: Pouknouki <pouknouki(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,14 +34,9 @@ msgstr "# Manuel Utilisateur Simple"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Ce manuel utilisateur contient des indications pour le téléchargement de "
-"Tor, son utilisation et sur ce qu'il faut faire si Tor n'est plus en mesure "
-"de se connecter au réseau. Si vous ne trouvez de réponse à vos questions "
-"dans ce document, alors envoyez un mail à <-community-"
-"support(a)lists.torproject.org>. "
#. type: Plain text
#: tsum.text:9
@@ -150,13 +145,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Comment obtenir Tor par email? Pour recevoir le package en langue "
-"anglaise du Navigateur Tor compatible windows, il faut envoyer un email à "
-"<gettor(a)torproject.org> avec **windows** dans le corps du message. Vous "
-"pouvez laisser le sujet vide. "
#. type: Plain text
#: tsum.text:53
@@ -186,14 +177,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**Note**; Les packages navigateur Tor pour Linux et Mac OS X sont assez "
-"volumineux, et vous n'aurez pas la possibilité de recevoir l'archive sur un "
-"compte Gmail, Hotmail ou Yahoo. SI vous ne pouvez pas recevoir le package "
-"désiré, envoyez un email à <community-support(a)lists.torproject.org> et nous "
-"vous communiquerons une liste de sites web miroirs à utiliser. \n"
#. type: Plain text
#: tsum.text:69
@@ -213,11 +199,9 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Envoyez un e-mail à <gettor(a)torproject.org> avec les mots suivants dans le "
-"corps de l'e-mail:"
#. type: Plain text
#: tsum.text:75
@@ -372,14 +356,9 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Si tout est bon \"signature correcte\" devrait s'afficher. Une signature "
-"incorrecte signifie que le fichier a peut être été falsifié ou corrompu. Si "
-"vous avez une signature incorrecte, envoyez les informations concernant le "
-"site de téléchargement, le méthode de vérification de la signature et le "
-"résultat de GnuPG par email à <community-support(a)lists.torproject.org>"
#. type: Plain text
#: tsum.text:133
@@ -520,12 +499,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"Si vous avez besoin d'aide pour comprendre pourquoi Tor ne peut pas se "
-"connecter, envoyez un mail à <community-support(a)lists.torproject.org> et "
-"joignez les informations pertinentes du fichier de log"
#. type: Plain text
#: tsum.text:189
@@ -533,18 +509,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### Comment trouver une passerelle, comment utiliser un passerelle. Vous "
-"devrez tout d'abord en localiser une. Vous pouvez soit vous rendre à "
-"l'adresse [bridges.torproject.org](https://bridges.torproject.org/), soit "
-"envoyez un mail à <bridges(a)torproject.org>. Si vous envoyez un mail, assurez"
-" s'il vous plait d'indiquer **get bridges** dans le corps du mail. Sans "
-"cela, vous n'obtiendrez pas de réponse. Notez que vous devez envoyer cet "
-"email depuis une adresse gmail.com soit depuis une adresse yahoo.com."
#. type: Plain text
#: tsum.text:194
@@ -637,12 +606,8 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
-"## Questions Fréquemment Posées. Cette section vous apportera des réponses à"
-" la plupart des questions habituelles. Si vous question n'est pas mentionnée"
-" ici, envoyez s'il vous plait un email à <community-"
-"support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:230
diff --git a/hu/tsum.po b/hu/tsum.po
index 787f9ca..50811b7 100644
--- a/hu/tsum.po
+++ b/hu/tsum.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:29+0000\n"
-"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,14 +28,9 @@ msgstr "# Rövid Felhasználói kézikönyv"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Ez a kézikönyv információkat nyújt a Tor letöltéséről, használatáról és "
-"azokról a teendőkről, amit akkor kell végrehajtania, ha a Tor nem tud "
-"csatlakozni a hálózathoz. Ha nem találja kérdésre a választ ebben a "
-"dokumentumban, akkor írjon levelet a <community-"
-"support(a)lists.torproject.org> címre."
#. type: Plain text
#: tsum.text:9
@@ -141,12 +136,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Hogyan szerezheti be a Tor-t emailben Ahhoz, hogy emailben kapja meg az "
-"angol Tor Böngésző csomagot, küldjön egy emailt a <gettor(a)torproject.org> "
-"címre **windows** szöveggel a levél törzsében. A tárgy üres maradhat."
#. type: Plain text
#: tsum.text:53
@@ -175,14 +167,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**Megjegyzés**: A Tor böngésző csomag Linux és Mac OS X verziója igen nagy, "
-"és nem fogja megkapni ezt Gmail, Hotmail vagy Yahoo címre. Ha nem tudja "
-"beszerezni a csomagot,írjon egy emailt a <community-"
-"support(a)lists.torproject.org> címre, és küldünk egy listát arról, hogy "
-"milyen weboldal tükröket használhat.\n"
#. type: Plain text
#: tsum.text:69
@@ -201,11 +188,9 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Küldjön egy emailt a <gettor(a)torproject.org> címre a következő tartalommal "
-"az email törzsében:"
#. type: Plain text
#: tsum.text:75
@@ -361,14 +346,9 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"A kimenet azt kell mondja, hogy *\"Good signature\"* (jó aláírás). Egy hibás"
-" aláírás azt jelentheti, hogy a csomag megváltoztatásra került, vagy "
-"megsérült. Ha hibás aláírást lát, akkor küldje el a részleteket arról, hogy "
-"honnan töltötte le a csomagot, hogyan ellenőrizte, és a kimenetét a GnuPG "
-"programnak, a a <community-support(a)lists.torproject.org> email címre."
#. type: Plain text
#: tsum.text:133
@@ -505,12 +485,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"Ha segítségre van szüksége, hogy a Tor miért nem tud kapcsolódni, írjon egy "
-"emailt a <community-support(a)lists.torproject.org> címre, és rakja bele a "
-"lényeges részeit a levélbe a log állománynak."
#. type: Plain text
#: tsum.text:189
@@ -518,18 +495,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### Hogyan találjon Hídkapcsolati Eloszót A Tor Hidak használatához először"
-" találnia kell egyet; vagy nézze meg a "
-"[bridges.torproject.org](https://bridges.torproject.org/) weboldalt, vagy "
-"küldjön egy emailt a <bridges(a)torproject.org>. Ha email küld, legyen biztos "
-"benne, hogy a levél szövege tartalmazza a **get bridges** (magyarul: hidak "
-"lekérése) szöveget a levél törzsében. E nélkül nem fog választ kapni. "
-"Fontos, hogy ezt az emailt gmail.com vagy yahoo.com címről kell küldenie."
#. type: Plain text
#: tsum.text:194
@@ -621,11 +591,8 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
-"## Gyakran feltett kérdések Ez a szakasz a leggyakoribb kérdések "
-"tartalmazza. Ha kérdése nincs itt említve, kérjük küldjön egy emailt a "
-"<community-support(a)lists.torproject.org> címre."
#. type: Plain text
#: tsum.text:230
diff --git a/it/tsum.po b/it/tsum.po
index 504c69f..a8c8a1e 100644
--- a/it/tsum.po
+++ b/it/tsum.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -108,8 +108,8 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
#. type: Plain text
@@ -134,7 +134,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -151,8 +151,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -273,8 +273,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -373,8 +373,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -383,7 +383,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -454,7 +454,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/nl/tsum.po b/nl/tsum.po
index aca296c..6b8fc2b 100644
--- a/nl/tsum.po
+++ b/nl/tsum.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <runa.sandvik(a)gmail.com>, 2011.
# Shondoit Walker <shondoit+transifex(a)gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 14:00+0000\n"
-"Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:41+0000\n"
+"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,13 +29,13 @@ msgstr "# De Korte Gebruikershandleiding"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
"Deze gebruikershandleiding bevat informatie over hoe Tor te downloaden, hoe "
"het te gebruiken en wat te doen als Tor geen verbinding kan maken. Als je "
"geen antwoord op je vraag kunt vinden in dit document, stuur dan een e-mail "
-"naar <community-support(a)lists.torproject.org>."
+"naar community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:9
@@ -141,11 +142,11 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Hoe Tor via e-mail te ontvangen\n"
-"Om de Engelse Tor Browser Bundle voor Windows te ontvangen, stuur een email naar <gettor(a)torproject.org> met **windows** in de body van het bericht. Je kan het onderwerp leeg laten."
+"### Hoe Tor via e-mail te ontvangen Om de Engelse Tor Browser Bundle voor "
+"Windows te ontvangen, stuur een email naar gettor(a)torproject.org "
#. type: Plain text
#: tsum.text:53
@@ -174,13 +175,13 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
"**Noot**: De Tor Browser Bundle voor Linux en Mac OS X zijn vrij groot en je"
" kunt deze bundels niet ontvangen met een Gmail, Hotmail of Yahoo account. "
"Als je de bundel die je wilt niet kunt ontvangen, stuur een e-mail naar "
-"<community-support(a)lists.torproject.org> en we sturen je dan een lijst met "
+"community-support(a)lists.torproject.org en we sturen je dan een lijst met "
"website mirrors om te gebruiken.\n"
#. type: Plain text
@@ -198,11 +199,10 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
-"Stuur en e-mail naar <gettor(a)torproject.org> met de volgende woorden in de "
-"body van de e-mail:"
+"Stuur en e-mail naar gettor(a)torproject.org met de volgende woorden in de "
#. type: Plain text
#: tsum.text:75
@@ -354,14 +354,14 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
-"De uitvoer zou *\"Good signature\"* moeten zijn. Een verkeerde handtekening "
-"betekent dat er mogelijk met het bestand geknoeid is. Als je een verkeerde "
-"handtekening tegenkomt, stuur dan details, waar je het pakket gedownload "
-"hebt, hoe je de handtekening geverifieerd hebt en de uitvoer van GnuPG in "
-"een e-mail naar <community-support(a)lists.torproject.org>."
+"De uitvoer zou *\\\"Good signature\\\"* moeten zijn. Een verkeerde "
+"handtekening betekent dat er mogelijk met het bestand geknoeid is. Als je "
+"een verkeerde handtekening tegenkomt, stuur dan details, waar je het pakket "
+"gedownload hebt, hoe je de handtekening geverifieerd hebt en de uitvoer van "
+"GnuPG in een e-mail naar community-support(a)lists.torproject.org."
#. type: Plain text
#: tsum.text:133
@@ -493,12 +493,9 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
-"Als je hulp nodig hebt met uitzoeken waarom Tor geen verbinding kan krijgen,"
-" stuur dan een e-mail naar <community-support(a)lists.torproject.org> en voeg "
-"de relevante delen van de log toe."
#. type: Plain text
#: tsum.text:189
@@ -506,13 +503,11 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
msgstr ""
-"### Hoe een bridge te vinden\n"
-"Om een bridge te gebruiken moet je er eerst één vinden; je kunt naar [bridges.torproject.org](https://bridges.torproject.org/) gaan, of je kunt een email sturen naar <bridges(a)torproject.org>. Als je een e-mail stuurt, zorg er dan voor dat je **get bridges** in de body van de e-mail zet. Zonder dit krijg je geen bericht terug. Let op dat je deze e-mail van, of een gmail.com adres, of een yahoo.com adres moet sturen."
#. type: Plain text
#: tsum.text:194
@@ -595,10 +590,8 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
-"## Veelgestelde vragen\n"
-"Dit onderdeel zal een paar van de meest gestelde vragen beantwoorden. Als je vraag hier niet genoemd wordt, stuur dan een e-mail naar <community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:230
diff --git a/pt/tsum.po b/pt/tsum.po
index e473511..7cdc6e7 100644
--- a/pt/tsum.po
+++ b/pt/tsum.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -28,13 +28,9 @@ msgstr "# O pequeno manual do usuário"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
-"Este manual do usuário contém informações sobre como baixar o Tor, como usá-"
-"lo e o que fazer se o Tor não estiver se conectando a rede. Se você não "
-"conseguir encontrar a resposta para a sua pergunta neste documento, envie um"
-" e-mail para <community-support(a)lists.torproject.org>."
#. type: Plain text
#: tsum.text:9
@@ -139,12 +135,9 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
-"### Como obter o Tor por e-mail para receber o Pacote de Navegação Tor "
-"Inglês para Windows, envie um e-mail para <gettor(a)torproject.org> com "
-"**windows** no corpo da mensagem. Você pode deixar o assunto em branco."
#. type: Plain text
#: tsum.text:53
@@ -174,14 +167,9 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
-"**Note**: Os Pacotes de Navegação Tor para linux e Mac OS X são maiores, e "
-"você não poderá receber nenhum desses pacotes com uma conta Gmail, Hotmail "
-"ou do Yahoo. Se você não conseguir receber o pacote que você deseja, envie "
-"um e-mail para <community-support(a)lists.torproject.org> e nós lhe daremos "
-"uma liste de websites espelhos para utilizar.\n"
#. type: Plain text
#: tsum.text:69
@@ -196,8 +184,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -343,8 +331,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -443,8 +431,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -453,7 +441,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -524,7 +512,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/ru/tsum.po b/ru/tsum.po
index 33785a4..eefb833 100644
--- a/ru/tsum.po
+++ b/ru/tsum.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -108,8 +108,8 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
#. type: Plain text
@@ -134,7 +134,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -151,8 +151,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -273,8 +273,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -373,8 +373,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -383,7 +383,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -454,7 +454,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
diff --git a/zh/tsum.po b/zh/tsum.po
index 360105c..9d33fdc 100644
--- a/zh/tsum.po
+++ b/zh/tsum.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-10-15 14:16+0200\n"
-"PO-Revision-Date: 2011-10-15 13:20+0000\n"
+"POT-Creation-Date: 2011-10-17 13:23+0200\n"
+"PO-Revision-Date: 2011-10-17 12:25+0000\n"
"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgstr "#短的用户手册"
msgid ""
"This user manual contains information about how to download Tor, how to use "
"it, and what to do if Tor is unable to connect to the network. If you can't "
-"find the answer to your question in this document, email <community-"
-"support(a)lists.torproject.org>."
+"find the answer to your question in this document, email community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -109,8 +109,8 @@ msgstr ""
#: tsum.text:49
msgid ""
"### How to get Tor via email To receive the English Tor Browser Bundle for "
-"Windows, send an email to <gettor(a)torproject.org> with **windows** in the "
-"body of the message. You can leave the subject blank."
+"Windows, send an email to gettor(a)torproject.org with **windows** in the body"
+" of the message. You can leave the subject blank."
msgstr ""
#. type: Plain text
@@ -135,7 +135,7 @@ msgid ""
"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n"
"large, and you will not be able to receive any of these bundles with a\n"
"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n"
-"want, send an email to <community-support(a)lists.torproject.org> and we\n"
+"want, send an email to community-support(a)lists.torproject.org and we\n"
"will give you a list of website mirrors to use.\n"
msgstr ""
@@ -152,8 +152,8 @@ msgstr ""
#. type: Plain text
#: tsum.text:72
msgid ""
-"Send an email to <gettor(a)torproject.org> with the following words in the "
-"body of the email:"
+"Send an email to gettor(a)torproject.org with the following words in the body "
+"of the email:"
msgstr ""
#. type: Plain text
@@ -274,8 +274,8 @@ msgid ""
"The output should say *\"Good signature\"*. A bad signature means that the "
"file may have been tampered with. If you see a bad signature, send details "
"about where you downloaded the package from, how you verified the signature,"
-" and the output from GnuPG in an email to <community-"
-"support(a)lists.torproject.org>."
+" and the output from GnuPG in an email to community-"
+"support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
@@ -374,8 +374,8 @@ msgstr ""
#: tsum.text:181
msgid ""
"If you need help with figuring out why Tor can't connect, send an email to "
-"<community-support(a)lists.torproject.org> and include the relevant parts from"
-" the log file."
+"community-support(a)lists.torproject.org and include the relevant parts from "
+"the log file."
msgstr ""
#. type: Plain text
@@ -384,7 +384,7 @@ msgid ""
"### How to find a bridge To use a bridge, you will first have to locate one;"
" you can either browse to "
"[bridges.torproject.org](https://bridges.torproject.org/), or you can send "
-"an email to <bridges(a)torproject.org>. If you do send an email, please make "
+"an email to bridges(a)torproject.org. If you do send an email, please make "
"sure that you write **get bridges** in the body of the email. Without this, "
"you will not get a reply. Note that you need to send this email from either "
"a gmail.com or a yahoo.com address."
@@ -455,7 +455,7 @@ msgstr ""
msgid ""
"## Frequently Asked Questions This section will answer some of the most "
"common questions. If your question is not mentioned here, please send an "
-"email to <community-support(a)lists.torproject.org>."
+"email to community-support(a)lists.torproject.org."
msgstr ""
#. type: Plain text
1
0
[flashproxy/master] Add notes on using an SSH proxy so they don't get lost.
by dcf@torproject.org 17 Oct '11
by dcf@torproject.org 17 Oct '11
17 Oct '11
commit 891da0b80d5f0d35bff64ef28842ef879f10f395
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun Oct 16 21:08:41 2011 -0700
Add notes on using an SSH proxy so they don't get lost.
---
notes.txt | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/notes.txt b/notes.txt
index 928b921..61babdc 100644
--- a/notes.txt
+++ b/notes.txt
@@ -15,3 +15,13 @@ a bridge with a lifetime randomly chosen from some distribution. (For
example: "simulate proxies connecting according to this Poisson
distribution and staying connected according to this exponential
distribution.")
+
+== How to use with an SSH proxy
+
+Start swfcat, giving it a relay parameter pointing to your SSH server.
+ http://example.com/swfcat.swf?facilitator=<facilitator_addr>:<facilitator_port>&relay=<ssh_addr>:<ssh_port>
+Start the connector.
+ python connector.py -f <facilitator_addr:facilitator_port>
+Start SSH, giving it a proxy command to connect through the connector.
+ ssh -v -N -D 1080 <ssh_addr> -p <ssh_port> \
+ -o 'ProxyCommand=socat - SOCKS4A:localhost:dummy:0,socksport=9001'
1
0
commit 65dd54c4ed90480b563c3fdecdc88ca8feeb8410
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun Oct 16 21:19:23 2011 -0700
Say "output" not "logs."
These commands can produce logs but here we're specifically talking
about stdout.
---
README | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/README b/README
index 6db4ee0..1b616e0 100644
--- a/README
+++ b/README
@@ -71,7 +71,7 @@ ephemeral proxies.
2. Run Tor using the included torrc file.
$ tor -f flashproxy/torrc
-Watch the logs of connector.py and tor. From connector.py you are
+Watch the output of connector.py and tor. From connector.py you are
expecting output lines like this:
Remote connection from XXX.XXX.XXX.XXX:YYYYY.
Local connection from 127.0.0.1:ZZZZZ.
1
0
commit 460ad063aaa7b703b16f54fc1b2734181d2cfa46
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun Oct 16 19:56:36 2011 -0700
Alphabetize imports.
It's shocking how badly I do this manually.
---
swfcat.as | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/swfcat.as b/swfcat.as
index e7afed1..b1dabc1 100644
--- a/swfcat.as
+++ b/swfcat.as
@@ -3,18 +3,18 @@ package
import flash.display.Sprite;
import flash.display.StageAlign;
import flash.display.StageScaleMode;
+ import flash.events.Event;
+ import flash.events.IOErrorEvent;
+ import flash.events.SecurityErrorEvent;
import flash.external.ExternalInterface;
- import flash.text.TextField;
- import flash.text.TextFormat;
import flash.net.Socket;
import flash.net.URLLoader;
import flash.net.URLLoaderDataFormat;
import flash.net.URLRequest;
import flash.net.URLRequestMethod;
import flash.net.URLVariables;
- import flash.events.Event;
- import flash.events.IOErrorEvent;
- import flash.events.SecurityErrorEvent;
+ import flash.text.TextField;
+ import flash.text.TextFormat;
import flash.utils.setTimeout;
public class swfcat extends Sprite
@@ -333,8 +333,8 @@ package
import flash.events.MouseEvent;
import flash.net.navigateToURL;
import flash.net.URLRequest;
-import flash.text.TextFormat;
import flash.text.TextField;
+import flash.text.TextFormat;
import flash.utils.getTimer;
class Badge extends flash.display.Sprite
1
0
commit 6bbbf95b1b5203c2de36e339e6c474062376967a
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun Oct 16 19:34:58 2011 -0700
Whitespace consistency.
---
flashproxy.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flashproxy.js b/flashproxy.js
index fea72f9..a16edb3 100644
--- a/flashproxy.js
+++ b/flashproxy.js
@@ -103,7 +103,7 @@ function flashproxy_make_badge()
}
/* Create and return a non-functional placeholder badge DOM fragment:
- <img src=BADGE_IMAGE_URL border="0">
+<img src=BADGE_IMAGE_URL border="0">
*/
function flashproxy_make_dummy_badge()
{
1
0
commit 613b712831be9613167fd7e47a368de4b5194e94
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun Oct 16 19:53:11 2011 -0700
Make the badge clickable.
---
swfcat.as | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/swfcat.as b/swfcat.as
index 3489bf2..e7afed1 100644
--- a/swfcat.as
+++ b/swfcat.as
@@ -330,12 +330,17 @@ package
}
}
+import flash.events.MouseEvent;
+import flash.net.navigateToURL;
+import flash.net.URLRequest;
import flash.text.TextFormat;
import flash.text.TextField;
import flash.utils.getTimer;
class Badge extends flash.display.Sprite
{
+ private const FLASHPROXY_INFO_URL:String = "https://crypto.stanford.edu/flashproxy/";
+
/* Number of proxy pairs currently connected. */
private var num_proxy_pairs:int = 0;
/* Number of proxy pairs ever connected. */
@@ -385,6 +390,8 @@ class Badge extends flash.display.Sprite
/* Update the client counter on badge. */
update_client_count();
+
+ addEventListener(MouseEvent.CLICK, mouse_clicked);
}
public function proxy_begin():void
@@ -413,6 +420,15 @@ class Badge extends flash.display.Sprite
for(var i:Number = 0; i < num_proxy_pairs; i++)
cur_client_count_tf.appendText(".");
}
+
+ /* Show a web page with detailed information when the badge is clicked. */
+ private function mouse_clicked(e:MouseEvent):void
+ {
+ try {
+ navigateToURL(new URLRequest(FLASHPROXY_INFO_URL));
+ } catch (err:Error) {
+ }
+ }
}
class RateLimit
1
0
17 Oct '11
commit 0c03d4eb2a04f71942c53caf6314c25ce66be18e
Author: Damian Johnson <atagar(a)torproject.org>
Date: Sun Oct 16 15:19:03 2011 -0700
Moving integration test init/shutdown into class
Making a Runner class which will be available to integration tests. This both
better modularizes the code and will allow for us to give runtime context to
the tests.
---
run_tests.py | 120 +++++---------------------------------------
test/integ/__init__.py | 2 +-
test/integ/runner.py | 130 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 143 insertions(+), 109 deletions(-)
diff --git a/run_tests.py b/run_tests.py
index 9e4487c..dab1c4f 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -4,18 +4,14 @@
Runs unit and integration tests.
"""
-import os
import sys
-import time
import getopt
-import signal
-import tempfile
import unittest
-import subprocess
import test.unit.message
import test.unit.version
+import test.integ.runner
-from stem.util import enum, system, term
+from stem.util import enum, term
OPT = "uit:h"
OPT_EXPANDED = ["unit", "integ", "targets=", "help"]
@@ -51,57 +47,6 @@ Runs tests for the stem library.
%s
"""
-# Number of seconds before we time out our attempt to start a tor instance
-TOR_INIT_TIMEOUT = 20
-
-def init_tor_process(torrc_dst):
- """
- Initializes and returns a tor process. This blocks until initialization
- completes or we error out.
-
- Arguments:
- torrc_dst (str) - path for a torrc configuration to use
-
- Returns:
- subprocess.Popen instance for the instantiated tor process
-
- Raises:
- OSError if we either fail to create the tor process or reached a timeout without success
- """
-
- start_time = time.time()
-
- # starts a tor subprocess, raising an OSError if it fails
- tor_process = subprocess.Popen(["tor", "-f", torrc_dst], stdout = subprocess.PIPE, stderr = subprocess.PIPE)
-
- # time ourselves out if we reach TOR_INIT_TIMEOUT
- def timeout_handler(signum, frame):
- # terminates the uninitialized tor process and raise on timeout
- tor_process.kill()
- raise OSError("unable to start tor: reached a %i second timeout without success" % TOR_INIT_TIMEOUT)
-
- signal.signal(signal.SIGALRM, timeout_handler)
- signal.alarm(TOR_INIT_TIMEOUT)
-
- print term.format("Starting tor...", term.Color.BLUE, term.Attr.BOLD)
-
- while True:
- init_line = tor_process.stdout.readline().strip()
-
- # this will provide empty results if the process is terminated
- if not init_line:
- tor_process.kill() # ... but best make sure
- raise OSError("tor process terminated")
-
- print term.format(" %s" % init_line, term.Color.BLUE)
-
- # return the process if we're done with bootstrapping
- if init_line.endswith("Bootstrapped 100%: Done."):
- print term.format(" done (%i seconds)" % (time.time() - start_time), term.Color.BLUE, term.Attr.BOLD)
- print
-
- return tor_process
-
if __name__ == '__main__':
run_unit_tests = False
run_integ_tests = False
@@ -160,62 +105,21 @@ if __name__ == '__main__':
print
if run_integ_tests:
- # TODO: check if there's already a tor instance running
-
print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER)
- print term.format("Setting up a test instance...", term.Color.BLUE, term.Attr.BOLD)
+ integ_runner = test.integ.runner.Runner()
- # makes a temporary directory for the runtime resources of our integ test
- test_dir = tempfile.mktemp("-stem-integ")
-
- try:
- os.makedirs(test_dir)
- print term.format(" created test directory: %s" % test_dir, term.Color.BLUE, term.Attr.BOLD)
- except OSError, exc:
- print term.format("Unable to make testing directory: %s" % exc, term.Color.RED, term.Attr.BOLD)
- sys.exit(1)
-
- # makes a basic torrc for the integration tests to run against
- torrc_contents = """# basic integration testing configuration
-DataDirectory %s
-ControlPort 9051
-""" % test_dir
-
- # writes our testing torrc
- torrc_dst = os.path.join(test_dir, "torrc")
- try:
- torrc_file = open(torrc_dst, "w")
- torrc_file.write(torrc_contents)
- torrc_file.close()
-
- print term.format(" wrote torrc: %s" % torrc_dst, term.Color.BLUE, term.Attr.BOLD)
-
- for line in torrc_contents.split("\n"):
- print term.format(" %s" % line.strip(), term.Color.BLUE)
- except Exception, exc:
- print term.format("Unable to write testing torrc: %s" % exc, term.Color.RED, term.Attr.BOLD)
- sys.exit(1)
-
- # starts a tor instance
try:
- tor_process = init_tor_process(torrc_dst)
- except OSError, exc:
- print term.format("Unable to start a tor instance: %s" % exc, term.Color.RED, term.Attr.BOLD)
- sys.exit(1)
+ integ_runner.run_setup()
+ integ_runner.start()
- print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD)
- print
-
- # TODO: run tests
-
- print term.format("Shutting down tor...", term.Color.BLUE, term.Attr.BOLD)
- tor_process.kill()
- print term.format(" done", term.Color.BLUE, term.Attr.BOLD)
-
-
-
-
+ # TODO: run tests
+ print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD)
+ print
+ except OSError:
+ pass
+ finally:
+ integ_runner.stop()
# TODO: we might do target selection later but for now we should simply
# work with a single simple tor instance and see how it works out
diff --git a/test/integ/__init__.py b/test/integ/__init__.py
index b96692a..ecfc9cd 100644
--- a/test/integ/__init__.py
+++ b/test/integ/__init__.py
@@ -2,5 +2,5 @@
Integration tests for the stem library.
"""
-__all__ = []
+__all__ = ["runner"]
diff --git a/test/integ/runner.py b/test/integ/runner.py
new file mode 100644
index 0000000..207c2e3
--- /dev/null
+++ b/test/integ/runner.py
@@ -0,0 +1,130 @@
+"""
+Starts and stops test instances for integration tests.
+"""
+
+import os
+import sys
+import time
+import signal
+import tempfile
+import subprocess
+
+from stem.util import term
+
+# number of seconds before we time out our attempt to start a tor instance
+TOR_INIT_TIMEOUT = 30
+
+BASIC_TORRC = """# configuration for stem integration tests
+DataDirectory %s
+ControlPort 1111
+"""
+
+class Runner:
+ def __init__(self):
+ self._test_dir = tempfile.mktemp("-stem-integ")
+ self._torrc_contents = BASIC_TORRC % self._test_dir
+ self._tor_process = None
+
+ def run_setup(self):
+ """
+ Makes a temporary directory for the runtime resources of our integ tests.
+
+ Raises:
+ OSError if unsuccessful
+ """
+
+ print term.format("Setting up a test instance...", term.Color.BLUE, term.Attr.BOLD)
+
+ # makes a temporary directory for the runtime resources of our integ test
+ try:
+ sys.stdout.write(term.format(" making test directory (%s)... " % self._test_dir, term.Color.BLUE, term.Attr.BOLD))
+ os.makedirs(self._test_dir)
+ sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD))
+ except OSError, exc:
+ sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD))
+ raise exc
+
+ # writes our testing torrc
+ torrc_dst = os.path.join(self._test_dir, "torrc")
+ try:
+ sys.stdout.write(term.format(" writing torrc (%s)... " % torrc_dst, term.Color.BLUE, term.Attr.BOLD))
+
+ torrc_file = open(torrc_dst, "w")
+ torrc_file.write(self._torrc_contents)
+ torrc_file.close()
+
+ sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD))
+
+ for line in self._torrc_contents.strip().split("\n"):
+ print term.format(" %s" % line.strip(), term.Color.BLUE)
+ except Exception, exc:
+ sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD))
+ raise exc
+ finally:
+ print # extra newline
+
+ def start(self):
+ """
+ Initializes a tor process. This blocks until initialization completes or we
+ error out.
+
+ Raises:
+ OSError if we either fail to create the tor process or reached a timeout
+ without success
+ """
+
+ print term.format("Starting tor...", term.Color.BLUE, term.Attr.BOLD)
+ start_time = time.time()
+
+ try:
+ # terminate our previous instance before continuing if we had one
+ if self._tor_process: self._tor_process.kill()
+
+ # double check that we have a torrc to work with
+ torrc_dst = os.path.join(self._test_dir, "torrc")
+ if not os.path.exists(torrc_dst):
+ raise OSError("torrc doesn't exist (%s)" % torrc_dst)
+
+ # starts a tor subprocess, raising an OSError if it fails
+ self._tor_process = subprocess.Popen(["tor", "-f", torrc_dst], stdout = subprocess.PIPE, stderr = subprocess.PIPE)
+
+ # time ourselves out if we reach TOR_INIT_TIMEOUT
+ def timeout_handler(signum, frame):
+ # terminates the uninitialized tor process and raise on timeout
+ self._tor_process.kill()
+ raise OSError("reached a %i second timeout without success" % TOR_INIT_TIMEOUT)
+
+ signal.signal(signal.SIGALRM, timeout_handler)
+ signal.alarm(TOR_INIT_TIMEOUT)
+
+ while True:
+ init_line = self._tor_process.stdout.readline().strip()
+
+ # this will provide empty results if the process is terminated
+ if not init_line:
+ self._tor_process.kill() # ... but best make sure
+ raise OSError("process terminated")
+
+ print term.format(" %s" % init_line, term.Color.BLUE)
+
+ # return the process if we're done with bootstrapping
+ if init_line.endswith("Bootstrapped 100%: Done."):
+ print term.format(" done (%i seconds)" % (time.time() - start_time), term.Color.BLUE, term.Attr.BOLD)
+ return
+ except OSError, exc:
+ print term.format(" failed to start tor: %s" % exc, term.Color.RED, term.Attr.BOLD)
+ raise exc
+ finally:
+ print # extra newline
+
+ def stop(self):
+ """
+ Terminates our tor instance.
+ """
+
+ if self._tor_process:
+ sys.stdout.write(term.format("Shutting down tor... ", term.Color.BLUE, term.Attr.BOLD))
+ self._tor_process.kill()
+ sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD))
+ print # extra newline
+
1
0
17 Oct '11
commit 3731bba464e22dc5501b7b9ae62c29ebc34ad7ba
Author: Damian Johnson <atagar(a)torproject.org>
Date: Sun Oct 16 17:27:57 2011 -0700
Adding BSD compatability to system.is_running
Copying over an arm fix I made earlier this week from
util.torTools.isTorRunning so that it would work on OSX/FreeBSD/OpenBSD.
---
stem/util/system.py | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/stem/util/system.py b/stem/util/system.py
index 3c520e8..bdada9b 100644
--- a/stem/util/system.py
+++ b/stem/util/system.py
@@ -61,7 +61,27 @@ def is_running(command, suppress_exc = True):
OSError if this can't be determined and suppress_exc is False
"""
- command_listing = call("ps -A co command")
+ # Linux and the BSD families have different variants of ps. Guess based on
+ # os.uname() results which to try first, then fall back to the other.
+ #
+ # Linux
+ # -A - Select all processes. Identical to -e.
+ # -co command - Shows just the base command.
+ #
+ # Mac / BSD
+ # -a - Display information about other users' processes as well as
+ # your own.
+ # -o ucomm= - Shows just the ucomm attribute ("name to be used for
+ # accounting")
+
+ primary_resolver, secondary_resolver = "ps -A co command", "ps -ao ucomm="
+
+ if os.uname()[0] in ("Darwin", "FreeBSD", "OpenBSD"):
+ primary_resolver, secondary_resolver = secondary_resolver, primary_resolver
+
+ command_listing = call(primary_resolver)
+ if not command_listing:
+ command_listing = call(secondary_resolver)
if command_listing:
return command in command_listing
1
0
17 Oct '11
commit 1a30fbd6526b243468a6ca92f0223eb84ff9b21b
Author: Damian Johnson <atagar(a)torproject.org>
Date: Sun Oct 16 17:19:01 2011 -0700
Integration tests for stem.util.system functions
Very, very basic tests that the tor process is running and available.
---
run_tests.py | 13 +++++++++++--
test/integ/runner.py | 12 ++++++++++++
test/integ/system.py | 32 ++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/run_tests.py b/run_tests.py
index dab1c4f..4f3eee7 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -10,6 +10,7 @@ import unittest
import test.unit.message
import test.unit.version
import test.integ.runner
+import test.integ.system
from stem.util import enum, term
@@ -17,11 +18,14 @@ OPT = "uit:h"
OPT_EXPANDED = ["unit", "integ", "targets=", "help"]
DIVIDER = "=" * 70
-# (name, class) tuples for all of our unit tests
+# (name, class) tuples for all of our unit and integration tests
UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctions),
("stem.types.Version", test.unit.version.TestVerionFunctions),
)
+INTEG_TESTS = (("stem.util.system", test.integ.system.TestSystemFunctions),
+ )
+
# Configurations that the intergration tests can be ran with. Attributs are
# tuples of the test runner and description.
TARGETS = enum.Enum(*[(v, v) for v in ("NONE", "NO_CONTROL", "NO_AUTH", "COOKIE", "PASSWORD", "SOCKET")])
@@ -113,8 +117,13 @@ if __name__ == '__main__':
integ_runner.run_setup()
integ_runner.start()
- # TODO: run tests
print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD)
+ for name, test_class in INTEG_TESTS:
+ print "%s\n%s\n%s\n" % (DIVIDER, name, DIVIDER)
+ suite = unittest.TestLoader().loadTestsFromTestCase(test_class)
+ unittest.TextTestRunner(verbosity=2).run(suite)
+ print
+
print
except OSError:
pass
diff --git a/test/integ/runner.py b/test/integ/runner.py
index 207c2e3..4805c20 100644
--- a/test/integ/runner.py
+++ b/test/integ/runner.py
@@ -127,4 +127,16 @@ class Runner:
self._tor_process.kill()
sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD))
print # extra newline
+
+ def get_pid(self):
+ """
+ Provides the process id of tor.
+
+ Returns:
+ int pid for the tor process, or None if it isn't running
+ """
+
+ if self._tor_process:
+ return self._tor_process.pid
+ else: return None
diff --git a/test/integ/system.py b/test/integ/system.py
new file mode 100644
index 0000000..6b38615
--- /dev/null
+++ b/test/integ/system.py
@@ -0,0 +1,32 @@
+"""
+Unit tests for the util.system functions in the context of a tor process.
+"""
+
+import unittest
+
+from stem.util import system
+
+class TestSystemFunctions(unittest.TestCase):
+ """
+ Tests the util.system functions against the tor process that we're running.
+ """
+
+ def test_is_available(self):
+ """
+ Checks the util.system.is_available function.
+ """
+
+ # since we're running tor it would be kinda sad if this didn't detect it
+ self.assertTrue(system.is_available("tor"))
+
+ # but it would be kinda weird if this did...
+ self.assertFalse(system.is_available("blarg_and_stuff"))
+
+ def test_is_running(self):
+ """
+ Checks the util.system.is_running function.
+ """
+
+ self.assertTrue(system.is_running("tor"))
+ self.assertFalse(system.is_running("blarg_and_stuff"))
+
1
0