[or-cvs] r21400: {projects} Multilang help mail #1 & Smaller strings for pootle (in projects/gettor: i18n/templates lib/gettor)
Christian Fromme
kaner at strace.org
Mon Jan 11 19:46:05 UTC 2010
Author: kaner
Date: 2010-01-11 19:46:03 +0000 (Mon, 11 Jan 2010)
New Revision: 21400
Modified:
projects/gettor/i18n/templates/gettor.pot
projects/gettor/lib/gettor/constants.py
projects/gettor/lib/gettor/responses.py
Log:
Multilang help mail #1 & Smaller strings for pootle
Modified: projects/gettor/i18n/templates/gettor.pot
===================================================================
--- projects/gettor/i18n/templates/gettor.pot 2010-01-11 14:51:40 UTC (rev 21399)
+++ projects/gettor/i18n/templates/gettor.pot 2010-01-11 19:46:03 UTC (rev 21400)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 14:54-0500\n"
+"POT-Creation-Date: 2010-01-04 19:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,65 +16,126 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/gettor/constants.py:17
+#: lib/gettor/constants.py:151
msgid ""
"\n"
-" Hello! This is the \"GetTor\" robot.\n"
+" Hello, This is the \"GetTor\" robot.\n"
"\n"
+" Thank you for your request.\n"
+"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:157
+msgid ""
+"\n"
" Unfortunately, we won't answer you at this address. You should make\n"
" an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
" one of those.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:163
+msgid ""
+"\n"
" We only process requests from email services that support \"DKIM\",\n"
" which is an email feature that lets us verify that the address in the\n"
" \"From\" line is actually the one who sent the mail.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:169
+msgid ""
+"\n"
" (We apologize if you didn't ask for this mail. Since your email is from\n"
" a service that doesn't use DKIM, we're sending a short explanation,\n"
" and then we'll ignore this email address for the next day or so.)\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:175
+msgid ""
+"\n"
" Please note that currently, we can't process HTML emails or base 64\n"
" mails. You will need to send plain text.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:181 lib/gettor/constants.py:261
+msgid ""
+"\n"
" If you have any questions or it doesn't work, you can contact a\n"
" human at this support email address: tor-assistants at torproject.org\n"
-" "
+"\n"
+" "
msgstr ""
-#: lib/gettor/constants.py:39
+#: lib/gettor/constants.py:186
msgid ""
"\n"
-" Hello, This is the \"GetTor\" robot.\n"
-"\n"
" I will mail you a Tor package, if you tell me which one you want.\n"
" Please select one of the following package names:\n"
"\n"
-" tor-browser-bundle\n"
-" macosx-i386-bundle\n"
-" macosx-ppc-bundle\n"
-" tor-im-browser-bundle\n"
-" source-bundle\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:199
+msgid ""
"\n"
" Please reply to this mail (to gettor at torproject.org), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:204
+msgid ""
+"\n"
" OBTAINING LOCALIZED VERSIONS OF TOR\n"
-" ===================================\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:211
+msgid ""
"\n"
" To get a version of Tor translated into your language, specify the\n"
" language you want in the address you send the mail to:\n"
"\n"
-" gettor+zh at torproject.org\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:220
+msgid ""
"\n"
" This example will give you the requested package in a localized\n"
" version for Chinese. Check below for a list of supported language\n"
" codes.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:226
+msgid ""
+"\n"
" List of supported locales:\n"
-" -------------------------\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:233
+msgid ""
"\n"
" Here is a list of all available languages:\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:237
+msgid ""
+"\n"
" gettor+ar at torproject.org: Arabic\n"
" gettor+de at torproject.org: German\n"
" gettor+en at torproject.org: English\n"
@@ -87,38 +148,69 @@
" gettor+ru at torproject.org: Russian\n"
" gettor+zh at torproject.org: Chinese\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:251
+msgid ""
+"\n"
" If you select no language, you will receive the English version.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:255
+msgid ""
+"\n"
" SUPPORT\n"
-" =======\n"
-"\n"
-" If you have any questions or it doesn't work, you can contact a\n"
-" human at this support email address: tor-assistants at torproject.org\n"
-"\n"
-" "
+" "
msgstr ""
-#: lib/gettor/constants.py:93
+#: lib/gettor/constants.py:266
msgid ""
"\n"
-" Hello! This is the \"GetTor\" robot.\n"
-"\n"
" Here's your requested software as a zip file. Please unzip the\n"
" package and verify the signature.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:271
+msgid ""
+"\n"
" Hint: If your computer has GnuPG installed, use the gpg\n"
" commandline tool as follows after unpacking the zip file:\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:276
+msgid ""
+"\n"
" gpg --verify <packagename>.asc <packagename>\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:280
+msgid ""
+"\n"
" The output should look somewhat like this:\n"
"\n"
-" gpg: Good signature from \"Roger Dingledine <arma at mit.edu>\"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:288
+msgid ""
"\n"
" If you're not familiar with commandline tools, try looking for\n"
" a graphical user interface for GnuPG on this website:\n"
"\n"
-" http://www.gnupg.org/related_software/frontends.html\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:297
+msgid ""
"\n"
" If your Internet connection blocks access to the Tor network, you\n"
" may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -127,108 +219,82 @@
" connections to all the known Tor relays, they probably won't be able\n"
" to block all the bridges.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:306
+msgid ""
+"\n"
" You can acquire a bridge by sending an email that contains \"get bridges"
"\"\n"
" in the body of the email to the following email address:\n"
" bridges at torproject.org\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:312
+msgid ""
+"\n"
" It is also possible to fetch bridges with a web browser at the "
"following\n"
" url: https://bridges.torproject.org/\n"
"\n"
-" If you have any questions or it doesn't work, you can contact a\n"
-" human at this support email address: tor-assistants at torproject.org\n"
-"\n"
-" "
+" "
msgstr ""
-#: lib/gettor/constants.py:132
+#: lib/gettor/constants.py:317
msgid ""
"\n"
-" Hello! This is the \"GetTor\" robot.\n"
-"\n"
-" Here's your requested software as a zip file. Please unzip the\n"
-" package and verify the signature.\n"
-"\n"
" IMPORTANT NOTE:\n"
" Since this is part of a split-file request, you need to wait for\n"
" all split files to be received by you before you can save them all\n"
" into the same directory and unpack them by double-clicking the\n"
" first file.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:325
+msgid ""
+"\n"
" Packages might come out of order! Please make sure you received\n"
" all packages before you attempt to unpack them!\n"
"\n"
-" Hint: If your computer has GnuPG installed, use the gpg\n"
-" commandline tool as follows after unpacking the zip file:\n"
-"\n"
-" gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-" The output should look somewhat like this:\n"
-"\n"
-" gpg: Good signature from \"Roger Dingledine <arma at mit.edu>\"\n"
-"\n"
-" If you're not familiar with commandline tools, try looking for\n"
-" a graphical user interface for GnuPG on this website:\n"
-"\n"
-" http://www.gnupg.org/related_software/frontends.html\n"
-"\n"
-" If your Internet connection blocks access to the Tor network, you\n"
-" may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-" are Tor relays that aren't listed in the main directory. Since there\n"
-" is no complete public list of them, even if your ISP is filtering\n"
-" connections to all the known Tor relays, they probably won't be able\n"
-" to block all the bridges.\n"
-"\n"
-" You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-" in the body of the email to the following email address:\n"
-" bridges at torproject.org\n"
-"\n"
-" It is also possible to fetch bridges with a web browser at the "
-"following\n"
-" url: https://bridges.torproject.org/\n"
-"\n"
-" If you have any questions or it doesn't work, you can contact a\n"
-" human at this support email address: tor-assistants at torproject.org\n"
-"\n"
-" "
+" "
msgstr ""
-#: lib/gettor/constants.py:180
+#: lib/gettor/constants.py:330
msgid ""
"\n"
-" Hello, This is the \"GetTor\" robot.\n"
-"\n"
" Thank you for your request. It was successfully understood. Your request "
"is\n"
" currently being processed. Your package should arrive within the next "
"ten\n"
" minutes.\n"
"\n"
+" "
+msgstr ""
+
+#: lib/gettor/constants.py:336
+msgid ""
+"\n"
" If it doesn't arrive, the package might be too big for your mail "
"provider.\n"
" Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
" try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
" since it's smaller.\n"
"\n"
-" If you have any questions or it doesn't work, you can contact a\n"
-" human at this support email address: tor-assistants at torproject.org\n"
-"\n"
-" "
+" "
msgstr ""
-#: lib/gettor/constants.py:197
+#: lib/gettor/constants.py:343
msgid ""
"\n"
-" Hello, This is the \"GetTor\" robot.\n"
-"\n"
-" Thank you for your request.\n"
-"\n"
" Unfortunately we are currently experiencing problems and we can't "
"fulfill\n"
" your request right now. Please be patient as we try to resolve this "
"issue.\n"
"\n"
-" "
+" "
msgstr ""
Modified: projects/gettor/lib/gettor/constants.py
===================================================================
--- projects/gettor/lib/gettor/constants.py 2010-01-11 14:51:40 UTC (rev 21399)
+++ projects/gettor/lib/gettor/constants.py 2010-01-11 19:46:03 UTC (rev 21400)
@@ -10,7 +10,8 @@
"""
-helpmsg = _("""
+# Giant multi language help message. Add more translations as they become ready
+multilanghelpmsg = """
Hello! This is the "GetTor" robot.
Unfortunately, we won't answer you at this address. You should make
@@ -30,40 +31,210 @@
If you have any questions or it doesn't work, you can contact a
human at this support email address: tor-assistants at torproject.org
- """)
-packagehelpmsg = _("""
+ --
+
+ Ù~EرØبا! Ø£Ù~Fا رÙ~HبÙ~Hت "اØصÙ~D عÙ~DÙ~I تÙ~Hر".
+
+ Ù~DÙ~DأسÙ~A Ù~DÙ~F Ù~Fرد عÙ~DÙ~JÙ~C عÙ~DÙ~I Ù~Gذا اÙ~DعÙ~FÙ~HاÙ~F. Ù~JتÙ~Hجب عÙ~DÙ~JÙ~C Ø£Ù~F تÙ~Fشئ
+ ØساباÙ~K عÙ~DÙ~I GMAIL.COM Ø£Ù~H YAHOO.COM Ù~HترسÙ~D رساÙ~DØ© Ø¥Ù~DÙ~CترÙ~HÙ~FÙ~JØ©
+ Ù~EÙ~F
+ Ø£ØدÙ~GÙ~Eا.
+
+ Ù~FÙ~BÙ~HÙ~E بÙ~EعاÙ~Dجة اÙ~DØ·Ù~Dبات Ù~EÙ~F خدÙ~Eات اÙ~DبرÙ~Jد اÙ~DتÙ~J تدعÙ~E "DKIM"Ø~L
+ Ù~HÙ~GÙ~J خاصة تسÙ~EØ Ù~DÙ~Fا باÙ~DتØÙ~BÙ~B Ù~EÙ~F Ø£Ù~F اÙ~DعÙ~FÙ~HاÙ~F Ù~AÙ~J
+ ØÙ~BÙ~D اÙ~DÙ~EرسÙ~D Ù~GÙ~H باÙ~DÙ~AعÙ~D Ù~EÙ~F Ù~BاÙ~E بإرساÙ~D اÙ~DرساÙ~DØ©.
+
+ (Ù~Fعتذر Ø¥Ù~F Ù~DÙ~E تÙ~CÙ~F Ù~Bد Ø·Ù~Dبت Ù~GØ°Ù~G اÙ~DرساÙ~DØ©. بÙ~Eا Ø£Ù~F برÙ~JدÙ~C Ù~EÙ~BدÙ~E Ù~EÙ~F
+ خدÙ~EØ© Ù~DاتستخدÙ~E KDIMØ~L Ù~BÙ~EÙ~Fا بإرساÙ~D Ø´Ø±Ø Ù~EÙ~HجزØ~L
+ Ù~HسÙ~FتجاÙ~GÙ~D عÙ~FÙ~HاÙ~F اÙ~DبرÙ~Jد Ù~Gذا Ø®Ù~DاÙ~D اÙ~DÙ~JÙ~HÙ~E اÙ~DتاÙ~DÙ~J تÙ~BرÙ~JباÙ~K).
+
+ Ù~JرجÙ~I Ù~EÙ~DاØظة Ø£Ù~FÙ~Fا Ù~Dا Ù~FستطÙ~Jع Ù~EعاÙ~Dجة رسائÙ~D HTML Ø£Ù~H base 64
+ . ستØتاج Ø£Ù~F ترسÙ~D Ù~DÙ~Fا رساÙ~DØ© تØتÙ~HÙ~J عÙ~DÙ~I Ù~Fص بسÙ~JØ· Ù~AÙ~BØ·.
+
+ Ø¥Ù~F Ù~CاÙ~Fت Ù~DدÙ~JÙ~C أسئÙ~DØ© Ø£Ù~H Ø¥Ù~F Ù~DÙ~E Ù~JعÙ~EÙ~D اÙ~DØÙ~D Ù~JÙ~EÙ~CÙ~FÙ~C اÙ~DاتصاÙ~D بÙ~CائÙ~F
+ بشرÙ~J عÙ~DÙ~I عÙ~FÙ~HاÙ~F اÙ~DدعÙ~E اÙ~DÙ~AÙ~FÙ~J Ù~Gذا: tor-assistants at torproject.org
+
+ --
+
+ سÙ~DاÙ~E! رÙ~Hبات "GetTor" در خدÙ~Eت Ø´Ù~Eاست.
+ Ù~EتاسÙ~AاÙ~FÙ~G Ù~Eا Ù~FÙ~EÛ~L تÙ~HاÙ~FÛ~LÙ~E با اÛ~LÙ~F آدرس با Ø´Ù~Eا در ارتباط باشÛ~LÙ~E. Ø´Ù~Eا باÛ~LستÛ~L در
+ GMAIL.COM Û~Lا در YAHOO.CN Øساب باز کردÙ~G Ù~H از طرÛ~LÙ~B Û~LÚ©Û~L از Ø¢Ù~F آدرسÙ~Gا با Ù~Eا
+ Ù~EکاتبÙ~G Ú©Ù~FÛ~Lد.
+
+ Ù~Eا Ù~AÙ~BØ· درخÙ~HاستÙ~GاÛ~LÛ~L را Ù~EÙ~Hرد بررسÛ~L Ù~Bرار Ù~EÛ~L دÙ~GÛ~LÙ~E Ú©Ù~G سرÙ~HÛ~Lس پست اÙ~DکترÙ~HÙ~FÛ~LÚ©Û~L Ø¢Ù~FÙ~Gا
+ "DKIM" را پشتÛ~LباÙ~FÛ~L Ú©Ù~Fد. "DKIM" اÛ~LÙ~F اÙ~EکاÙ~F را بÙ~G Ù~Eا Ù~EÛ~L دÙ~Gد تا اطÙ~EÛ~LÙ~FاÙ~F Û~LابÛ~LÙ~E Ú©Ù~G
+ آدرس Ù~EÙ~Fدرج در Ù~BسÙ~Eت "From"Ø~L Ù~GÙ~EاÙ~F آدرسÛ~L است Ú©Ù~G Ù~FاÙ~EÙ~G از Ø¢Ù~F بÙ~G Ù~Eا ارساÙ~D شدÙ~G
+ است.
+
+ (در Ù~Gر صÙ~Hرت عذرخÙ~HاÙ~GÛ~L Ù~Eا را پذÛ~Lرا باشÛ~Lد. از Ø¢Ù~FجاÛ~LÛ~LÚ©Ù~G اÛ~LÙ~EÛ~LÙ~D Ø´Ù~Eا DKIM را
+ پشتÛ~LباÙ~FÛ~L Ù~FÙ~EÛ~L Ú©Ù~FدØ~L Ù~Eا اÛ~LÙ~F تÙ~HضÛ~LØ Ú©Ù~HتاÙ~G را ارساÙ~D Ù~FÙ~EÙ~HدÙ~G Ù~H اÛ~LÙ~F آدرس اÛ~LÙ~EÛ~LÙ~D را
+ بزÙ~HدÛ~L از Ù~AÙ~Gرست آدرسÙ~GاÛ~L Ø®Ù~Hد خارج Ù~EÛ~L Ú©Ù~FÛ~LÙ~E.)
+
+ Ù~DØ·Ù~Aا بÙ~G اÛ~LÙ~F Ù~FکتÙ~G تÙ~HجÙ~G داشتÙ~G باشÛ~Lد Ú©Ù~G در ØاÙ~D Øاضر اÛ~LÙ~EÛ~LÙ~D Ù~GاÛ~L Ù~EبتÙ~FÛ~L بر HTML Û~Lا
+ 64 بÛ~LتÛ~LØ~L Ù~BابÙ~D بررسÛ~L Ù~FÙ~EÛ~L باشÙ~Fد. بÙ~FابراÛ~LÙ~F اÛ~LÙ~EÛ~LÙ~D Ù~GاÛ~L Ø®Ù~Hد را بÙ~G صÙ~Hرت Ù~EتÙ~F سادÙ~G
+ ارساÙ~D Ù~FÙ~EاÛ~LÛ~Lد.
+
+ Ú~FÙ~FاÙ~FÚ~FÙ~G سÙ~HاÙ~DÛ~L دارÛ~Lد Û~Lا برÙ~FاÙ~EÙ~G دÚ~Fار اشکاÙ~D بÙ~HدÙ~G Ù~H کار Ù~FÙ~EÛ~L Ú©Ù~Fد Ø~L با Ù~BسÙ~Eت
+ پشتÛ~LباÙ~FÛ~L با آدرس زÛ~Lر تÙ~Eاس بگÛ~LرÛ~Lد تا Û~LÚ© اÙ~FساÙ~F بÙ~G سÙ~HاÙ~D Ø´Ù~Eا پاسخ دÙ~Gد:
+ tor-assistants at torproject.org
+
+ --
+
+ Olá! Este é o robot "GetTor".
+
+ Infelizmente, não respondemos neste endereço, pelo que é
+ recomendado criar uma conta no Gmail ou Hotmail e enviar a mensagem de um
+ desses serviços.
+
+ Só processamos emails de serviços que suportam "DKIM",
+ que é uma forma de verificar que o endereço do "Remetente" é válido e se foi
+ mesmo esse a enviar o email.
+
+ (Pedimos desculpa se não solicitou este email. Como a sua mensagem é de um
+ serviço que não suporta DKIM, estamos a enviar esta curta explicação, e
+ depois este endereço de email será ignorado.)
+
+ Actualmente não suportamos emails com HTML or Base64, pelo que terá que
+ utilizar apenas texto (plain text).
+
+ Se tiver alguma dúvida, pode contactar um humano no seguinte endereço:
+ tor-assistants at torproject.org
+
+ --
+
+ Ð~WдÑ~@авÑ~AÑ~BвÑ~CйÑ~Bе! ÐÑ~Bо "Ñ~@обоÑ~B GetTor".
+
+ Ð~Z Ñ~AожалениÑ~N, мÑ~K не Ñ~Aможем оÑ~BвеÑ~BиÑ~BÑ~L вам на Ñ~MÑ~BоÑ~B адÑ~@еÑ~A. Ð~RÑ~K должнÑ~K Ñ~AоздаÑ~BÑ~L
+ Ñ~AÑ~GеÑ~B в GMAIL.COM или в YAHOO.COM и оÑ~BпÑ~@авлÑ~OÑ~BÑ~L поÑ~GÑ~BÑ~C из
+ одного из Ñ~MÑ~BиÑ~E Ñ~AÑ~GеÑ~Bов.
+
+ Ð~\Ñ~K Ñ~BолÑ~Lко обÑ~@абаÑ~BÑ~Kваем запÑ~@оÑ~AÑ~K из поÑ~GÑ~BовÑ~KÑ~E Ñ~AлÑ~Cжб поддеÑ~@живаÑ~NÑ~IиÑ~E "DKIM",
+ коÑ~BоÑ~@аÑ~O Ñ~OвлÑ~OеÑ~BÑ~AÑ~O Ñ~DÑ~CнкÑ~Fией Ñ~MлекÑ~BÑ~@онной поÑ~GÑ~BÑ~K, позволÑ~OÑ~NÑ~IаÑ~O нам Ñ~CбедиÑ~BÑ~LÑ~AÑ~O в
+ Ñ~Bом, Ñ~GÑ~Bо адÑ~@еÑ~A в
+ Ñ~AÑ~BÑ~@оке "Ð~^Ñ~B" дейÑ~AÑ~BвиÑ~BелÑ~Lно оÑ~B Ñ~Bого, кÑ~Bо оÑ~BоÑ~Aлал поÑ~GÑ~BÑ~C.
+
+ (Ð~\Ñ~K пÑ~@иноÑ~Aим извинениÑ~O, еÑ~Aли вÑ~K не пÑ~@оÑ~Aили Ñ~MÑ~Bого пиÑ~AÑ~Lма. Так как ваÑ~Hе
+ email из Ñ~AеÑ~@виÑ~Aа
+ коÑ~BоÑ~@Ñ~Kй не иÑ~AполÑ~LзÑ~CеÑ~B DKIM, мÑ~K оÑ~BпÑ~@авлÑ~Oем кÑ~@аÑ~Bкое обÑ~JÑ~OÑ~Aнение,
+ и далее мÑ~K пÑ~@оигноÑ~@иÑ~@Ñ~Cем Ñ~MÑ~BоÑ~B адÑ~@еÑ~A Ñ~MлекÑ~BÑ~@онной поÑ~GÑ~BÑ~K денÑ~L или два.)
+
+ Ð~_ожалÑ~CйÑ~AÑ~Bа оÑ~BмеÑ~BÑ~LÑ~Bе, Ñ~GÑ~Bо в наÑ~AÑ~BоÑ~OÑ~Iее вÑ~@емÑ~O мÑ~K не можем обÑ~@абоÑ~BаÑ~BÑ~L HTML
+ пиÑ~AÑ~Lма или базовÑ~Kе 64
+ поÑ~GÑ~BÑ~C. Ð~RÑ~K должнÑ~K бÑ~CдеÑ~Bе поÑ~AлаÑ~BÑ~L обÑ~KÑ~GнÑ~Kй Ñ~BекÑ~AÑ~B (plain text).
+
+ Ð~UÑ~Aли Ñ~C ваÑ~A вопÑ~@оÑ~AÑ~K или Ñ~GÑ~Bо Ñ~Bо не Ñ~AÑ~@абоÑ~Bало, вÑ~K можеÑ~Bе Ñ~AвÑ~OзаÑ~BÑ~LÑ~AÑ~O
+ Ñ~A живÑ~Kм пÑ~@едÑ~AÑ~BавиÑ~Bелем по Ñ~MÑ~BомÑ~C Ñ~MлекÑ~BÑ~@онномÑ~C адÑ~@еÑ~AÑ~C:tor-assistants at torproject.org
+
+ --
+
+ ä½| 好!è¿~Yé~G~Læ~X¯â~@~\GetTorâ~@~]è~Gªå~J¨å~[~^å¤~Mã~@~B
+
+ å¾~Hæ~J±æ~Iï¼~Læ~H~Q们ä¸~M对è¿~Y个å~\°å~]~@è¿~[è¡~Lå~[~^å¤~Mï¼~Læ~B¨åº~Té~@~Zè¿~G
+ GMAIL.COMæ~H~Vyahoo.cnç~Z~Dè´¦æ~H·ä½¿ç~T¨æ~H~Q们ç~Z~Dæ~\~Må~J¡ã~@~B
+
+ æ~H~Q们è¦~Aæ±~Bæ~I~@å¤~Dç~P~Fé~B®ä»¶è¯·æ±~Bç~Z~Dç~Tµé~B®æ~\~Må~J¡å~U~Få¿~Eé¡»æ~T¯æ~L~Aâ~@~\DKIMâ~@~]
+ å®~C帮å~J©æ~H~Q们éª~Lè¯~Aé~B®ä»¶æ~X¯å~P¦ç~\~_ç~Z~Dæ~]¥è~Gªäº~Næ~B¨ç~Z~Dé~B®ç®±ã~@~B
+
+ (å¦~Bæ~^~\æ~B¨æ²¡æ~\~Iå~P~Qæ~H~Q们å~O~Qé~@~Aè¿~Gé~B®ä»¶è¯·æ±~Bï¼~L对æ¤å~[~^å¤~Mæ~H~Q们å¾~Hæ~J±æ~Iã~@~B
+ å~[| 为æ~B¨ç~Z~Dé~B®ä»¶æ~\~Må~J¡å~U~Fä¸~Mæ~O~Pä¾~[DKIMå~J~_è~C½ï¼~Læ~\~I人å~O¯è~C½ä¼ªé~@| äº~Fä½| é~B®å~]~@
+ æ~H~Q们è¿~Yé~G~Lå~O~Qé~@~Aä¸~@æ~]¡ç®~@ç~_ç~Z~Dé~@~Zç~_¥ï¼~L并å°~Få~\¨ä»¥å~P~Nç~Z~Då~G| 天é~G~L忽ç~U¥è¯¥é~B®å~]~@ï¼~L
+ 以å~E~Må½¢æ~H~På~^~Cå~\¾å~[~^å¤~Mã~@~B)
+
+ 请注æ~D~Oï¼~Læ~H~Q们ç~[®å~I~Mæ~W| æ³~Uå¤~Dç~P~FHTMLæ~H~VBase64ç¼~Vç| ~Aç~Z~Dé~B®ä»¶ï¼~Læ~B¨å~Oªè~C½å~O~Qé~@~A纯æ~V~Gæ~\¬è¯·æ±~Bã~@~B
+
+ å¦~Bæ~^~\æ~B¨é~A~Gå~H°ä»»ä½~Ué~W®é¢~X请è~A~Tç³»æ~H~Q们ç~Z~Dæ~J~@æ~\¯æ~T¯æ~L~Aé~B®ç®±ï¼~Z
+ tor-assistants at torproject.org
+ """
+
+# Short string to build mails follow
+hello_gettor = _("""
Hello, This is the "GetTor" robot.
+ Thank you for your request.
+
+ """)
+help_dkim_1 = _("""
+ Unfortunately, we won't answer you at this address. You should make
+ an account with GMAIL.COM or YAHOO.CN and send the mail from
+ one of those.
+
+ """)
+help_dkim_2 = _("""
+ We only process requests from email services that support "DKIM",
+ which is an email feature that lets us verify that the address in the
+ "From" line is actually the one who sent the mail.
+
+ """)
+help_dkim_3 = _("""
+ (We apologize if you didn't ask for this mail. Since your email is from
+ a service that doesn't use DKIM, we're sending a short explanation,
+ and then we'll ignore this email address for the next day or so.)
+
+ """)
+help_dkim_4 = _("""
+ Please note that currently, we can't process HTML emails or base 64
+ mails. You will need to send plain text.
+
+ """)
+
+help_dkim_5 = _("""
+ If you have any questions or it doesn't work, you can contact a
+ human at this support email address: tor-assistants at torproject.org
+
+ """)
+choose_package_1 = _("""
I will mail you a Tor package, if you tell me which one you want.
Please select one of the following package names:
+ """)
+avail_packs = """
tor-browser-bundle
macosx-i386-bundle
macosx-ppc-bundle
tor-im-browser-bundle
source-bundle
-
+
+ """
+choose_package_2 = _("""
Please reply to this mail (to gettor at torproject.org), and tell me
a single package name anywhere in the body of your email.
+ """)
+obtain_localized_head = _("""
OBTAINING LOCALIZED VERSIONS OF TOR
+ """)
+obtain_locallized_underline = """
===================================
+ """
+obtain_localized_1 = _("""
To get a version of Tor translated into your language, specify the
language you want in the address you send the mail to:
+ """)
+obtain_localized_2 = """
gettor+zh at torproject.org
+ """
+obtain_localized_3 = _("""
This example will give you the requested package in a localized
version for Chinese. Check below for a list of supported language
codes.
+ """)
+list_of_langs_head = _("""
List of supported locales:
+ """)
+list_of_langs_underline = """
-------------------------
+ """
+list_of_langs_1 = _("""
Here is a list of all available languages:
+ """)
+list_of_langs_2 = _("""
gettor+ar at torproject.org: Arabic
gettor+de at torproject.org: German
gettor+en at torproject.org: English
@@ -76,36 +247,54 @@
gettor+ru at torproject.org: Russian
gettor+zh at torproject.org: Chinese
+ """)
+list_of_langs_3 = _("""
If you select no language, you will receive the English version.
+ """)
+support = _("""
SUPPORT
+ """)
+support_underline = """
=======
-
+ """
+support_email = _("""
If you have any questions or it doesn't work, you can contact a
human at this support email address: tor-assistants at torproject.org
- """)
-
-packagemsg = _("""
- Hello! This is the "GetTor" robot.
-
+ """)
+package_mail_1 = _("""
Here's your requested software as a zip file. Please unzip the
package and verify the signature.
+ """)
+package_mail_2 = _("""
Hint: If your computer has GnuPG installed, use the gpg
commandline tool as follows after unpacking the zip file:
+ """)
+package_mail_3 = _("""
gpg --verify <packagename>.asc <packagename>
+ """)
+package_mail_4 = _("""
The output should look somewhat like this:
+ """)
+package_mail_5 = """
gpg: Good signature from "Roger Dingledine <arma at mit.edu>"
+ """
+package_mail_6 = _("""
If you're not familiar with commandline tools, try looking for
a graphical user interface for GnuPG on this website:
+ """)
+package_mail_7 = """
http://www.gnupg.org/related_software/frontends.html
+ """
+package_mail_8 = _("""
If your Internet connection blocks access to the Tor network, you
may need a bridge relay. Bridge relays (or "bridges" for short)
are Tor relays that aren't listed in the main directory. Since there
@@ -113,90 +302,83 @@
connections to all the known Tor relays, they probably won't be able
to block all the bridges.
+ """)
+package_mail_9 = _("""
You can acquire a bridge by sending an email that contains "get bridges"
in the body of the email to the following email address:
bridges at torproject.org
+ """)
+package_mail_10 = _("""
It is also possible to fetch bridges with a web browser at the following
url: https://bridges.torproject.org/
- If you have any questions or it doesn't work, you can contact a
- human at this support email address: tor-assistants at torproject.org
-
- """)
-
-splitpackagemsg = _("""
- Hello! This is the "GetTor" robot.
-
- Here's your requested software as a zip file. Please unzip the
- package and verify the signature.
-
+ """)
+split_package_1 = _("""
IMPORTANT NOTE:
Since this is part of a split-file request, you need to wait for
all split files to be received by you before you can save them all
into the same directory and unpack them by double-clicking the
first file.
+ """)
+split_package_2 = _("""
Packages might come out of order! Please make sure you received
all packages before you attempt to unpack them!
- Hint: If your computer has GnuPG installed, use the gpg
- commandline tool as follows after unpacking the zip file:
-
- gpg --verify <packagename>.asc <packagename>
-
- The output should look somewhat like this:
-
- gpg: Good signature from "Roger Dingledine <arma at mit.edu>"
-
- If you're not familiar with commandline tools, try looking for
- a graphical user interface for GnuPG on this website:
-
- http://www.gnupg.org/related_software/frontends.html
-
- If your Internet connection blocks access to the Tor network, you
- may need a bridge relay. Bridge relays (or "bridges" for short)
- are Tor relays that aren't listed in the main directory. Since there
- is no complete public list of them, even if your ISP is filtering
- connections to all the known Tor relays, they probably won't be able
- to block all the bridges.
-
- You can acquire a bridge by sending an email that contains "get bridges"
- in the body of the email to the following email address:
- bridges at torproject.org
-
- It is also possible to fetch bridges with a web browser at the following
- url: https://bridges.torproject.org/
-
- If you have any questions or it doesn't work, you can contact a
- human at this support email address: tor-assistants at torproject.org
-
- """)
-
-delayalertmsg = _("""
- Hello, This is the "GetTor" robot.
-
+ """)
+delay_alert_1 = _("""
Thank you for your request. It was successfully understood. Your request is
currently being processed. Your package should arrive within the next ten
minutes.
+ """)
+delay_alert_2 = _("""
If it doesn't arrive, the package might be too big for your mail provider.
Try resending the mail from a gmail.com or yahoo.cn account. Also,
try asking for tor-browser-bundle rather than tor-im-browser-bundle,
since it's smaller.
- If you have any questions or it doesn't work, you can contact a
- human at this support email address: tor-assistants at torproject.org
+ """)
+error_mail = _("""
+ Unfortunately we are currently experiencing problems and we can't fulfill
+ your request right now. Please be patient as we try to resolve this issue.
- """)
+ """)
-mailfailmsg = _("""
- Hello, This is the "GetTor" robot.
+# Build the actual mail texts
+packagehelpmsg = hello_gettor + choose_package_1 + avail_packs + choose_package_2 + \
+ obtain_localized_head + obtain_localized_underline + \
+ obtain_localized_1 + obtain_localized_2 + obtain_localized_3 + \
+ list_of_langs_head + list_of_langs_underline + \
+ list_of_langs_1 + list_of_langs_2 + list_of_langs_3 + \
+ support + support_underline + support_email
- Thank you for your request.
+helpmsg = hello_gettor + \
+ help_dkim_1 + help_dkim_2 + help_dkim_3 + help_dkim_4 + help_dkim_5 + \
+ support_email
- Unfortunately we are currently experiencing problems and we can't fulfill
- your request right now. Please be patient as we try to resolve this issue.
- """)
+packagemsg = hello_gettor + \
+ package_mail_1 + package_mail_2 + package_mail_3 + package_mail_4 + \
+ package_mail_5 + package_mail_6 + package_mail_7 + package_mail_8 + \
+ package_mail_9 + package_mail_10 + \
+ support_email
+
+splitpackagemsg = hello_gettor + \
+ split_package_1 + split_package_2 + \
+ package_mail_1 + package_mail_2 + package_mail_3 + package_mail_4 + \
+ package_mail_5 + package_mail_6 + package_mail_7 + package_mail_8 + \
+ package_mail_9 + package_mail_10 + \
+ support_email
+
+
+delayalertmsg = hello_gettor + \
+ delay_alert_1 + delay_alert_2 + \
+ support_email
+
+mailfailmsg = hello_gettor + \
+ support_email
+
+
Modified: projects/gettor/lib/gettor/responses.py
===================================================================
--- projects/gettor/lib/gettor/responses.py 2010-01-11 14:51:40 UTC (rev 21399)
+++ projects/gettor/lib/gettor/responses.py 2010-01-11 19:46:03 UTC (rev 21400)
@@ -172,7 +172,7 @@
def sendHelp(self):
""" Send a helpful message to the user interacting with us """
log.info("Sending out help message to %s" % self.sendTo)
- return self.sendGenericMessage(gettor.constants.helpmsg)
+ return self.sendGenericMessage(gettor.constants.multilanghelpmsg)
## XXX the following line was used below to automatically list the names
## of available packages. But they were being named in an arbitrary
More information about the tor-commits
mailing list